Unverified Commit 6db22118 authored by Greg Spencer's avatar Greg Spencer Committed by GitHub

Make flutter and dart scripts invoke their batch file equivalents on Windows (#59789)

This makes the flutter and dart scripts invoke their batch file equivalents if running under MINGW (i.e. git-bash) on Windows.

This allows for proper locking, and makes sure that people aren't using two different (and non-mutally-aware) locking systems when running flutter on Windows.

I also fixed a couple of places where we look for MINGW32, which fails under MINGW64. It just looks for MINGW now.
parent 01e09ea8
......@@ -43,8 +43,14 @@ function follow_links() (
echo "$file"
)
PROG_NAME="$(follow_links "$BASH_SOURCE")"
PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")"
BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
OS="$(uname -s)"
if [[ $OS =~ MINGW.* ]]; then
# If we're on Windows, invoke the batch script instead, to get proper locking.
exec "${BIN_DIR}/dart.bat" "$@"
fi
# To define `shared::execute()` function
source "$BIN_DIR/internal/shared.sh"
......
......@@ -43,8 +43,14 @@ function follow_links() (
echo "$file"
)
PROG_NAME="$(follow_links "$BASH_SOURCE")"
PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")"
BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
OS="$(uname -s)"
if [[ $OS =~ MINGW.* ]]; then
# If we're on Windows, invoke the batch script instead, to get proper locking.
exec "${BIN_DIR}/flutter.bat" "$@"
fi
# To define `shared::execute()` function
source "$BIN_DIR/internal/shared.sh"
......
......@@ -170,7 +170,7 @@ function shared::execute() {
# If running over git-bash, overrides the default UNIX executables with win32
# executables
case "$(uname -s)" in
MINGW32*)
MINGW*)
DART="$DART.exe"
PUB="$PUB.bat"
;;
......
......@@ -67,7 +67,7 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t
DART_ZIP_NAME="dart-sdk-linux-x64.zip"
IS_USER_EXECUTABLE="-perm /u+x"
;;
MINGW32*)
MINGW*)
DART_ZIP_NAME="dart-sdk-windows-x64.zip"
IS_USER_EXECUTABLE="-perm /u+x"
;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment