updated build system

2025-08-01 16:17:38 -05:00
parent 55ad50d6f4
commit 586f4cb036
22 changed files with 223 additions and 31 deletions
--- a/scripts/deliver.sh
+++ b/scripts/deliver.sh
@@ -62,11 +62,30 @@ if [ "${PROJECT_PRIVATE_KEY}" != "" ] && [ ! -f "./${PROJECT_OUT_FILE}.sig" ]; t
  error_exit "failed to find file: ${PROJECT_OUT_FILE}.sig" 1
 fi

-cp -f ./${PROJECT_OUT_FILE} ${DEST_DIR} || error_exit "failed to deliver file: ${PROJECT_OUT_FILE}" 1
-cp -f ./${PROJECT_OUT_FILE}.sha256 ${DEST_DIR} || error_exit "failed to deliver file: ${PROJECT_OUT_FILE}.sha256" 1
+cp -f ./${PROJECT_OUT_FILE} ${DEST_DIR} ||
+  error_exit "failed to deliver file: ${PROJECT_OUT_FILE}" 1
+
+cp -f ./${PROJECT_OUT_FILE}.sha256 ${DEST_DIR} ||
+  error_exit "failed to deliver file: ${PROJECT_OUT_FILE}.sha256" 1
+
 if [ "${PROJECT_PRIVATE_KEY}" != "" ]; then
-  cp -f ./${PROJECT_OUT_FILE}.sig ${DEST_DIR} || error_exit "failed to deliver file: ${PROJECT_OUT_FILE}.sig" 1
+  cp -f ./${PROJECT_OUT_FILE}.sig ${DEST_DIR} ||
+    error_exit "failed to deliver file: ${PROJECT_OUT_FILE}.sig" 1
 fi
+
+if [ "${PROJECT_IS_MINGW}" == "1" ] && [ -f "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe" ]; then
+  cp -f "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe" ${DEST_DIR} ||
+    error_exit "failed to deliver file: ${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}" 1
+
+  cp -f "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe.sha256" ${DEST_DIR} ||
+    error_exit "failed to deliver file: ${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.sha256" 1
+
+  if [ "${PROJECT_PRIVATE_KEY}" != "" ]; then
+    cp -f "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe.sig" ${DEST_DIR} ||
+      error_exit "failed to deliver file: ${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.sig" 1
+  fi
+fi
+
 popd

 error_exit "delivered ${PROJECT_FILE_PART}" 0
--- a/scripts/docker_common.sh
+++ b/scripts/docker_common.sh
@@ -26,10 +26,16 @@ if [ "${PROJECT_BUILD_ARCH}" == "aarch64" ]; then
  docker build ${APP_VERSION_BUILD_ARGS} \
    --platform linux/arm64 \
    --build-arg NUM_JOBS=${NUM_JOBS} \
+    --build-arg UID=$(id -u) \
+    --build-arg GID=$(id -g) \
+    --build-arg USERNAME=$(id -un) \
    -t ${DOCKER_TAG} . || exit 1
 else
  docker build ${APP_VERSION_BUILD_ARGS} \
    --build-arg NUM_JOBS=${NUM_JOBS} \
+    --build-arg UID=$(id -u) \
+    --build-arg GID=$(id -g) \
+    --build-arg USERNAME=$(id -un) \
    -t ${DOCKER_TAG} . || exit 1
 fi
 rm Dockerfile
--- a/scripts/env.sh
+++ b/scripts/env.sh
@@ -47,18 +47,29 @@ done

 PROJECT_APP_LIST=()
 PROJECT_CMAKE_OPTS=""
-PROJECT_ENABLE_WIN32_LONG_PATH_NAMES=OFF
 PROJECT_ENABLE_V2_ERRORS=OFF
+PROJECT_ENABLE_WIN32_LONG_PATH_NAMES=OFF
 PROJECT_IS_ALPINE=0
 PROJECT_IS_ARM64=0
+PROJECT_IS_DARWIN=0
 PROJECT_MINGW64_COPY_DEPENDENCIES=()
 PROJECT_MSYS2_PACKAGE_LIST=()
 PROJECT_REQUIRE_ALPINE=OFF
 PROJECT_STATIC_LINK=OFF

+if [ "$(uname -s)" == "Darwin" ]; then
+  PROJECT_IS_DARWIN=1
+fi
+
 if [ "${PROJECT_BUILD_ARCH}" == "" ]; then
-  PROJECT_BUILD_ARCH=x86_64
-elif [ "${PROJECT_BUILD_ARCH}" == "aarch64" ]; then
+  if [ "$(uname -m)" == "arm64" ]; then
+    PROJECT_BUILD_ARCH=aarch64
+  else
+    PROJECT_BUILD_ARCH=x86_64
+  fi
+fi
+
+if [ "${PROJECT_BUILD_ARCH}" == "aarch64" ]; then
  PROJECT_IS_ARM64=1
 fi

@@ -173,7 +184,11 @@ if [ "${PROJECT_STATIC_LINK}" == "ON" ]; then
  PROJECT_BUILD_SHARED_LIBS=OFF
  PROJECT_ENABLE_BACKWARD_CPP=OFF
  PROJECT_LINK_TYPE=static
-  PROJECT_REQUIRE_ALPINE=ON
+  if [ "${PROJECT_IS_DARWIN}" == "0" ]; then
+    PROJECT_REQUIRE_ALPINE=ON
+  else
+    PROJECT_REQUIRE_ALPINE=OFF
+  fi
 else
  PROJECT_BUILD_SHARED_LIBS=ON
  PROJECT_LINK_TYPE=shared
@@ -186,6 +201,9 @@ PROJECT_DIST_DIR=${PROJECT_SOURCE_DIR}/dist/${PROJECT_CMAKE_BUILD_TYPE_LOWER}/${
 if [ "${PROJECT_IS_MINGW}" == "1" ]; then
  PROJECT_DIST_DIR=${PROJECT_DIST_DIR}/win32
  PROJECT_BUILD_DIR=${PROJECT_BUILD_DIR}/win32
+elif [ "${PROJECT_IS_DARWIN}" == "1" ]; then
+  PROJECT_DIST_DIR=${PROJECT_DIST_DIR}/darwin
+  PROJECT_BUILD_DIR=${PROJECT_BUILD_DIR}/darwin
 else
  PROJECT_DIST_DIR=${PROJECT_DIST_DIR}/linux
  PROJECT_BUILD_DIR=${PROJECT_BUILD_DIR}/linux
@@ -247,6 +265,7 @@ PROJECT_CMAKE_OPTS="-DPROJECT_EXTERNAL_BUILD_ROOT=${PROJECT_EXTERNAL_BUILD_ROOT}
 PROJECT_CMAKE_OPTS="-DPROJECT_GIT_REV=${PROJECT_GIT_REV} ${PROJECT_CMAKE_OPTS}"
 PROJECT_CMAKE_OPTS="-DPROJECT_IS_ALPINE=${PROJECT_IS_ALPINE} ${PROJECT_CMAKE_OPTS}"
 PROJECT_CMAKE_OPTS="-DPROJECT_IS_ARM64=${PROJECT_IS_ARM64} ${PROJECT_CMAKE_OPTS}"
+PROJECT_CMAKE_OPTS="-DPROJECT_IS_DARWIN=${PROJECT_IS_DARWIN} ${PROJECT_CMAKE_OPTS}"
 PROJECT_CMAKE_OPTS="-DPROJECT_IS_MINGW=${PROJECT_IS_MINGW} ${PROJECT_CMAKE_OPTS}"
 PROJECT_CMAKE_OPTS="-DPROJECT_IS_MINGW_UNIX=${PROJECT_IS_MINGW_UNIX} ${PROJECT_CMAKE_OPTS}"
 PROJECT_CMAKE_OPTS="-DPROJECT_MAJOR_VERSION=${PROJECT_MAJOR_VERSION} ${PROJECT_CMAKE_OPTS}"
@@ -277,6 +296,8 @@ PATH="${PROJECT_EXTERNAL_BUILD_ROOT}/bin:${PATH}"

 if [ "${PROJECT_IS_MINGW}" == "1" ]; then
  PROJECT_OS=windows
+elif [ "${PROJECT_IS_DARWIN}" == "1" ]; then
+  PROJECT_OS=darwin
 else
  PROJECT_OS=linux
 fi
@@ -292,6 +313,8 @@ if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_IS_MINGW_UNIX}" != "1" ]; th
  MSYS=winsymlinks:nativestrict
 fi

+PROJECT_ENABLE_INNOSETUP=1
+
 export MSYS
 export NUM_JOBS
 export OPENSSL_ROOT_DIR
@@ -319,6 +342,7 @@ export PROJECT_FLUTTER_BASE_HREF
 export PROJECT_GIT_REV
 export PROJECT_IS_ALPINE
 export PROJECT_IS_ARM64
+export PROJECT_IS_DARWIN
 export PROJECT_IS_MINGW
 export PROJECT_IS_MINGW_UNIX
 export PROJECT_LINK_TYPE
@@ -371,6 +395,7 @@ 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 Darwin: ${PROJECT_IS_DARWIN}"
 echo "  Is MINGW on Unix: ${PROJECT_IS_MINGW_UNIX}"
 echo "  Is MINGW: ${PROJECT_IS_MINGW}"
 echo "  Job count: ${NUM_JOBS}"
--- a/scripts/libraries.sh
+++ b/scripts/libraries.sh
@@ -20,6 +20,7 @@ PROJECT_CLEANUP[EXPAT]="3rd_party/mingw64/expat-*"
 PROJECT_CLEANUP[GCC]="3rd_party/mingw64/gcc-*"
 PROJECT_CLEANUP[ICU]="3rd_party/mingw64/icu-release-*"
 PROJECT_CLEANUP[JSON]="3rd_party/json-*"
+PROJECT_CLEANUP[INNOSETUP]="3rd_party/mingw64/innosetup-*"
 PROJECT_CLEANUP[LIBBITCOIN_SYSTEM_ON]="3rd_party/boost_${PROJECT_VERSIONS[BOOST_MAJOR]}_${PROJECT_VERSIONS[BOOST_MINOR]}_*"
 PROJECT_CLEANUP[MINGW]="3rd_party/mingw64/mingw-w64-*"
 PROJECT_CLEANUP[OPENSSL]="3rd_party/openssl-*"
@@ -40,6 +41,7 @@ PROJECT_DOWNLOADS[GCC]="https://mirrorservice.org/sites/sourceware.org/pub/gcc/r
 PROJECT_DOWNLOADS[GTEST]="https://github.com/google/googletest/archive/refs/tags/v${PROJECT_VERSIONS[GTEST]}.tar.gz;googletest-${PROJECT_VERSIONS[GTEST]}.tar.gz;3rd_party"
 PROJECT_DOWNLOADS[ICU]="https://github.com/unicode-org/icu/archive/refs/tags/release-${PROJECT_VERSIONS[ICU]}.tar.gz;icu-release-${PROJECT_VERSIONS[ICU]}.tar.gz;3rd_party/mingw64"
 PROJECT_DOWNLOADS[JSON]="https://github.com/nlohmann/json/archive/refs/tags/v${PROJECT_VERSIONS[JSON]}.tar.gz;json-${PROJECT_VERSIONS[JSON]}.tar.gz;3rd_party"
+PROJECT_DOWNLOADS[INNOSETUP]="https://files.jrsoftware.org/is/6/innosetup-${PROJECT_VERSIONS[INNOSETUP]}.exe;innosetup-${PROJECT_VERSIONS[INNOSETUP]}.exe;3rd_party/mingw64"
 PROJECT_DOWNLOADS[MINGW]="https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${PROJECT_VERSIONS[MINGW]}.tar.bz2;;mingw-w64-v${PROJECT_VERSIONS[MINGW]}.tar.bz2;3rd_party/mingw64"
 PROJECT_DOWNLOADS[OPENSSL]="https://github.com/openssl/openssl/releases/download/openssl-${PROJECT_VERSIONS[OPENSSL]}/openssl-${PROJECT_VERSIONS[OPENSSL]}.tar.gz;openssl-${PROJECT_VERSIONS[OPENSSL]}.tar.gz;3rd_party"
 PROJECT_DOWNLOADS[PKG_CONFIG]="https://pkgconfig.freedesktop.org/releases/pkg-config-${PROJECT_VERSIONS[PKG_CONFIG]}.tar.gz;pkg-config-${PROJECT_VERSIONS[PKG_CONFIG]}.tar.gz;3rd_party/mingw64"
--- a/scripts/make_common.sh
+++ b/scripts/make_common.sh
@@ -43,6 +43,10 @@ make -j${CMAKE_BUILD_PARALLEL_LEVEL} || exit 1
 popd
 popd

+if [ -f "${PROJECT_SOURCE_DIR}/LICENSE.md" ]; then
+  rsync -av --progress "${PROJECT_SOURCE_DIR}/LICENSE.md" "${PROJECT_DIST_DIR}/"
+fi
+
 if [ "${PROJECT_IS_MINGW}" != "1" ] && [ "${PROJECT_REQUIRE_ALPINE}" == "ON" ]; then
  rsync -av --progress /usr/share/icu/74.2/ "${PROJECT_DIST_DIR}/icu/"
 fi
--- a/scripts/make_flutter.sh
+++ b/scripts/make_flutter.sh
@@ -5,7 +5,7 @@ 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
+  if [[ "${PROJECT_IS_DARWIN}" == "0" && ("${PROJECT_IS_MINGW}" == "0" || "${PROJECT_IS_MINGW_UNIX}" == "1") ]]; then
    FLUTTER_CONTAINER_NAME="${PROJECT_NAME}_flutter"
    FLUTTER_TAG_NAME="${PROJECT_NAME}:flutter"

--- a/scripts/make_package.sh
+++ b/scripts/make_package.sh
@@ -35,6 +35,16 @@ fi
 if [ -f "${PROJECT_OUT_FILE}.sig" ]; then
  rm -f "${PROJECT_OUT_FILE}.sig" || error_exit "failed to delete file: ${PROJECT_OUT_FILE}.sig" 1
 fi
+
+if [ -f "${PROJECT_FILE_PART}_setup.exe" ]; then
+  rm -f "${PROJECT_FILE_PART}_setup.exe" || error_exit "failed to delete file: ${PROJECT_FILE_PART}_setup.exe" 1
+fi
+if [ -f "${PROJECT_FILE_PART}_setup.exe.sha256" ]; then
+  rm -f "${PROJECT_FILE_PART}_setup.exe.sha256" || error_exit "failed to delete file: ${PROJECT_FILE_PART}_setup.exe.sha256" 1
+fi
+if [ -f "${PROJECT_FILE_PART}_setup.exe.sig" ]; then
+  rm -f "${PROJECT_FILE_PART}_setup.exe.sig" || error_exit "failed to delete file: ${PROJECT_FILE_PART}_setup.exe.sig" 1
+fi
 popd

 rsync -av --progress ${PROJECT_DIST_DIR}/ ${TEMP_DIR}/${PROJECT_NAME}/ || error_exit "failed to rsync" 1
@@ -63,4 +73,23 @@ tar cvzf "${PROJECT_OUT_FILE}" -C ${TEMP_DIR} . || error_exit "failed to create
 create_file_validations "${PROJECT_OUT_FILE}"
 popd

+if [ "${PROJECT_IS_MINGW}" == "1" ] && [ -f "${PROJECT_DIST_DIR}/../${PROJECT_NAME}.iss" ]; then
+  cp -f "${PROJECT_DIST_DIR}/../${PROJECT_NAME}.iss" "${TEMP_DIR}/${PROJECT_NAME}.iss"
+  rsync -av --progress --delete ${PROJECT_SOURCE_DIR}/support/3rd_party/*.msi ${TEMP_DIR}/3rd_party/
+
+  pushd "${TEMP_DIR}"
+  if [ "${PROJECT_IS_MINGW_UNIX}" == "1" ]; then
+    wine64 "c:/Program Files (x86)/Inno Setup 6/iscc.exe" "${PROJECT_NAME}.iss" || exit 1
+  else
+    iscc "${PROJECT_NAME}.iss" || exit 1
+  fi
+
+  pushd "Output"
+  create_file_validations "${PROJECT_FILE_PART}_setup.exe"
+  cp -f * "${PROJECT_DIST_DIR}/"
+  popd
+
+  popd
+fi
+
 error_exit "created package ${PROJECT_FILE_PART}" 0
--- a/scripts/make_unix.sh
+++ b/scripts/make_unix.sh
@@ -11,7 +11,7 @@ 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
+if [[ "${PROJECT_IS_DARWIN}" == "0" && ("${PROJECT_REQUIRE_ALPINE}" == "ON" || "${PROJECT_IS_ARM64}" == "1") ]]; then
  DOCKER_NAME=alpine
  DOCKER_CONTAINER=${PROJECT_NAME}_${DOCKER_NAME}_${PROJECT_BUILD_ARCH}
  DOCKER_TAG=${PROJECT_NAME}:${DOCKER_NAME}
--- a/scripts/versions.sh
+++ b/scripts/versions.sh
@@ -16,6 +16,7 @@ PROJECT_VERSIONS[EXPAT2]="2_7_1"
 PROJECT_VERSIONS[GCC]="15.1.0"
 PROJECT_VERSIONS[GTEST]="1.17.0"
 PROJECT_VERSIONS[ICU]="76-1"
+PROJECT_VERSIONS[INNOSETUP]="6.4.3"
 PROJECT_VERSIONS[JSON]="3.12.0"
 PROJECT_VERSIONS[MINGW]="13.0.0"
 PROJECT_VERSIONS[OPENSSL]="3.5.1"