fixes

scripts/make_common.sh

@@ -80,37 +80,6 @@ EOF
 done
 
 if [ -f "${PROJECT_SOURCE_DIR}/web/${PROJECT_NAME}/pubspec.yaml" ]; then
-  if [ "${PROJECT_IS_MINGW}" == "0" ] || [ "${PROJECT_IS_MINGW_UNIX}" == "1" ]; then
-    FLUTTER_CONTAINER_NAME="${PROJECT_NAME}_flutter"
-    FLUTTER_TAG_NAME="${PROJECT_NAME}:flutter"
-
-    docker stop ${FLUTTER_CONTAINER_NAME}
-    docker rm ${FLUTTER_CONTAINER_NAME}
-
-    docker build \
-      -t ${FLUTTER_TAG_NAME} \
-      "${PROJECT_SOURCE_DIR}/docker/x86_64/flutter" || exit 1
-
-    docker run -td \
-      --name ${FLUTTER_CONTAINER_NAME} \
-      -u $(id -u):$(id -g) \
-      -v ${PROJECT_SOURCE_DIR}:${PROJECT_SOURCE_DIR}:rw,z \
-      -w ${PROJECT_SOURCE_DIR}/web/${PROJECT_NAME} \
-      ${FLUTTER_TAG_NAME} || exit 1
-
-    docker exec \
-      ${FLUTTER_CONTAINER_NAME} \
-      /bin/bash -c \
-      "flutter build web --base-href=${PROJECT_FLUTTER_BASE_HREF}" || exit 1
-
-    docker stop ${FLUTTER_CONTAINER_NAME}
-    docker rm ${FLUTTER_CONTAINER_NAME}
-  else
-    pushd "${PROJECT_SOURCE_DIR}/web/${PROJECT_NAME}"
-    flutter build web --base-href=${PROJECT_FLUTTER_BASE_HREF} || exit 1
-    popd
-  fi
-
   rsync -av --progress "${PROJECT_SOURCE_DIR}/web/${PROJECT_NAME}/build/web/" \
     "${PROJECT_DIST_DIR}/web/"
 fi

scripts/make_flutter.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+PROJECT_SCRIPTS_DIR=$(realpath "$0")
+PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}")
+. "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5"
+
+if [ -f "${PROJECT_SOURCE_DIR}/web/${PROJECT_NAME}/pubspec.yaml" ]; then
+  if [ "${PROJECT_IS_MINGW}" == "0" ] || [ "${PROJECT_IS_MINGW_UNIX}" == "1" ]; then
+    FLUTTER_CONTAINER_NAME="${PROJECT_NAME}_flutter"
+    FLUTTER_TAG_NAME="${PROJECT_NAME}:flutter"
+
+    docker stop ${FLUTTER_CONTAINER_NAME}
+    docker rm ${FLUTTER_CONTAINER_NAME}
+
+    docker build "${PROJECT_SOURCE_DIR}/docker/x86_64/" \
+      --build-arg UID=$(id -u) \
+      --build-arg GID=$(id -g) \
+      -t ${FLUTTER_TAG_NAME} \
+      -f "${PROJECT_SOURCE_DIR}/docker/x86_64/flutter" || exit 1
+
+    docker run -td \
+      --name ${FLUTTER_CONTAINER_NAME} \
+      -u $(id -u):$(id -g) \
+      -v ${PROJECT_SOURCE_DIR}:${PROJECT_SOURCE_DIR}:rw,z \
+      -w ${PROJECT_SOURCE_DIR}/web/${PROJECT_NAME} \
+      ${FLUTTER_TAG_NAME} || exit 1
+
+    docker exec \
+      ${FLUTTER_CONTAINER_NAME} \
+      /bin/bash -c \
+      "flutter clean;flutter build web --base-href=${PROJECT_FLUTTER_BASE_HREF}" || exit 1
+
+    docker stop ${FLUTTER_CONTAINER_NAME}
+    docker rm ${FLUTTER_CONTAINER_NAME}
+  else
+    pushd "${PROJECT_SOURCE_DIR}/web/${PROJECT_NAME}"
+    flutter build web --base-href=${PROJECT_FLUTTER_BASE_HREF} || exit 1
+    popd
+  fi
+fi

scripts/make_unix.sh

@@ -9,6 +9,8 @@ if [ -f "${PROJECT_SCRIPTS_DIR}/cleanup.sh" ]; then
   rm ${PROJECT_SCRIPTS_DIR}/cleanup.*
 fi
 
+"${PROJECT_SOURCE_DIR}/scripts/make_flutter.sh" "${PROJECT_BUILD_ARCH}" "${PROJECT_CMAKE_BUILD_TYPE}" "${PROJECT_BUILD_CLEAN}" 0 0 || exit 1
+
 if [ "${PROJECT_REQUIRE_ALPINE}" == "ON" ] || [ "${PROJECT_IS_ARM64}" == "1" ]; then
   DOCKER_NAME=alpine
   DOCKER_CONTAINER=${PROJECT_NAME}_${DOCKER_NAME}_${PROJECT_BUILD_ARCH}

scripts/make_win32.cmd

@@ -12,5 +12,7 @@ pushd "%~dp0%"
     call cleanup.cmd "%ARG1%" "%ARG2%" "%ARG3%" 1 0
     del cleanup.*
   )
+
+  call mingw64 -no-start ./make_futter.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1
   call mingw64 -no-start ./make_common.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1
 popd