Merge branch 'v2.1.0-rc.2-develop' of ssh://git.fifthgrid.com:3022/BlockStorage/repertory into v2.1.0-rc.2-develop

2025-10-19 13:53:35 -05:00
parent e5169445ae 0471faab2b
commit 2af0ab4641
9 changed files with 38 additions and 29 deletions
--- a/cmake/versions.cmake
+++ b/cmake/versions.cmake
@@ -1,15 +1,15 @@
 set(BINUTILS_VERSION 2.44)
-set(BOOST2_MAJOR_VERSION 1)
-set(BOOST2_MINOR_VERSION 76)
-set(BOOST2_PATCH_VERSION 0)
 set(BOOST_MAJOR_VERSION 1)
 set(BOOST_MINOR_VERSION 89)
 set(BOOST_PATCH_VERSION 0)
+set(BOOST2_MAJOR_VERSION 1)
+set(BOOST2_MINOR_VERSION 76)
+set(BOOST2_PATCH_VERSION 0)
 set(CPP_HTTPLIB_VERSION 0.26.0)
-set(CURL2_VERSION 8_16_0)
 set(CURL_VERSION 8.16.0)
-set(EXPAT2_VERSION 2_7_1)
+set(CURL2_VERSION 8_16_0)
 set(EXPAT_VERSION 2.7.1)
+set(EXPAT2_VERSION 2_7_1)
 set(GCC_VERSION 15.2.0)
 set(GTEST_VERSION 1.17.0)
 set(ICU_VERSION 76-1)
@@ -22,9 +22,9 @@ set(PKG_CONFIG_VERSION 0.29.2)
 set(PUGIXML_VERSION 1.15)
 set(ROCKSDB_VERSION 10.5.1)
 set(SPDLOG_VERSION 1.15.3)
-set(SQLITE2_VERSION 3.50.4)
 set(SQLITE_VERSION 3500400)
+set(SQLITE2_VERSION 3.50.4)
 set(STDUUID_VERSION 1.2.3)
-set(WINFSP2_VERSION 2.1)
 set(WINFSP_VERSION 2.1.25156)
+set(WINFSP2_VERSION 2.1)
 set(ZLIB_VERSION 1.3.1)
--- a/scripts/deliver.cmd
+++ b/scripts/deliver.cmd
@@ -8,6 +8,6 @@ set ARG1=%~3
 set ARG2=%~4
 set ARG3=%~5

-pushd "%~dp0%"
+pushd "%~dp0"
  call mingw64 -no-start ./deliver.sh "%DEST%" "%DIST%" "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1
 popd
--- a/scripts/deliver.sh
+++ b/scripts/deliver.sh
@@ -7,6 +7,11 @@ PROJECT_SCRIPTS_DIR=$(realpath "$0")
 PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}")
 . "${PROJECT_SCRIPTS_DIR}/env.sh" "$3" "$4" "$5" "$6" "$7"

+COPY_OPS=-f
+if [ "${PROJECT_IS_DARWIN}" == "1" ]; then
+  COPY_OPS="${COPY_OPS} -X"
+fi
+
 function error_exit() {
  echo $1
  exit $2
@@ -38,13 +43,16 @@ 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}" == "main" ] || [ "${BRANCH}" == "release" ] ||
-  [ "${BRANCH}" == "beta" ] || [ "${BRANCH}" == "rc" ]; then
-  DEST_DIR=${DEST_DIR}/${RELEASE}
-elif [[ ${BRANCH} = *'-alpha-'* ]] || [[ ${BRANCH} = *'-beta-'* ]] ||
-  [[ ${BRANCH} = *'-rc-'* ]] || [[ ${BRANCH} = *'-release-'* ]]; then
-  DEST_DIR=${DEST_DIR}/nightly
+if [[ "${BRANCH}" =~ ^(master|main|release)$ ]] ||
+  [[ "${BRANCH}" =~ ^(alpha|beta|rc)(\.[0-9]+)?$ ]]; then
+  DEST_DIR="${DEST_DIR}/$([[ "${BRANCH}" =~ ^(master|main|release)$ ]] &&
+    printf '%s' "${RELEASE}" ||
+    printf '%s' "${BRANCH%%.*}")"
+elif [[ "${BRANCH}" == *"-alpha-"* ]] || [[ "${BRANCH}" == *"-beta-"* ]] ||
+  [[ "${BRANCH}" == *"-rc-"* ]] || [[ "${BRANCH}" == *"-release-"* ]] ||
+  [[ "${BRANCH}" == *"-alpha."* ]] || [[ "${BRANCH}" == *"-beta."* ]] ||
+  [[ "${BRANCH}" == *"-rc."* ]]; then
+  DEST_DIR="${DEST_DIR}/nightly"
 else
  error_exit "skipping ${PROJECT_FILE_PART}" 0
 fi
@@ -62,39 +70,39 @@ 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} ||
+cp ${COPY_OPS} ./${PROJECT_OUT_FILE} ${DEST_DIR} ||
  error_exit "failed to deliver file: ${PROJECT_OUT_FILE}" 1

-cp -f ./${PROJECT_OUT_FILE}.sha256 ${DEST_DIR} ||
+cp ${COPY_OPS} ./${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} ||
+  cp ${COPY_OPS} ./${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} ||
+  cp ${COPY_OPS} "${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} ||
+  cp ${COPY_OPS} "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe.sha256" ${DEST_DIR} ||
    error_exit "failed to deliver file: ${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe.sha256" 1

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

 if [ "${PROJECT_IS_DARWIN}" == "1" ] && [ -f "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg" ]; then
-  cp -f -X "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg" ${DEST_DIR} ||
+  cp ${COPY_OPS} "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg" ${DEST_DIR} ||
    error_exit "failed to deliver file: ${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg" 1

-  cp -f -X "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg.sha256" ${DEST_DIR} ||
+  cp ${COPY_OPS} "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg.sha256" ${DEST_DIR} ||
    error_exit "failed to deliver file: ${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg.sha256" 1

  if [ "${PROJECT_PRIVATE_KEY}" != "" ]; then
-    cp -f -X "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg.sig" ${DEST_DIR} ||
+    cp ${COPY_OPS} "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg.sig" ${DEST_DIR} ||
      error_exit "failed to deliver file: ${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg.sig" 1
  fi
 fi
--- a/scripts/info.cmd
+++ b/scripts/info.cmd
@@ -6,7 +6,7 @@ set ARG1=%~1
 set ARG2=%~2
 set ARG3=%~3

-pushd "%~dp0%"
+pushd "%~dp0"
  call mingw64 -no-start ./info.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 
 popd

--- a/scripts/make_package.cmd
+++ b/scripts/make_package.cmd
@@ -6,6 +6,6 @@ set ARG1=%~1
 set ARG2=%~2
 set ARG3=%~3

-pushd "%~dp0%"
+pushd "%~dp0"
  call mingw64 -no-start ./make_package.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1
 popd
--- a/scripts/make_win32.cmd
+++ b/scripts/make_win32.cmd
@@ -6,7 +6,7 @@ set ARG1=%~1
 set ARG2=%~2
 set ARG3=%~3

-pushd "%~dp0%"
+pushd "%~dp0"
  call setup_msys2.cmd "%ARG1%" "%ARG2%" "%ARG3%"
  if exist "cleanup.cmd" (
    call cleanup.cmd "%ARG1%" "%ARG2%" "%ARG3%" 1 0
--- a/scripts/run_tests.cmd
+++ b/scripts/run_tests.cmd
@@ -6,7 +6,7 @@ set ARG1=%~1
 set ARG2=%~2
 set ARG3=%~3

-pushd "%~dp0%"
+pushd "%~dp0"
  call mingw64 -no-start ./run_tests.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 
 popd

--- a/scripts/setup_msys2.cmd
+++ b/scripts/setup_msys2.cmd
@@ -6,7 +6,7 @@ set ARG1=%~1
 set ARG2=%~2
 set ARG3=%~3

-pushd "%~dp0%"
+pushd "%~dp0"
  call mingw64 -no-start ./setup_msys2.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0
  call mingw64 -no-start ./setup_msys2.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 
 popd
--- a/scripts/setup_msys2.sh
+++ b/scripts/setup_msys2.sh
@@ -14,6 +14,7 @@ PROJECT_MSYS2_PACKAGE_LIST+=(
  mingw64/mingw-w64-x86_64-diffutils
  mingw64/mingw-w64-x86_64-gcc
  mingw64/mingw-w64-x86_64-gdb
+  mingw64/mingw-w64-x86_64-git-lfs
  mingw64/mingw-w64-x86_64-icu
  mingw64/mingw-w64-x86_64-make
  mingw64/mingw-w64-x86_64-mesa