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

Switch from .packages to package_config (#106202)

Browse Source
This commit is contained in:
Michael Thomsen 2022-06-17 14:56:32 -04:00 committed by GitHub
parent 40516e358a
commit 6e80ad0c9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/flutter.bat
View File

@ -51,4 +51,4 @@ 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%" --disable-dart-dev --packages="%flutter_tools_dir%\.packages" %FLUTTER_TOOL_ARGS% "%snapshot_path%" %* & exit /B !ERRORLEVEL! "%dart%" --disable-dart-dev --packages="%flutter_tools_dir%\.dart_tool\package_config.json" %FLUTTER_TOOL_ARGS% "%snapshot_path%" %* & exit /B !ERRORLEVEL!

4
bin/internal/shared.bat
View File

@ -163,9 +163,9 @@ GOTO :after_subroutine
POPD POPD
IF "%FLUTTER_TOOL_ARGS%" == "" ( IF "%FLUTTER_TOOL_ARGS%" == "" (
"%dart%" --verbosity=error --snapshot="%snapshot_path%" --packages="%flutter_tools_dir%\.packages" --no-enable-mirrors "%script_path%" "%dart%" --verbosity=error --snapshot="%snapshot_path%" --packages="%flutter_tools_dir%\.dart_tool\package_config.json" --no-enable-mirrors "%script_path%"
) else ( ) else (
"%dart%" "%FLUTTER_TOOL_ARGS%" --verbosity=error --snapshot="%snapshot_path%" --packages="%flutter_tools_dir%\.packages" "%script_path%" "%dart%" "%FLUTTER_TOOL_ARGS%" --verbosity=error --snapshot="%snapshot_path%" --packages="%flutter_tools_dir%\.dart_tool\package_config.json" "%script_path%"
) )
IF "%ERRORLEVEL%" NEQ "0" ( IF "%ERRORLEVEL%" NEQ "0" (
ECHO Error: Unable to create dart snapshot for flutter tool. 1>&2 ECHO Error: Unable to create dart snapshot for flutter tool. 1>&2

4
bin/internal/shared.sh
View File

@ -155,7 +155,7 @@ function upgrade_flutter () (
pub_upgrade_with_retry pub_upgrade_with_retry
# Compile... # Compile...
"$DART" --verbosity=error --disable-dart-dev $FLUTTER_TOOL_ARGS --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" --no-enable-mirrors "$SCRIPT_PATH" "$DART" --verbosity=error --disable-dart-dev $FLUTTER_TOOL_ARGS --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" --no-enable-mirrors "$SCRIPT_PATH"
echo "$compilekey" > "$STAMP_PATH" echo "$compilekey" > "$STAMP_PATH"
fi fi
# The exit here is extraneous since the function is run in a subshell, but # The exit here is extraneous since the function is run in a subshell, but
@ -222,7 +222,7 @@ function shared::execute() {
flutter*) flutter*)
# FLUTTER_TOOL_ARGS aren't quoted below, because it is meant to be # FLUTTER_TOOL_ARGS aren't quoted below, because it is meant to be
# considered as separate space-separated args. # considered as separate space-separated args.
exec "$DART" --disable-dart-dev --packages="$FLUTTER_TOOLS_DIR/.packages" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@" exec "$DART" --disable-dart-dev --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@"
;; ;;
dart*) dart*)
exec "$DART" "$@" exec "$DART" "$@"