firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable DartDev when launching flutter_tools (#57143)

Browse Source
This commit is contained in:
Ben Konyi 2020-05-14 11:42:01 -07:00 committed by GitHub
parent 8de07d5527
commit 461fe98f98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/flutter
View File

@ -127,7 +127,7 @@ function upgrade_flutter () {
retry_upgrade retry_upgrade
"$DART" $FLUTTER_TOOL_ARGS --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" --no-enable-mirrors "$SCRIPT_PATH" "$DART" --disable-dart-dev $FLUTTER_TOOL_ARGS --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" --no-enable-mirrors "$SCRIPT_PATH"
echo "$revision" > "$STAMP_PATH" echo "$revision" > "$STAMP_PATH"
fi fi
# The exit here is duplicitous since the function is run in a subshell, # The exit here is duplicitous since the function is run in a subshell,
@ -189,4 +189,4 @@ fi
# FLUTTER_TOOL_ARGS isn't quoted below, because it is meant to be considered as # FLUTTER_TOOL_ARGS isn't quoted below, because it is meant to be considered as
# separate space-separated args. # separate space-separated args.
"$DART" --packages="$FLUTTER_TOOLS_DIR/.packages" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@" "$DART" --disable-dart-dev --packages="$FLUTTER_TOOLS_DIR/.packages" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@"

6
bin/flutter.bat
View File

@ -165,9 +165,9 @@ GOTO :after_subroutine
POPD POPD
IF "%FLUTTER_TOOL_ARGS%" == "" ( IF "%FLUTTER_TOOL_ARGS%" == "" (
"%dart%" --snapshot="%snapshot_path%" --packages="%flutter_tools_dir%\.packages" --no-enable-mirrors "%script_path%" "%dart%" --disable-dart-dev --snapshot="%snapshot_path%" --packages="%flutter_tools_dir%\.packages" --no-enable-mirrors "%script_path%"
) else ( ) else (
"%dart%" "%FLUTTER_TOOL_ARGS%" --snapshot="%snapshot_path%" --packages="%flutter_tools_dir%\.packages" "%script_path%" "%dart%" --disable-dart-dev "%FLUTTER_TOOL_ARGS%" --snapshot="%snapshot_path%" --packages="%flutter_tools_dir%\.packages" "%script_path%"
) )
IF "%ERRORLEVEL%" NEQ "0" ( IF "%ERRORLEVEL%" NEQ "0" (
ECHO Error: Unable to create dart snapshot for flutter tool. ECHO Error: Unable to create dart snapshot for flutter tool.
@ -189,7 +189,7 @@ REM
REM Do not use the CALL command in the next line to execute Dart. CALL causes REM Do not use the CALL command in the next line to execute Dart. CALL causes
REM Windows to re-read the line from disk after the CALL command has finished REM Windows to re-read the line from disk after the CALL command has finished
REM regardless of the ampersand chain. REM regardless of the ampersand chain.
"%dart%" --packages="%flutter_tools_dir%\.packages" %FLUTTER_TOOL_ARGS% "%snapshot_path%" %* & exit /B !ERRORLEVEL! "%dart%" --disable-dart-dev --packages="%flutter_tools_dir%\.packages" %FLUTTER_TOOL_ARGS% "%snapshot_path%" %* & exit /B !ERRORLEVEL!
:final_exit :final_exit
EXIT /B %exit_code% EXIT /B %exit_code%