From 0611f0c9ddf98d51d99e59344c9d868d0b3a0275 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Fri, 28 Feb 2025 10:41:19 -0600 Subject: [PATCH] updated build system --- scripts/make_flutter.sh | 5 +++-- scripts/make_win32.cmd | 2 +- web/repertory/pubspec.lock | 16 ++++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/scripts/make_flutter.sh b/scripts/make_flutter.sh index c56c8a52..23fe784b 100755 --- a/scripts/make_flutter.sh +++ b/scripts/make_flutter.sh @@ -34,9 +34,10 @@ if [ -f "${PROJECT_SOURCE_DIR}/web/${PROJECT_NAME}/pubspec.yaml" ]; then docker rm ${FLUTTER_CONTAINER_NAME} else pushd "${PROJECT_SOURCE_DIR}/web/${PROJECT_NAME}" - HREF=$(echo ${PROJECT_FLUTTER_BASE_HREF} | sed -e "s/\//\/\//g") + export MSYS_NO_PATHCONV=1 flutter clean - flutter build web --base-href=${HREF} || exit 1 + flutter build web --base-href=${PROJECT_FLUTTER_BASE_HREF} || exit 1 + export MSYS_NO_PATHCONV=0 popd fi fi diff --git a/scripts/make_win32.cmd b/scripts/make_win32.cmd index 038141f9..c2412d3c 100644 --- a/scripts/make_win32.cmd +++ b/scripts/make_win32.cmd @@ -7,7 +7,7 @@ set ARG2=%~2 set ARG3=%~3 pushd "%~dp0%" - call setup_msys2.cmd "%ARG1%" "%ARG2%" "%ARG3%" + REM call setup_msys2.cmd "%ARG1%" "%ARG2%" "%ARG3%" if exist "cleanup.cmd" ( call cleanup.cmd "%ARG1%" "%ARG2%" "%ARG3%" 1 0 del cleanup.* diff --git a/web/repertory/pubspec.lock b/web/repertory/pubspec.lock index 19c2d367..c2c57f7f 100644 --- a/web/repertory/pubspec.lock +++ b/web/repertory/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: async - sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.13.0" + version: "2.12.0" boolean_selector: dependency: transitive description: @@ -53,10 +53,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.3" + version: "1.3.2" flutter: dependency: "direct main" description: flutter @@ -79,10 +79,10 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0" + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec url: "https://pub.dev" source: hosted - version: "10.0.9" + version: "10.0.8" leak_tracker_flutter_testing: dependency: transitive description: @@ -204,10 +204,10 @@ packages: dependency: transitive description: name: vm_service - sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" url: "https://pub.dev" source: hosted - version: "15.0.0" + version: "14.3.1" sdks: dart: ">=3.7.0 <4.0.0" flutter: ">=3.18.0-18.0.pre.54"