fix darwin copy to fuse drives

.cspell/words.txt

@@ -27,6 +27,7 @@ cstdint
 cxxflags
 cxxopts_project
 cxxstd
+cygpath
 d_largefile64_source
 d_largefile_source
 d_ndebug
@@ -160,6 +161,7 @@ msvc
 msvcr120
 msvcr90
 mswsock
+msys2
 mtune
 mwindows
 nana

.gitignore

@@ -11,3 +11,4 @@ scripts/cleanup.sh
 support/Dockerfile
 version.cpp
 version.rc
+.DS_Store

.jenkins_msys2

@@ -0,0 +1,97 @@
+#!groovy
+pipeline {
+  agent none
+
+  environment {
+    PROJECT_TEST_CONFIG_DIR = "C:\\.ci\\cpp_build_system\\test"
+  }
+
+  options {
+    disableConcurrentBuilds()
+    skipDefaultCheckout()
+    timestamps()
+  }
+
+  stages {
+    stage('msys2 x86_64') {
+      agent any
+      stages {
+        stage('Checkout') {
+          steps {
+            script {
+              int maxAttempts = 6
+              int baseDelay = 10
+              for (int attempt = 1; attempt <= maxAttempts; attempt++) {
+                try {
+                  checkout scm
+                  break
+                } catch (err) {
+                  if (attempt == maxAttempts) { throw err }
+                  int waitSec = baseDelay * (1 << (attempt - 1))
+                  echo "Checkout failed (attempt ${attempt}/${maxAttempts}). Waiting ${waitSec}s before retry..."
+                  sleep time: waitSec, unit: 'SECONDS'
+                }
+              }
+            }
+          }
+        }
+
+        stage('msys2_x86_64_shared') {
+          steps {
+            script { retryWithBackoff(2, 5) { bat 'scripts\\test_msys2.cmd shared "" x86_64' } }
+          }
+        }
+        stage('msys2_x86_64_shared_crypto') {
+          steps {
+            script { retryWithBackoff(2, 5) { bat 'scripts\\test_msys2.cmd shared 1 x86_64' } }
+          }
+        }
+        stage('msys2_x86_64_shared_crypto_no_boost') {
+          steps {
+            script { retryWithBackoff(2, 5) { bat 'scripts\\test_msys2.cmd shared 7 x86_64' } }
+          }
+        }
+        stage('msys2_x86_64_shared_dsm') {
+          steps {
+            script { retryWithBackoff(2, 5) { bat 'scripts\\test_msys2.cmd shared 2 x86_64' } }
+          }
+        }
+        stage('msys2_x86_64_shared_sqlite') {
+          steps {
+            script { retryWithBackoff(2, 5) { bat 'scripts\\test_msys2.cmd shared 3 x86_64' } }
+          }
+        }
+        stage('msys2_x86_64_shared_errors_v1') {
+          steps {
+            script { retryWithBackoff(2, 5) { bat 'scripts\\test_msys2.cmd shared 4 x86_64' } }
+          }
+        }
+        stage('msys2_x86_64_shared_fmt') {
+          steps {
+            script { retryWithBackoff(2, 5) { bat 'scripts\\test_msys2.cmd shared 5 x86_64' } }
+          }
+        }
+        stage('msys2_x86_64_shared_libevent') {
+          steps {
+            script { retryWithBackoff(2, 5) { bat 'scripts\\test_msys2.cmd shared 6 x86_64' } }
+          }
+        }
+      }
+    }
+  }
+}
+
+def retryWithBackoff(int maxAttempts, int baseDelaySeconds, Closure body) {
+  for (int attempt = 1; attempt <= maxAttempts; attempt++) {
+    try {
+      body()
+      return
+    } catch (err) {
+      if (attempt == maxAttempts) { throw err }
+      int waitSec = baseDelaySeconds * (1 << (attempt - 1))
+      echo "Step failed (attempt ${attempt}/${maxAttempts}). Waiting ${waitSec}s before retry..."
+      sleep time: waitSec, unit: 'SECONDS'
+    }
+  }
+}
+

CHANGELOG.md

@@ -0,0 +1,21 @@
+# Changelog
+
+## v1.0.1-release
+
+### Issues
+
+- \#1 Add Windows MSYS2 Jenkins build and testing support
+
+### Changes from v1.0.0-release
+
+- Remove stray "_libevent_" inserted mid-name on macOS x86_64 Jenkins test builds
+- Properly handle `alpha.x`, `beta.x` and `rc.x` releases in `deliver.sh`
+- Use `cygpath` to format Windows paths for use in MSYS2
+
+---
+
+## v1.0.0-release
+
+- Initial Release
+
+---

create_project.cmd

@@ -2,7 +2,11 @@
 
 setlocal
 
-pushd "%~dp0%"
+pushd "%~dp0"
 call src\scripts\setup_msys2.cmd
-call mingw64 -no-start ./create_project.sh "%1" "%2"
+
+for /f "usebackq tokens=*" %%i in (`cygpath "%~2"`) do set ARG1=%%i
+call mingw64 -no-start ./create_project.sh "%~1" "%ARG1%"
 popd
+
+endlocal

create_project.sh

@@ -18,6 +18,7 @@ create_versions_cmake
 
 process_file .jenkins_builds
 process_file .jenkins_macos
+process_file .jenkins_msys2
 process_file .nvimrc
 process_file CMakeLists.txt
 process_file config.sh

scripts/common.sh

@@ -52,7 +52,7 @@ elif [ "${WITH_TYPE}" == "7" ]; then
 fi
 
 if [ "${BUILD_ARCH}" != "" ]; then
-  NAME=${NAME}_libevent_${BUILD_ARCH}
+  NAME=${NAME}_${BUILD_ARCH}
 fi
 
 rm -rf "${TEST_DIR}/${NAME}"

scripts/test_msys2.cmd

@@ -0,0 +1,82 @@
+@echo off
+
+setlocal EnableExtensions
+
+set "SED=sed"
+
+set "SCRIPTS_DIR=%~dp0"
+pushd "%SCRIPTS_DIR%"
+set "SCRIPTS_DIR=%CD%"
+popd
+
+set "SOURCE_DIR=%~dp0.."
+pushd "%SOURCE_DIR%"
+set "SOURCE_DIR=%CD%"
+popd
+
+set "TEST_DIR=%SOURCE_DIR%\build"
+
+set "PLATFORM=msys2"
+set "BUILD_TYPE=%1"
+set "WITH_TYPE=%2"
+
+if /I not "%BUILD_TYPE%"=="shared" if /I not "%BUILD_TYPE%"=="static" (
+  call :ERROR_EXIT "Must specify 'shared' or 'static'." 1
+)
+
+if not defined TEST_DIR (
+  call :ERROR_EXIT "TEST_DIR is not set." 1
+)
+
+if not exist "%TEST_DIR%" mkdir "%TEST_DIR%"
+
+set "NAME=%BUILD_TYPE%"
+if "%WITH_TYPE%"=="1" set "NAME=%NAME%_crypto"
+if "%WITH_TYPE%"=="2" set "NAME=%NAME%_dsm"
+if "%WITH_TYPE%"=="3" set "NAME=%NAME%_sqlite"
+if "%WITH_TYPE%"=="4" set "NAME=%NAME%_errors_v1"
+if "%WITH_TYPE%"=="5" set "NAME=%NAME%_fmt"
+if "%WITH_TYPE%"=="6" set "NAME=%NAME%_libevent"
+if "%WITH_TYPE%"=="7" set "NAME=%NAME%_crypto_no_boost"
+
+if exist "%TEST_DIR%\%NAME%\" rd /s /q "%TEST_DIR%\%NAME%"
+
+pushd "%SOURCE_DIR%"
+call ".\create_project.cmd" "%NAME%" "%TEST_DIR%" || (
+  call :ERROR_EXIT "Failed to create %PLATFORM% project." 2
+)
+popd
+
+pushd "%TEST_DIR%\%NAME%"
+if "%WITH_TYPE%"=="1" (
+  %SED% -i "s/PROJECT_ENABLE_LIBSODIUM=OFF/PROJECT_ENABLE_LIBSODIUM=ON/g" ".\config.sh"
+  %SED% -i "s/PROJECT_ENABLE_BOOST=OFF/PROJECT_ENABLE_BOOST=ON/g"         ".\config.sh"
+  %SED% -i "s/PROJECT_ENABLE_JSON=OFF/PROJECT_ENABLE_JSON=ON/g"           ".\config.sh"
+)
+if "%WITH_TYPE%"=="2" %SED% -i "s/PROJECT_ENABLE_LIBDSM=OFF/PROJECT_ENABLE_LIBDSM=ON/g" ".\config.sh"
+if "%WITH_TYPE%"=="3" %SED% -i "s/PROJECT_ENABLE_SQLITE=OFF/PROJECT_ENABLE_SQLITE=ON/g" ".\config.sh"
+if "%WITH_TYPE%"=="4" %SED% -i "s/PROJECT_ENABLE_V2_ERRORS=ON/PROJECT_ENABLE_V2_ERRORS=OFF/g" ".\config.sh"
+if "%WITH_TYPE%"=="5" %SED% -i "s/PROJECT_ENABLE_FMT=OFF/PROJECT_ENABLE_FMT=ON/g" ".\config.sh"
+if "%WITH_TYPE%"=="6" %SED% -i "s/PROJECT_ENABLE_LIBEVENT=OFF/PROJECT_ENABLE_LIBEVENT=ON/g" ".\config.sh"
+if "%WITH_TYPE%"=="7" %SED% -i "s/PROJECT_ENABLE_LIBSODIUM=OFF/PROJECT_ENABLE_LIBSODIUM=ON/g" ".\config.sh"
+
+if /I "%BUILD_TYPE%"=="shared" (
+  %SED% -i "s/PROJECT_STATIC_LINK=ON/PROJECT_STATIC_LINK=OFF/g" ".\config.sh"
+)
+
+call .\scripts\make_win32.cmd || (
+  call :ERROR_EXIT "build %PLATFORM% failed." 3
+)
+
+call .\scripts\run_tests.cmd || (
+  call :ERROR_EXIT "testing %PLATFORM% failed." 3
+)
+popd
+
+if exist "%TEST_DIR%\%NAME%\" rd /s /q "%TEST_DIR%\%NAME%"
+
+exit 0
+
+:ERROR_EXIT
+echo %1
+exit %2

src/.jenkins_msys2

@@ -0,0 +1,77 @@
+#!groovy
+
+pipeline {
+  agent none
+
+  environment {
+    PROJECT_TEST_CONFIG_DIR = "c:\\.ci\\%PROJECT_NAME%\\test"
+  }
+
+  options {
+    disableConcurrentBuilds()
+    skipDefaultCheckout()
+    timestamps()
+  }
+
+  stages {
+    // stage('Build • Test • Deliver')
+    stage('Build • Test') {
+      agent any
+      stages {
+        stage('Checkout') {
+          steps {
+            script {
+              int maxAttempts = 6
+              int baseDelay   = 10
+              for (int attempt = 1; attempt <= maxAttempts; attempt++) {
+                try {
+                  checkout scm
+                  break
+                } catch (err) {
+                  if (attempt == maxAttempts) { throw err }
+                  int waitSec = baseDelay * (1 << (attempt - 1))
+                  echo "Checkout failed (attempt ${attempt}/${maxAttempts}). Waiting ${waitSec}s before retry..."
+                  sleep time: waitSec, unit: 'SECONDS'
+                }
+              }
+            }
+          }
+        }
+
+        stage('msys2_x86_64') {
+          steps { script { retryWithBackoff(2, 5) { bat 'scripts\\make_win32.cmd x86_64' } } }
+        }
+
+        stage('test') {
+          steps {
+            script {
+              retryWithBackoff(2, 5) { bat 'scripts\\run_tests.cmd x86_64' }
+            }
+          }
+        }
+
+        // stage('deliver') {
+        //   steps {
+        //     script {
+        //       retryWithBackoff(3, 10) { bat 'scripts\\deliver.cmd C:\\deliver\\%PROJECT_NAME% "" x86_64' }
+        //     }
+        //   }
+        // }
+      }
+    }
+  }
+}
+
+def retryWithBackoff(int maxAttempts, int baseDelaySeconds, Closure body) {
+  for (int attempt = 1; attempt <= maxAttempts; attempt++) {
+    try {
+      body()
+      return
+    } catch (err) {
+      if (attempt == maxAttempts) { throw err }
+      int waitSec = baseDelaySeconds * (1 << (attempt - 1))
+      echo "Step failed (attempt ${attempt}/${maxAttempts}). Waiting ${waitSec}s before retry..."
+      sleep time: waitSec, unit: 'SECONDS'
+    }
+  }
+}

src/scripts/cleanup.cmd

@@ -6,6 +6,6 @@ set ARG1=%~1
 set ARG2=%~2
 set ARG3=%~3
 
-pushd "%~dp0%"
+pushd "%~dp0"
   call mingw64 -no-start ./cleanup.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 
 popd

src/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

src/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" ] ||
+if [[ "${BRANCH}" =~ ^(master|main|release)$ ]] ||
-  [ "${BRANCH}" == "main" ] || [ "${BRANCH}" == "release" ] ||
+  [[ "${BRANCH}" =~ ^(alpha|beta|rc)(\.[0-9]+)?$ ]]; then
-  [ "${BRANCH}" == "beta" ] || [ "${BRANCH}" == "rc" ]; then
+  DEST_DIR="${DEST_DIR}/$([[ "${BRANCH}" =~ ^(master|main|release)$ ]] &&
-  DEST_DIR=${DEST_DIR}/${RELEASE}
+    printf '%s' "${RELEASE}" ||
-elif [[ ${BRANCH} = *'-alpha-'* ]] || [[ ${BRANCH} = *'-beta-'* ]] ||
+    printf '%s' "${BRANCH%%.*}")"
-  [[ ${BRANCH} = *'-rc-'* ]] || [[ ${BRANCH} = *'-release-'* ]]; then
+elif [[ "${BRANCH}" == *"-alpha-"* ]] || [[ "${BRANCH}" == *"-beta-"* ]] ||
-  DEST_DIR=${DEST_DIR}/nightly
+  [[ "${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

src/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
 

src/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

src/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

src/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
 

src/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

src/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

update_project.cmd

@@ -2,6 +2,9 @@
 
 setlocal
 
-pushd "%~dp0%"
+pushd "%~dp0"
-call mingw64 -no-start ./update_project.sh "%1" "%2"
+for /f "usebackq tokens=*" %%i in (`cygpath "%~2"`) do set ARG1=%%i
+call mingw64 -no-start ./update_project.sh "%~1" "%ARG1%"
 popd
+
+endlocal