Merge remote-tracking branch 'origin/main' into develop

.gitignore

@@ -12,3 +12,9 @@ support/Dockerfile
 version.cpp
 version.rc
 .DS_Store
+*.gz
+*.bz2
+*.xz
+*.zip
+*.msi
+*.exe

.jenkins_builds

@@ -37,6 +37,12 @@ pipeline {
           }
         }
 
+        stage('clean_packages') {
+          steps { script { retryWithBackoff(2, 5) { sh 'clean_packages.sh' } } }
+        }
+        stage('grab_packages') {
+          steps { script { retryWithBackoff(2, 5) { sh 'grab_packages.sh' } } }
+        }
         stage('win32_shared') {
           steps { script { retryWithBackoff(2, 5) { sh 'scripts/test_win32.sh shared' } } }
         }

.jenkins_macos

@@ -36,6 +36,12 @@ pipeline {
           }
         }
 
+        stage('clean_packages') {
+          steps { script { retryWithBackoff(2, 5) { sh 'clean_packages.sh' } } }
+        }
+        stage('grab_packages') {
+          steps { script { retryWithBackoff(2, 5) { sh 'grab_packages.sh' } } }
+        }
         stage('macos_aarch64_shared') {
           steps {
             script { retryWithBackoff(2, 5) { sh 'scripts/test_unix.sh shared' } }

.jenkins_msys2

@@ -36,6 +36,12 @@ pipeline {
           }
         }
 
+        stage('clean_packages') {
+          steps { script { retryWithBackoff(2, 5) { sh 'clean_packages.cmd' } } }
+        }
+        stage('grab_packages') {
+          steps { script { retryWithBackoff(2, 5) { sh 'grab_packages.cmd' } } }
+        }
         stage('msys2_x86_64_shared') {
           steps {
             script { retryWithBackoff(2, 5) { bat 'scripts\\test_msys2.cmd shared "" x86_64' } }

README.md

@@ -36,13 +36,26 @@ All builds are orchestrated through project scripts — **direct CMake invocatio
 
 ## 🚀 Getting Started
 
-### 1️⃣ Clone the Build System
+### 1️⃣ Clone the Build System and Grab Packages
 ```bash
 git clone https://git.fifthgrid.com/sgraves/cpp-build-system.git
 git clone https://github.com/sgraves76/cpp-build-system.git
 cd cpp-build-system
 ```
 
+Run the root-level `grab_packages.sh`/`grab_packages.cmd`
+
+Example:
+```bash
+./grab_packages.sh
+```
+
+```cmd
+grab_packages.cmd
+```
+
+This will download and validate all packages currently supported by `cpp-build-system`. They will be placed within the `support/3rd_party/` folder.
+
 ---
 
 ### 2️⃣ Create a New Project
@@ -52,11 +65,11 @@ Run the root-level `create_project.sh` with:
 
 Example:
 ```bash
-./create_project.sh MyApp ~/dev
+./create_project.sh MyApp ~/src
 ```
 This creates:
 ```
-~/dev/MyApp/
+~/src/MyApp/
 ```
 
 The new directory contains:
@@ -70,7 +83,7 @@ The new directory contains:
 
 ### 3️⃣ Configure the Project
 
-In your new project directory (`~/dev/MyApp/`), edit these two files before your first build:
+In your new project directory (`~/src/MyApp/`), edit these two files before your first build:
 
 > ⚠️ **Important Notice:**  
 > Do **not modify** the root `CMakeLists.txt` file in your project.  
@@ -155,7 +168,7 @@ Use the provided build wrappers — they take two arguments:
   If you later want to **add back packages** you previously turned off (and which `cleanup.sh` removed), run the **template’s** update script from the `cpp-build-system` repository root, pointing it at your project path:  
   ```bash
   # from the cpp-build-system repo root
-  ./update_project.sh ~/dev/MyApp
+  ./update_project.sh ~/src/MyApp
   ```
   This will **restore all template-managed packages and scripts** (including `cleanup.sh`) into your project so you can re-enable dependencies via `config.sh` and rebuild.
 

clean_packages.cmd

@@ -0,0 +1,11 @@
+@echo off
+
+setlocal
+
+pushd "%~dp0"
+call src\scripts\setup_msys2.cmd
+
+call mingw64 -no-start ./clean_packages.sh
+popd
+
+endlocal

clean_packages.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+CURRENT_DIR=$(realpath "$0")
+CURRENT_DIR=$(dirname "${CURRENT_DIR}")
+
+pushd "${CURRENT_DIR}"
+
+mapfile -t FILE_LIST < <(find support/3rd_party/ -type f \( -name '*.gz' -o -name '*.bz2' -o -name '*.xz' -o -name '*.msi' -o -name '*.zip' \))
+
+for NAME in "${FILE_LIST[@]}"; do
+  echo "Removing ${NAME}"
+  rm -f "${NAME}"
+done
+
+mapfile -t FILE_LIST < <(find support/3rd_party/mingw64/ -type f \( -name '*.exe' \))
+for NAME in "${FILE_LIST[@]}"; do
+  echo "Removing ${NAME}"
+  rm -f "${NAME}"
+done
+
+popd

grab_packages.cmd

@@ -0,0 +1,11 @@
+@echo off
+
+setlocal
+
+pushd "%~dp0"
+call src\scripts\setup_msys2.cmd
+
+call mingw64 -no-start ./grab_packages.sh
+popd
+
+endlocal

grab_packages.sh

@@ -6,66 +6,34 @@ CURRENT_DIR=$(dirname "${CURRENT_DIR}")
 . "${CURRENT_DIR}/src/scripts/versions.sh"
 . "${CURRENT_DIR}/src/scripts/libraries.sh"
 
-function check_should_update() {
+function download_package() {
   local NAME=$1
   local ITEM_LIST=(${PROJECT_DOWNLOADS[${NAME}]//;/ })
-  if [ ! -f "${CURRENT_DIR}/support/${ITEM_LIST[2]}/${ITEM_LIST[1]}" ] ||
-    [ ! -f "${CURRENT_DIR}/support/${ITEM_LIST[2]}/${ITEM_LIST[1]}.sha256" ]; then
-    return 0
-  fi
-
-  return 1
-}
-
-function download_and_update_hash() {
-  local NAME=$1
-  local ITEM_LIST=(${PROJECT_DOWNLOADS[${NAME}]//;/ })
-  if [ ! -f "${CURRENT_DIR}/support/${ITEM_LIST[2]}/${ITEM_LIST[1]}" ] ||
-    [ ! -f "${CURRENT_DIR}/support/${ITEM_LIST[2]}/${ITEM_LIST[1]}.sha256" ]; then
-    local CLEANUP_LIST=(${PROJECT_CLEANUP[${NAME}]//:/ })
-    if [ "${NAME}" == "GTEST" ]; then
-      CLEANUP_LIST=(${PROJECT_CLEANUP["TESTING"]//:/ })
-    fi
-
-    if [ "${NAME}" != "BOOST" ] && [ "${NAME}" != "BOOST2" ] && [ "${CLEANUP_LIST[0]}" != "" ]; then
-      rm -r ${CURRENT_DIR}/support/${CLEANUP_LIST[0]}
-    fi
-
+  if [ ! -f "${CURRENT_DIR}/support/${ITEM_LIST[2]}/${ITEM_LIST[1]}" ]; then
     rm -f "${CURRENT_DIR}/support/${ITEM_LIST[2]}/${ITEM_LIST[1]}"
-    rm -f "${CURRENT_DIR}/support/${ITEM_LIST[2]}/${ITEM_LIST[1]}.sha256"
 
     if ! wget ${ITEM_LIST[0]} -O "${CURRENT_DIR}/support/${ITEM_LIST[2]}/${ITEM_LIST[1]}"; then
       echo "failed $NAME"
       rm -f "${CURRENT_DIR}/support/${ITEM_LIST[2]}/${ITEM_LIST[1]}"
       exit 1
     fi
-    pushd "${CURRENT_DIR}/support/${ITEM_LIST[2]}"
-    sha256sum ${ITEM_LIST[1]} >${ITEM_LIST[1]}.sha256
+
+    pushd "${CURRENT_DIR}/support/${ITEM_LIST[2]}/"
+    if ! sha256sum -c "${CURRENT_DIR}/support/${ITEM_LIST[2]}/${ITEM_LIST[1]}.sha256"; then
+      rm -f "${CURRENT_DIR}/support/${ITEM_LIST[2]}/${ITEM_LIST[1]}"
+      echo "failed sha256 validation: $NAME"
+      exit 1
+    fi
     popd
   fi
-
-  local HASH=$(cat support/${ITEM_LIST[2]}/${ITEM_LIST[1]}.sha256 | awk '{print $1}')
-  HASH_LIST+=("set(${NAME}_HASH ${HASH})")
 }
 
-function create_hashes_cmake() {
+function download_packages() {
   for NAME in "${!PROJECT_DOWNLOADS[@]}"; do
-    if [ "${NAME}" != "BOOST" ] && [ "${NAME}" != "BOOST2" ]; then
-      download_and_update_hash $NAME
-    fi
+    download_package $NAME
   done
 }
 
 pushd "${CURRENT_DIR}"
-HASH_LIST=()
-create_hashes_cmake
-
-if check_should_update BOOST || check_should_update BOOST2; then
-  rm -f support/3rd_party/boost_*
-fi
-
-download_and_update_hash BOOST
-download_and_update_hash BOOST2
-
-(printf "%s\n" "${HASH_LIST[@]}" | sort) >${CURRENT_DIR}/cmake/hashes.cmake
+download_packages
 popd

scripts/create_packages.sh

@@ -0,0 +1,74 @@
+#!/usr/bin/env bash
+
+SCRIPTS_DIR=$(dirname "$0")
+SCRIPTS_DIR=$(realpath ${SCRIPTS_DIR})
+
+CURRENT_DIR=${SCRIPTS_DIR}/..
+CURRENT_DIR=$(realpath "${CURRENT_DIR}")
+
+. "${CURRENT_DIR}/src/scripts/versions.sh"
+. "${CURRENT_DIR}/src/scripts/libraries.sh"
+
+function check_should_update() {
+  local NAME=$1
+  local ITEM_LIST=(${PROJECT_DOWNLOADS[${NAME}]//;/ })
+  if [ ! -f "${CURRENT_DIR}/support/${ITEM_LIST[2]}/${ITEM_LIST[1]}" ] ||
+    [ ! -f "${CURRENT_DIR}/support/${ITEM_LIST[2]}/${ITEM_LIST[1]}.sha256" ]; then
+    return 0
+  fi
+
+  return 1
+}
+
+function download_and_update_hash() {
+  local NAME=$1
+  local ITEM_LIST=(${PROJECT_DOWNLOADS[${NAME}]//;/ })
+  if [ ! -f "${CURRENT_DIR}/support/${ITEM_LIST[2]}/${ITEM_LIST[1]}" ] ||
+    [ ! -f "${CURRENT_DIR}/support/${ITEM_LIST[2]}/${ITEM_LIST[1]}.sha256" ]; then
+    local CLEANUP_LIST=(${PROJECT_CLEANUP[${NAME}]//:/ })
+    if [ "${NAME}" == "GTEST" ]; then
+      CLEANUP_LIST=(${PROJECT_CLEANUP["TESTING"]//:/ })
+    fi
+
+    if [ "${NAME}" != "BOOST" ] && [ "${NAME}" != "BOOST2" ] && [ "${CLEANUP_LIST[0]}" != "" ]; then
+      rm -r ${CURRENT_DIR}/support/${CLEANUP_LIST[0]}
+    fi
+
+    rm -f "${CURRENT_DIR}/support/${ITEM_LIST[2]}/${ITEM_LIST[1]}"
+    rm -f "${CURRENT_DIR}/support/${ITEM_LIST[2]}/${ITEM_LIST[1]}.sha256"
+
+    if ! wget ${ITEM_LIST[0]} -O "${CURRENT_DIR}/support/${ITEM_LIST[2]}/${ITEM_LIST[1]}"; then
+      echo "failed $NAME"
+      rm -f "${CURRENT_DIR}/support/${ITEM_LIST[2]}/${ITEM_LIST[1]}"
+      exit 1
+    fi
+    pushd "${CURRENT_DIR}/support/${ITEM_LIST[2]}"
+    sha256sum ${ITEM_LIST[1]} >${ITEM_LIST[1]}.sha256
+    popd
+  fi
+
+  local HASH=$(cat support/${ITEM_LIST[2]}/${ITEM_LIST[1]}.sha256 | awk '{print $1}')
+  HASH_LIST+=("set(${NAME}_HASH ${HASH})")
+}
+
+function create_hashes_cmake() {
+  for NAME in "${!PROJECT_DOWNLOADS[@]}"; do
+    if [ "${NAME}" != "BOOST" ] && [ "${NAME}" != "BOOST2" ]; then
+      download_and_update_hash $NAME
+    fi
+  done
+}
+
+pushd "${CURRENT_DIR}"
+HASH_LIST=()
+create_hashes_cmake
+
+if check_should_update BOOST || check_should_update BOOST2; then
+  rm -f support/3rd_party/boost_*
+fi
+
+download_and_update_hash BOOST
+download_and_update_hash BOOST2
+
+(printf "%s\n" "${HASH_LIST[@]}" | sort) >${CURRENT_DIR}/cmake/hashes.cmake
+popd