diff --git a/lib/web_ui/dev/felt b/lib/web_ui/dev/felt index f09214ee5ca71..a798640673a7d 100755 --- a/lib/web_ui/dev/felt +++ b/lib/web_ui/dev/felt @@ -73,13 +73,7 @@ else fi WEB_UI_DIR="${FLUTTER_DIR}/lib/web_ui" -DEV_DIR="${WEB_UI_DIR}/dev" -DART_TOOL_DIR="${WEB_UI_DIR}/.dart_tool" DART_PATH="$DART_SDK_DIR/bin/dart" -SNAPSHOT_PATH="${DART_TOOL_DIR}/felt.snapshot" -STAMP_PATH="${DART_TOOL_DIR}/felt.snapshot.stamp" -SCRIPT_PATH="${DEV_DIR}/felt.dart" -REVISION="$(cd "$FLUTTER_DIR"; git rev-parse HEAD)" if [[ "$FELT_DEBUG" == "true" || "$FELT_DEBUG" == "1" ]] then @@ -133,28 +127,6 @@ then set -e fi -if [[ "$FELT_USE_SNAPSHOT" == "false" || "$FELT_USE_SNAPSHOT" == "0" ]]; then - echo "[Snapshot mode: off]" - # Running without snapshot means there is high likelihood of local changes. In - # that case, let's clear the snapshot to avoid any surprises. - rm -f "$SNAPSHOT_PATH" - rm -f "$STAMP_PATH" - install_deps - $DART_SDK_DIR/bin/dart $FELT_DEBUG_FLAGS "$DEV_DIR/felt.dart" $@ -else - # Create a new snapshot if any of the following is true: - # * SNAPSHOT_PATH is not a file, or - # * STAMP_PATH is not a file with nonzero size, or - # * Contents of STAMP_PATH is not our local git HEAD revision, or - # * pubspec.yaml last modified after pubspec.lock - if [[ ! -f $SNAPSHOT_PATH || ! -s "$STAMP_PATH" || "$(cat "$STAMP_PATH")" != "$REVISION" || "$WEB_UI_DIR/pubspec.yaml" -nt "$WEB_UI_DIR/pubspec.lock" ]]; then - echo "[Snapshot mode: on] (creating a new snapshot)" - install_deps - mkdir -p $DART_TOOL_DIR - - "$DART_SDK_DIR/bin/dart" --snapshot="$SNAPSHOT_PATH" --packages="$WEB_UI_DIR/.dart_tool/package_config.json" "$SCRIPT_PATH" - echo "$REVISION" > "$STAMP_PATH" - fi - - $DART_SDK_DIR/bin/dart $FELT_DEBUG_FLAGS --packages="$WEB_UI_DIR/.dart_tool/package_config.json" "$SNAPSHOT_PATH" $@ -fi +cd $WEB_UI_DIR +install_deps +(cd $WEB_UI_DIR && $DART_SDK_DIR/bin/dart run $FELT_DEBUG_FLAGS dev/felt.dart $@) diff --git a/lib/web_ui/dev/felt.bat b/lib/web_ui/dev/felt.bat index 7ebfbb36c4807..9096c36a7c9f2 100644 --- a/lib/web_ui/dev/felt.bat +++ b/lib/web_ui/dev/felt.bat @@ -20,14 +20,8 @@ FOR %%a IN ("%TMP:~0,-1%") DO SET TMP=%%~dpa FOR %%a IN ("%TMP:~0,-1%") DO SET ENGINE_SRC_DIR=%%~dpa SET ENGINE_SRC_DIR=%ENGINE_SRC_DIR:~0,-1% -SET OUT_DIR=%ENGINE_SRC_DIR%\out -SET HOST_DEBUG_UNOPT_DIR=%OUT_DIR%\host_debug_unopt SET FLUTTER_DIR=%ENGINE_SRC_DIR%\flutter SET WEB_UI_DIR=%FLUTTER_DIR%\lib\web_ui -SET DEV_DIR=%WEB_UI_DIR%\dev -SET FELT_PATH=%DEV_DIR%\felt.dart -SET DART_TOOL_DIR=%WEB_UI_DIR%\.dart_tool -SET SNAPSHOT_PATH=%DART_TOOL_DIR%\felt.snapshot SET SDK_PREBUILTS_DIR=%FLUTTER_DIR%\prebuilts SET PREBUILT_TARGET=windows-x64 IF NOT DEFINED DART_SDK_DIR ( @@ -38,20 +32,7 @@ SET DART_BIN=%DART_SDK_DIR%\bin\dart cd %WEB_UI_DIR% :: We need to invoke pub get here before we actually invoke felt. -CALL %DART_BIN% pub get - -IF FELT_USE_SNAPSHOT=="0" ( - ECHO Invoking felt.dart without snapshot - SET FELT_TARGET=%FELT_PATH% -) ELSE ( - IF NOT EXIST "%SNAPSHOT_PATH%" ( - ECHO Precompiling felt snapshot - %DART_BIN% --snapshot="%SNAPSHOT_PATH%" --packages="%WEB_UI_DIR%\.dart_tool\package_config.json" %FELT_PATH% - ) - SET FELT_TARGET=%SNAPSHOT_PATH% - ECHO Invoking felt snapshot -) - -%DART_BIN% --packages="%WEB_UI_DIR%\.dart_tool\package_config.json" "%FELT_TARGET%" %* +%DART_BIN% pub get +%DART_BIN% run dev/felt.dart %* EXIT /B %ERRORLEVEL%