From 50d4d53c05cbf1de9e1d421de78b30df7cd760ba Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Mon, 3 Mar 2025 12:58:16 -0800 Subject: [PATCH] Update `update_dart_sdk.sh|ps1` and related to use `bin/cache/engine.stamp|realm`. (#164498) Towards https://github.com/flutter/flutter/issues/164315. --- bin/internal/shared.bat | 2 +- bin/internal/update_dart_sdk.ps1 | 4 ++-- bin/internal/update_dart_sdk.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/internal/shared.bat b/bin/internal/shared.bat index 187116e8d9..f9a7a0474c 100644 --- a/bin/internal/shared.bat +++ b/bin/internal/shared.bat @@ -21,7 +21,7 @@ SET stamp_path=%cache_dir%\flutter_tools.stamp SET script_path=%flutter_tools_dir%\bin\flutter_tools.dart SET dart_sdk_path=%cache_dir%\dart-sdk SET engine_stamp=%cache_dir%\engine-dart-sdk.stamp -SET engine_version_path=%FLUTTER_ROOT%\bin\internal\engine.version +SET engine_version_path=%cache_dir%\engine.stamp SET dart=%dart_sdk_path%\bin\dart.exe REM Ensure that bin/cache exists. diff --git a/bin/internal/update_dart_sdk.ps1 b/bin/internal/update_dart_sdk.ps1 index cb95257d92..11bfbee4fb 100644 --- a/bin/internal/update_dart_sdk.ps1 +++ b/bin/internal/update_dart_sdk.ps1 @@ -20,8 +20,8 @@ $cachePath = "$flutterRoot\bin\cache" $dartSdkPath = "$cachePath\dart-sdk" $dartSdkLicense = "$cachePath\LICENSE.dart_sdk_archive.md" $engineStamp = "$cachePath\engine-dart-sdk.stamp" -$engineVersion = (Get-Content "$flutterRoot\bin\internal\engine.version") -$engineRealm = (Get-Content "$flutterRoot\bin\internal\engine.realm") +$engineVersion = (Get-Content "$flutterRoot\bin\cache\engine.stamp") +$engineRealm = (Get-Content "$flutterRoot\bin\cache\engine.realm") $oldDartSdkPrefix = "dart-sdk.old" diff --git a/bin/internal/update_dart_sdk.sh b/bin/internal/update_dart_sdk.sh index 8a186bfbcd..edcd99b8c8 100755 --- a/bin/internal/update_dart_sdk.sh +++ b/bin/internal/update_dart_sdk.sh @@ -21,8 +21,8 @@ DART_SDK_PATH_OLD="$DART_SDK_PATH.old" ENGINE_STAMP="$FLUTTER_ROOT/bin/cache/engine-dart-sdk.stamp" OS="$(uname -s)" -ENGINE_VERSION=$(cat "$FLUTTER_ROOT/bin/internal/engine.version") -ENGINE_REALM=$(cat "$FLUTTER_ROOT/bin/internal/engine.realm" | tr -d '[:space:]') +ENGINE_VERSION=$(cat "$FLUTTER_ROOT/bin/cache/engine.stamp") +ENGINE_REALM=$(cat "$FLUTTER_ROOT/bin/cache/engine.realm" | tr -d '[:space:]') if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; then command -v curl > /dev/null 2>&1 || {