Merge branch 'develop'

Author: dacuster

.devcontainer/.vscode-docker/c_cpp_properties.json

@@ -15,4 +15,4 @@
         }
     ],
     "version": 4
-}
+}

.devcontainer/Dockerfile.ubuntu

@@ -53,7 +53,7 @@ RUN set -ex \
 ARG BOOST_VERSION=1.68.0
 RUN set -ex \
     && export boost_version_underscore=$(echo ${BOOST_VERSION} | tr '.' '_') \
-    && curl -fsSLo /tmp/boost_${boost_version_underscore}.tar.gz https://archives.boost.io/release/1.68.0/source/boost_${boost_version_underscore}.tar.gz \
+    && curl -fsSLo /tmp/boost_${boost_version_underscore}.tar.gz https://archives.boost.io/release/${BOOST_VERSION}/source/boost_${boost_version_underscore}.tar.gz \
     && tar -C /tmp/ -xzf /tmp/boost_${boost_version_underscore}.tar.gz \
     && cd /tmp/boost_${boost_version_underscore} \
     && ./bootstrap.sh \

.devcontainer/docker_build_win.ps1

@@ -4,72 +4,86 @@
 
 # Get arguments from the user
 param (
-  [String]$windows_image,
-  [String]$windows_version,
-  [String]$python3_versions = "3.9.0 3.10.0 3.11.0 3.12.0 3.13.0",
-  [String]$arch = "x64"
+    [String]$windows_image,
+    [String]$windows_version,
+    [String]$python3_versions = "3.9.0 3.10.0 3.11.0 3.12.0 3.13.0",
+    [String]$arch = "x64"
 )
 
-try {
-  # Determine some information about windows an the PC so we can run the right docker image
-  if (-not ${windows_image}) {
+# Determine some information about windows an the PC so we can run the right docker image
+if (-not ${windows_image})
+{
     $product_type = (Get-WmiObject -Class Win32_OperatingSystem).ProductType
-    if (${product_type} -eq 1) {
-         $windows_image = "mcr.microsoft.com/windows"
-    } else {
-         $windows_image = "mcr.microsoft.com/windows/servercore"
+    if (${product_type} -eq 1)
+    {
+        $windows_image = "mcr.microsoft.com/windows"
     }
-  }
-  if (-not ${windows_version}) {
+    else
+    {
+        $windows_image = "mcr.microsoft.com/windows/servercore"
+    }
+}
+
+if (-not ${windows_version})
+{
     $windows_version = "ltsc2022"
-  }
+}
 
-  Write-Host "${windows_version_table}"
+Write-Host "${windows_version_table}"
 
-  # Determine how much resources we can provide the docker container
-  $num_cpus = (Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors
-  $memory = (Get-CimInstance Win32_PhysicalMemory | Measure-Object -Property capacity -Sum).sum /1gb
+# Determine how much resources we can provide the docker container
+$num_cpus = (Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors
+$memory = (Get-CimInstance Win32_PhysicalMemory | Measure-Object -Property capacity -Sum).sum /1gb
 
-  # Find the script directory and set some constants
-  $script_dir = $PSScriptRoot
-  $project_dir = "${script_dir}/.."
-  $dockerfile = "${script_dir}/Dockerfile.windows"
-  $image_name = "microstrain/mscl_windows_builder:${windows_version}"
+# Find the script directory and set some constants
+$script_dir = $PSScriptRoot
+$project_dir = "${script_dir}/.."
+$dockerfile = "${script_dir}/Dockerfile.windows"
+$image_name = "microstrain/mscl_windows_builder:${windows_version}"
 
-  if ("${arch}" -eq "x86") {
+if ("${arch}" -eq "x86")
+{
     $cmake_arch = "Win32"
-  } else {
+}
+else
+{
     $cmake_arch = ${arch}
-  }
+}
+
+# Construct the flags that we will pass to the build script
+$python2_build_script_flags = "-python2Dirs C:/Python2.7-${cmake_arch}"
+$python3_build_script_flags = "-python3Dirs "
 
-  # Construct the flags that we will pass to the build script
-  $python2_build_script_flags = "-python2Dirs C:/Python2.7-${cmake_arch}"
-  $python3_build_script_flags = "-python3Dirs "
-  foreach ($python3_version in ${python3_versions}.split(" ")) {
+foreach ($python3_version in ${python3_versions}.split(" "))
+{
     $python3_build_script_flags += "C:/Python${python3_version}-${cmake_arch},"
-  }
-  $python3_build_script_flags = $python3_build_script_flags.TrimEnd(',')
+}
+
+$python3_build_script_flags = $python3_build_script_flags.TrimEnd(',')
 
-  # Make sure we have the most recent image (okay if this fails)
-  docker pull "${windows_image}:${windows_version}"
+# Make sure we have the most recent image (okay if this fails)
+docker pull "${windows_image}:${windows_version}"
 
-  # Build the image
-  docker build `
+# Build the image
+docker build `
     -t "${image_name}" `
     -f "${dockerfile}" `
     --build-arg WINDOWS_IMAGE="${windows_image}" `
     --build-arg WINDOWS_VERSION="${windows_version}" `
     --build-arg PYTHON3_VERSIONS="${python3_versions}" `
     "${project_dir}"
 
-  if ("${env:ISHUDSONBUILD}" -eq "True") {
+if ("${env:ISHUDSONBUILD}" -eq "True")
+{
     $docker_it_flags = ""
-  } else {
+}
+else
+{
     $docker_it_flags = "-it"
-  }
+}
 
-  # Run the build
-  docker run `
+# Run the build
+docker run `
     --rm `
     ${docker_it_flags} `
     --cpus="${num_cpus}" `
@@ -78,12 +92,7 @@ try {
     -v "${project_dir}:C:/Projects/MSCL" `
     -w "C:/projects/mscl" `
     "${image_name}" -Command " `
-      git config --global --add safe.directory C:/projects/mscl; `
-      git fetch origin --tags; `
-      & 'C:/Projects/MSCL/BuildScripts/build_win.ps1' -branch ${env:BRANCH_NAME} -arch ${cmake_arch} -buildDir C:/projects/mscl/build_windows_${arch} ${python2_build_script_flags} ${python3_build_script_flags}; `
+        git config --global --add safe.directory C:/projects/mscl; `
+        git fetch origin --tags; `
+        & 'C:/Projects/MSCL/BuildScripts/build_win.ps1' -branch ${env:BRANCH_NAME} -arch ${cmake_arch} -buildDir C:/projects/mscl/build_windows_${arch} ${python2_build_script_flags} ${python3_build_script_flags}; `
     "
-}
-catch {
-  # Rethrow the exception to display in the console
-  throw $_
-}

BuildScripts/buildReadme_Linux.md

@@ -20,7 +20,7 @@ For more information on how to configure the build to use, or not use the option
 
 - \>= gcc 4.9.1-5
 - \>= [cmake 3.16](https://cmake.org/download/)
--   \= [Boost 1.68](https://www.boost.org/users/download/)
+- \>= [Boost 1.68](https://www.boost.org/users/download/)
 
 ##### Optional
 

BuildScripts/buildReadme_Windows.md

@@ -22,7 +22,7 @@ For more information on how to configure the build to use, or not use the option
 
 - \>= [Visual Studio 2015](https://visualstudio.microsoft.com/downloads/) (msvc-14.0) or MSBuild equivalent
 - \>= [cmake 3.16](https://cmake.org/download/)
--   \= [Boost 1.68](https://www.boost.org/users/download/)
+- \>= [Boost 1.68](https://www.boost.org/users/download/)
 
 ##### Optional
 
@@ -44,11 +44,11 @@ this is what a common `LIB_PATH` directory will look like:
 
 #### Installing Boost
 
-SourceForge hosts some [Pre-Built Boost binaries for Windows](https://sourceforge.net/projects/boost/files/boost-binaries/1.68.0/).
+SourceForge hosts some [Pre-Built Boost binaries for Windows](https://sourceforge.net/projects/boost/files/boost-binaries/).
 Simply installing these for your specific compiler will make it so you do not need to build Boost yourself, which can be time-consuming.
 
 If you want to install Boost yourself, you can follow the instructions on
-[Boost's Getting Started page](https://www.boost.org/doc/libs/1_68_0/more/getting_started/windows.html).
+[Boost's Getting Started page](https://www.boost.org/doc/libs/1_79_0/more/getting_started/windows.html).
 
 ## Building MSCL for C++
 

BuildScripts/build_win.ps1

@@ -10,6 +10,12 @@ param (
     [String[]]$python2Dirs
 )
 
+# Cache the error action to reset it later
+$CacheErrorActionPreference = ${ErrorActionPreference}
+
+# Stop executing when cmdlets fail (does not stop functions from stopping execution)
+$ErrorActionPreference = 'Stop'
+
 try
 {
     # Get some directory information
@@ -22,23 +28,38 @@ try
     # Make sure the build directory exists
     New-Item "${buildDir}" -ItemType Directory -Force
 
+    if (-Not ($?))
+    {
+        throw $_
+    }
+
     # Configure MSCL to build the documentation and zip examples only on x64 release
     if ("$arch" -eq "x64")
     {
         cmake -S "${project_dir}" -B "${buildDir}" -G "${generator}" -A "${arch}" -T "${toolset}" `
-        -DCMAKE_VERBOSE_MAKEFILE="ON" `
-        -DBUILD_SHARED_LIBS="OFF" `
-        -DMSCL_BUILD_PYTHON2="OFF" `
-        -DMSCL_BUILD_PYTHON3="OFF" `
-        -DMSCL_BUILD_CSHARP="OFF" `
-        -DMSCL_BUILD_TESTS="OFF" `
-        -DMSCL_BUILD_EXAMPLES="OFF" `
-        -DMSCL_ZIP_EXAMPLES="ON" `
-        -DMSCL_BUILD_DOCUMENTATION="ON" `
-        -DMSCL_BUILD_PACKAGE="ON" `
-        -DMSCL_BRANCH="${branch}"
+            -DCMAKE_VERBOSE_MAKEFILE="ON" `
+            -DBUILD_SHARED_LIBS="OFF" `
+            -DMSCL_BUILD_PYTHON2="OFF" `
+            -DMSCL_BUILD_PYTHON3="OFF" `
+            -DMSCL_BUILD_CSHARP="OFF" `
+            -DMSCL_BUILD_TESTS="OFF" `
+            -DMSCL_BUILD_EXAMPLES="OFF" `
+            -DMSCL_ZIP_EXAMPLES="ON" `
+            -DMSCL_BUILD_DOCUMENTATION="ON" `
+            -DMSCL_BUILD_PACKAGE="ON" `
+            -DMSCL_BRANCH="${branch}"
+
+        if (-Not ($?))
+        {
+            throw $_
+        }
 
         cmake --build "${buildDir}" --config "Release" --target package
+
+        if (-Not ($?))
+        {
+            throw $_
+        }
     }
 
     # Configure MSCL to build with everything except csharp, python2, and python3
@@ -55,11 +76,27 @@ try
         -DMSCL_BUILD_PACKAGE="ON" `
         -DMSCL_BRANCH="${branch}"
 
+    if (-Not ($?))
+    {
+        throw $_
+    }
+
     # Build multiple configurations
     foreach ($config in ${configs})
     {
         cmake --build "${buildDir}" --config "${config}" --target package
+
+        if (-Not ($?))
+        {
+            throw $_
+        }
+
         cmake --build "${buildDir}" --config "${config}" --target "RUN_TESTS"
+
+        if (-Not ($?))
+        {
+            throw $_
+        }
     }
 
     # Build CSharp
@@ -76,10 +113,20 @@ try
         -DMSCL_BUILD_PACKAGE="ON" `
         -DMSCL_BRANCH="${branch}"
 
+    if (-Not ($?))
+    {
+        throw $_
+    }
+
     # Build multiple configurations for CSharp
     foreach ($config in ${configs})
     {
         cmake --build "${buildDir}" --config "${config}" --target package
+
+        if (-Not ($?))
+        {
+            throw $_
+        }
     }
 
     # Build python3
@@ -105,10 +152,20 @@ try
                 -UPython3_INCLUDE_DIR `
                 -UPython3_EXECUTABLE -DPython3_EXECUTABLE="${python3Dir}/python.exe"
 
+            if (-Not ($?))
+            {
+                throw $_
+            }
+
             # Build multiple configurations
             foreach ($config in ${configs})
             {
                 cmake --build "${buildDir}" --config "${config}" --target package
+
+                if (-Not ($?))
+                {
+                    throw $_
+                }
             }
         }
     }
@@ -136,16 +193,31 @@ try
                 -UPython2_INCLUDE_DIR `
                 -UPython2_EXECUTABLE -DPython2_EXECUTABLE="${python2Dir}/python.exe"
 
+            if (-Not ($?))
+            {
+                throw $_
+            }
+
             # Build multiple configurations
             foreach ($config in ${configs})
             {
                 cmake --build "${buildDir}" --config "${config}" --target package
+
+                if (-Not ($?))
+                {
+                    throw $_
+                }
             }
         }
     }
 }
 catch
 {
-    # Rethrow the exception to display in the console
+    # Propagate exception up to calling script
     throw $_
 }
+finally
+{
+    # Reset the ErrorActionPreference
+    $ErrorActionPreference = ${CacheErrorActionPreference}
+}