diff --git a/config.sh b/config.sh index 548f6ab0..7e647523 100755 --- a/config.sh +++ b/config.sh @@ -19,7 +19,7 @@ PROJECT_APP_LIST=(${PROJECT_NAME}) PROJECT_PRIVATE_KEY=${DEVELOPER_PRIVATE_KEY} PROJECT_PUBLIC_KEY=${DEVELOPER_PUBLIC_KEY} -PROJECT_FLUTTER_BASE_HREF=/ui/ +PROJECT_FLUTTER_BASE_HREF="/ui/" PROJECT_ENABLE_WIN32_LONG_PATH_NAMES=OFF diff --git a/scripts/env.sh b/scripts/env.sh index 72469daa..c439c13b 100755 --- a/scripts/env.sh +++ b/scripts/env.sh @@ -7,7 +7,7 @@ PROJECT_IS_MINGW=$4 PROJECT_IS_MINGW_UNIX=$5 DISABLE_CREATE_DIRS=$6 -PROJECT_FLUTTER_BASE_HREF=/ +PROJECT_FLUTTER_BASE_HREF="/" if [ "${PROJECT_IS_MINGW}" != "1" ]; then PROJECT_IS_MINGW_UNIX=0 @@ -368,6 +368,7 @@ echo " Dist dir: ${PROJECT_DIST_DIR}" echo " Enable v2 errors: ${PROJECT_ENABLE_V2_ERRORS}" echo " External build root: ${PROJECT_EXTERNAL_BUILD_ROOT}" echo " File part: ${PROJECT_FILE_PART}" +echo " Flutter base href: ${PROJECT_FLUTTER_BASE_HREF}" echo " Is ARM64: ${PROJECT_IS_ARM64}" echo " Is Alpine: ${PROJECT_IS_ALPINE}" echo " Is MINGW on Unix: ${PROJECT_IS_MINGW_UNIX}" diff --git a/scripts/make_flutter.sh b/scripts/make_flutter.sh index dbe2008b..c56c8a52 100755 --- a/scripts/make_flutter.sh +++ b/scripts/make_flutter.sh @@ -34,7 +34,9 @@ if [ -f "${PROJECT_SOURCE_DIR}/web/${PROJECT_NAME}/pubspec.yaml" ]; then docker rm ${FLUTTER_CONTAINER_NAME} else pushd "${PROJECT_SOURCE_DIR}/web/${PROJECT_NAME}" - flutter build web --base-href=${PROJECT_FLUTTER_BASE_HREF} || exit 1 + HREF=$(echo ${PROJECT_FLUTTER_BASE_HREF} | sed -e "s/\//\/\//g") + flutter clean + flutter build web --base-href=${HREF} || exit 1 popd fi fi diff --git a/scripts/make_win32.cmd b/scripts/make_win32.cmd index 1c11652b..038141f9 100644 --- a/scripts/make_win32.cmd +++ b/scripts/make_win32.cmd @@ -13,6 +13,6 @@ pushd "%~dp0%" del cleanup.* ) - call mingw64 -no-start ./make_futter.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1 + call mingw64 -no-start ./make_flutter.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1 call mingw64 -no-start ./make_common.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1 popd