v2.0.5-rc (#41)

Reviewed-on: #41
2025-03-26 07:02:38 -05:00
parent 24418ba03d
commit 62555e6125
135 changed files with 6792 additions and 796 deletions
--- a/scripts/copy_mingw64_deps.sh
+++ b/scripts/copy_mingw64_deps.sh
@ -15,6 +15,7 @@ if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_STATIC_LINK}" == "OFF" ]; th
    /mingw64/bin/libstdc++-6.dll
    /mingw64/bin/libwinpthread-1.dll
    /mingw64/bin/libzlib1.dll
+    /mingw64/bin/libzstd.dll
    /mingw64/bin/zlib1.dll
  )

--- a/scripts/deliver.sh
+++ b/scripts/deliver.sh
@ -38,14 +38,17 @@ BRANCH=$(git branch --show-current)
 RELEASE=$(grep PROJECT_RELEASE_ITER= ./config.sh | sed s/PROJECT_RELEASE_ITER=//g)
 popd

-if [ "${BRANCH}" == "master" ] || [ "${BRANCH}" == "alpha" ] || [ "${BRANCH}" == "beta" ] || [ "${BRANCH}" == "rc" ]; then
+if [ "${BRANCH}" == "master" ] || [ "${BRANCH}" == "alpha" ] ||
+  [ "${BRANCH}" == "main" ] || [ "${BRANCH}" == "release" ] ||
+  [ "${BRANCH}" == "beta" ] || [ "${BRANCH}" == "rc" ]; then
  DEST_DIR=${DEST_DIR}/${RELEASE}
-else
+elif [[ ${BRANCH} = *'-alpha-'* ]] || [[ ${BRANCH} = *'-beta-'* ]] ||
+  [[ ${BRANCH} = *'-rc-'* ]] || [[ ${BRANCH} = *'-release-'* ]]; then
  DEST_DIR=${DEST_DIR}/nightly
+else
+  error_exit "skipping ${PROJECT_FILE_PART}" 0
 fi

-echo ${DEST_DIR}
-
 pushd "${DIST_DIR}"
 if [ ! -f "./${PROJECT_OUT_FILE}" ]; then
  error_exit "failed to find file: ${PROJECT_OUT_FILE}" 1
--- a/scripts/docker_common.sh
+++ b/scripts/docker_common.sh
@ -1,6 +1,7 @@
 #!/bin/bash

-if [ "${PROJECT_BUILD_ARCH}" == "aarch64" ]; then
+if [ "${PROJECT_BUILD_ARCH}" == "aarch64" ] &&
+  [ "${PROJECT_ENABLE_MULTIARCH_DOCKER}" == "1" ]; then
  docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
 fi

--- a/scripts/env.sh
+++ b/scripts/env.sh
@ -7,6 +7,12 @@ PROJECT_IS_MINGW=$4
 PROJECT_IS_MINGW_UNIX=$5
 DISABLE_CREATE_DIRS=$6

+PROJECT_FLUTTER_BASE_HREF="/"
+
+if [ "${PROJECT_IS_MINGW}" != "1" ]; then
+  PROJECT_IS_MINGW_UNIX=0
+fi
+
 PROJECT_SOURCE_DIR=${PROJECT_SCRIPTS_DIR}/..
 PROJECT_SOURCE_DIR=$(realpath "${PROJECT_SOURCE_DIR}")

@ -306,9 +312,10 @@ export PROJECT_COMPANY_NAME
 export PROJECT_COPYRIGHT
 export PROJECT_DESC
 export PROJECT_DIST_DIR
-export PROJECT_ENABLE_WIN32_LONG_PATH_NAMES
 export PROJECT_ENABLE_V2_ERRORS
+export PROJECT_ENABLE_WIN32_LONG_PATH_NAMES
 export PROJECT_FILE_PART
+export PROJECT_FLUTTER_BASE_HREF
 export PROJECT_GIT_REV
 export PROJECT_IS_ALPINE
 export PROJECT_IS_ARM64
@ -361,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}"
--- a/scripts/libraries.sh
+++ b/scripts/libraries.sh
@ -59,7 +59,7 @@ PROJECT_DOWNLOADS[PKG_CONFIG]="https://pkgconfig.freedesktop.org/releases/pkg-co
 PROJECT_DOWNLOADS[PUGIXML]="https://github.com/zeux/pugixml/releases/download/v${PROJECT_VERSIONS[PUGIXML]}/pugixml-${PROJECT_VERSIONS[PUGIXML]}.tar.gz;pugixml-${PROJECT_VERSIONS[PUGIXML]}.tar.gz;3rd_party"
 PROJECT_DOWNLOADS[ROCKSDB]="https://github.com/facebook/rocksdb/archive/refs/tags/v${PROJECT_VERSIONS[ROCKSDB]}.tar.gz;rocksdb-${PROJECT_VERSIONS[ROCKSDB]}.tar.gz;3rd_party"
 PROJECT_DOWNLOADS[SPDLOG]="https://github.com/gabime/spdlog/archive/refs/tags/v${PROJECT_VERSIONS[SPDLOG]}.tar.gz;spdlog-${PROJECT_VERSIONS[SPDLOG]}.tar.gz;3rd_party"
-PROJECT_DOWNLOADS[SQLITE]="https://www.sqlite.org/2024/sqlite-amalgamation-${PROJECT_VERSIONS[SQLITE]}.zip;sqlite-amalgamation-${PROJECT_VERSIONS[SQLITE]}.zip;3rd_party"
+PROJECT_DOWNLOADS[SQLITE]="https://www.sqlite.org/2025/sqlite-amalgamation-${PROJECT_VERSIONS[SQLITE]}.zip;sqlite-amalgamation-${PROJECT_VERSIONS[SQLITE]}.zip;3rd_party"
 PROJECT_DOWNLOADS[STDUUID]="https://github.com/mariusbancila/stduuid/archive/refs/tags/v${PROJECT_VERSIONS[STDUUID]}.tar.gz;stduuid-${PROJECT_VERSIONS[STDUUID]}.tar.gz;3rd_party"
 PROJECT_DOWNLOADS[ZLIB]="https://github.com/madler/zlib/archive/refs/tags/v${PROJECT_VERSIONS[ZLIB]}.tar.gz;zlib-${PROJECT_VERSIONS[ZLIB]}.tar.gz;3rd_party/mingw64"
 export PROJECT_DOWNLOADS
--- a/scripts/make_common.sh
+++ b/scripts/make_common.sh
@ -18,6 +18,8 @@ fi
 ln -sf "${PROJECT_BUILD_DIR}/build/compile_commands.json" "${PROJECT_SOURCE_DIR}/compile_commands.json"

 pushd "${PROJECT_BUILD_DIR}"
+export CMAKE_BUILD_PARALLEL_LEVEL=${NUM_JOBS}
+
 cmake "${PROJECT_SOURCE_DIR}" \
  -G"Unix Makefiles" \
  -DPROJECT_COMPANY_NAME="${PROJECT_COMPANY_NAME}" \
@ -34,10 +36,10 @@ if [ "${PROJECT_BUILD_CLEAN}" == "clean" ]; then
  popd
 fi

-make -j${NUM_JOBS} || exit 1
+make || exit 1

 pushd build
-make -j${NUM_JOBS} || exit 1
+make -j${CMAKE_BUILD_PARALLEL_LEVEL} || exit 1
 popd
 popd

@ -79,6 +81,11 @@ EOF
  fi
 done

+if [ -f "${PROJECT_SOURCE_DIR}/web/${PROJECT_NAME}/pubspec.yaml" ]; then
+  rsync -av --progress "${PROJECT_SOURCE_DIR}/web/${PROJECT_NAME}/build/web/" \
+    "${PROJECT_DIST_DIR}/web/"
+fi
+
 if [ "${PROJECT_IS_MINGW}" == "1" ]; then
  . "${PROJECT_SCRIPTS_DIR}/copy_mingw64_deps.sh" "$1" "$2" "$3" "$4" "$5"
 fi
--- a/scripts/make_flutter.sh
+++ b/scripts/make_flutter.sh
@ -0,0 +1,43 @@
+#!/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}"
+    export MSYS_NO_PATHCONV=1
+    flutter clean
+    flutter build web --base-href=${PROJECT_FLUTTER_BASE_HREF} || exit 1
+    export MSYS_NO_PATHCONV=0
+    popd
+  fi
+fi
--- a/scripts/make_unix.sh
+++ b/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}
--- a/scripts/make_win32.cmd
+++ b/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_flutter.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1
  call mingw64 -no-start ./make_common.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1
 popd
--- a/scripts/versions.sh
+++ b/scripts/versions.sh
@ -8,25 +8,25 @@ PROJECT_VERSIONS[BOOST2_PATCH]="0"
 PROJECT_VERSIONS[BOOST_MAJOR]="1"
 PROJECT_VERSIONS[BOOST_MINOR]="87"
 PROJECT_VERSIONS[BOOST_PATCH]="0"
-PROJECT_VERSIONS[CPP_HTTPLIB]="0.18.1"
-PROJECT_VERSIONS[CURL]="8.11.0"
-PROJECT_VERSIONS[CURL2]="8_11_0"
+PROJECT_VERSIONS[CPP_HTTPLIB]="0.19.0"
+PROJECT_VERSIONS[CURL]="8.12.1"
+PROJECT_VERSIONS[CURL2]="8_12_1"
 PROJECT_VERSIONS[EXPAT]="2.6.4"
 PROJECT_VERSIONS[EXPAT2]="2_6_4"
 PROJECT_VERSIONS[GCC]="14.2.0"
-PROJECT_VERSIONS[GTEST]="1.15.2"
+PROJECT_VERSIONS[GTEST]="1.16.0"
 PROJECT_VERSIONS[ICU]="76-1"
 PROJECT_VERSIONS[JSON]="3.11.3"
 PROJECT_VERSIONS[LIBSODIUM]="1.0.20"
 PROJECT_VERSIONS[MESA]="23.3.3"
 PROJECT_VERSIONS[MINGW]="12.0.0"
-PROJECT_VERSIONS[OPENSSL]="3.4.0"
+PROJECT_VERSIONS[OPENSSL]="3.4.1"
 PROJECT_VERSIONS[PKG_CONFIG]="0.29.2"
-PROJECT_VERSIONS[PUGIXML]="1.14"
-PROJECT_VERSIONS[ROCKSDB]="9.7.4"
-PROJECT_VERSIONS[SPDLOG]="1.15.0"
-PROJECT_VERSIONS[SQLITE]="3460100"
-PROJECT_VERSIONS[SQLITE2]="3.46.1"
+PROJECT_VERSIONS[PUGIXML]="1.15"
+PROJECT_VERSIONS[ROCKSDB]="9.10.0"
+PROJECT_VERSIONS[SPDLOG]="1.15.1"
+PROJECT_VERSIONS[SQLITE]="3490100"
+PROJECT_VERSIONS[SQLITE2]="3.49.1"
 PROJECT_VERSIONS[STDUUID]="1.2.3"
 PROJECT_VERSIONS[ZLIB]="1.3.1"
 export PROJECT_VERSIONS