From eb87ce71ca08dd01b0fb004fdd771354b75f8c95 Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Fri, 18 Aug 2023 16:36:50 -0600
Subject: [PATCH 01/20] Initial restructure of build tree.

---
 .github/actions/build-cse/action.yml | 16 +++++++++--
 .github/workflows/build-and-test.yml | 43 +++++++++++++++++++++-------
 CMakeLists.txt                       |  7 +++--
 build.bat                            |  8 +-----
 build.sh                             |  5 ++++
 cmake/build.cmake                    | 31 +++++++++++++-------
 cmake/configure-and-build.cmake      |  2 ++
 cmake/configure.cmake                | 42 ++++++++++++++++++++-------
 cmake/utility.cmake                  | 24 ++++++++++++++++
 src/CMakeLists.txt                   |  4 +--
 10 files changed, 136 insertions(+), 46 deletions(-)
 create mode 100755 build.sh
 create mode 100644 cmake/configure-and-build.cmake
 create mode 100644 cmake/utility.cmake

diff --git a/.github/actions/build-cse/action.yml b/.github/actions/build-cse/action.yml
index 7c31e539e..6ef5c52b0 100644
--- a/.github/actions/build-cse/action.yml
+++ b/.github/actions/build-cse/action.yml
@@ -1,5 +1,15 @@
 name: "Build CSE"
 description: "Get git info (for version) and build CSE executable"
+inputs:
+  arch:
+    description: Target architecture ("32" or "64" bit)
+    default: "32"
+  config:
+    description: Configuration (Release or Debug bit)
+    default: Release
+  build_dir:
+    description: Relative path to the build directory
+    default: build
 runs:
   using: composite
   steps:
@@ -9,6 +19,6 @@ runs:
     - name: Save branch name
       run: echo "CI_GIT_BRANCH=${{steps.branch-name.outputs.current_branch}}" >> $GITHUB_ENV
       shell: bash
-    - name: Build
-      shell: cmd
-      run: build.bat
+    - name: Build and Configure
+      shell: bash
+      run: cmake -DBUILD_ARCHITECTURE=${{ inputs.arch }} -DCONFIGURATION=${{ inputs.config }} -DBUILD_DIRECTORY=${{ inputs.build_dir }} -P cmake/configure-and-build.cmake
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 620b7234e..b326f2548 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -4,11 +4,31 @@ on: push
 
 jobs:
   build-cse:
-    name: Build and test CSE
-    runs-on: windows-2022
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: windows
+            os_ver: "2022"
+            config: Release
+            arch: "32"
+          - os: windows
+            os_ver: "2022"
+            config: Release
+            arch: "64"
+          - os: macos
+            os_ver: "11"
+            config: Release
+            arch: "64"
+          - os: ubuntu
+            os_ver: "22.04"
+            config: Release
+            arch: "64"
     defaults:
       run:
         shell: bash
+    name: ${{ matrix.os }}-${{ matrix.os_ver }}-${{ matrix.arch }}bit ${{ matrix.config }}
+    runs-on: ${{ matrix.os }}-${{ matrix.os_ver }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3.3.0
@@ -17,24 +37,25 @@ jobs:
           submodules: recursive
       - name: Build CSE
         uses: ./.github/actions/build-cse
+        with:
+          arch: ${{ matrix.arch }}
+          config: ${{ matrix.config }}
       - name: Build cse_tests.exe (unit tests)
-        run: cmake --build . --config Release --target cse_tests
-        working-directory: msvc/build
-      - name: Upload cse.exe artifact
+        run: cmake -DBUILD_ARCHITECTURE=${{ matrix.arch }} -DCONFIGURATION=${{ matrix.config }} -DTARGET_NAME=cse_tests -DBUILD_DIRECTORY=build -P cmake/build.cmake
+      - name: Upload executable artifact
         uses: actions/upload-artifact@v3
         with:
-          name: CSE.exe
-          path: msvc/CSE.exe
+          name: CSE
+          path: build/CSE*
       - name: Build wcmp executable
-        run: cmake --build . --config Release --target wcmp
-        working-directory: msvc/build
+        run: cmake -DBUILD_ARCHITECTURE=${{ matrix.arch }} -DCONFIGURATION=${{ matrix.config }} -DTARGET_NAME=wcmp -DBUILD_DIRECTORY=build -P cmake/build.cmake
       # - name: Setup Mesa3D
       #   uses: bigladder/github-actions/setup-mesa3d@main
       #   with:
       #     install-directory: msvc
       - name: Test
-        run: ctest -C Release -j 2 --output-on-failure -E shadetest  # CI can't do GPU calcs at this time (the steps above get us close, but throws an exception on destruction)
-        working-directory: msvc/build
+        run: ctest -C ${{ matrix.config }} -j 2 --output-on-failure -E shadetest  # CI can't do GPU calcs at this time (the steps above get us close, but throws an exception on destruction)
+        working-directory: build
   build-doc:
     name: Build CSE documentation
     needs: build-cse
diff --git a/CMakeLists.txt b/CMakeLists.txt
index af778f74a..899387610 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ project(CSE)
 # target_link_libraries() allows use with targets in other directories. Set to new in 3.13 or higher.
 cmake_policy(SET CMP0079 NEW)
 
-set (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
+set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
 # Only create Release and Debug configuration types
 # Set a default build type if none was specified
@@ -32,12 +32,15 @@ if(NOT CSE_BUILD_ARCHITECTURE)
     set_property(CACHE CSE_BUILD_ARCHITECTURE PROPERTY STRINGS "32" "64")
 else()
   if(NOT WIN32 AND CSE_BUILD_ARCHITECTURE STREQUAL "32")
-    # TODO: Warn if 32 used on MacOS or Linux and set to 64
     message(WARNING "CSE_BUILD_ARCHITECTURE was set to '32', but is not supported on Unix systems.")
     set(CSE_BUILD_ARCHITECTURE "64" CACHE STRING "Choose architecture size for the build." FORCE)
   endif()
 endif()
 
+if(NOT CSE_EXECUTABLE_DIRECTORY)
+  set(CSE_EXECUTABLE_DIRECTORY ${CMAKE_BINARY_DIR})
+endif()
+
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
 include(BuildFlags)
diff --git a/build.bat b/build.bat
index 797289d01..672a97deb 100644
--- a/build.bat
+++ b/build.bat
@@ -5,13 +5,7 @@ if "%console_mode%"=="" (set console_mode=1& for %%x in (%cmdcmdline%) do if /i
 set arch="32"
 if "%1"=="64" (set arch="%1")
 
-cmake -DBUILD_ARCHITECTURE=%arch% -P cmake/configure.cmake
-if %errorlevel% neq 0 (
-  if "%parent%"=="%~0" ( if "%console_mode%"=="0" pause )
-  exit /B %errorlevel%
-)
-
-cmake -DBUILD_ARCHITECTURE=%arch% -P cmake/build.cmake
+cmake -DBUILD_ARCHITECTURE=%arch% -DCONFIGURATION=Release -P cmake/configure-and-build.cmake
 if %errorlevel% neq 0 (
   if "%parent%"=="%~0" ( if "%console_mode%"=="0" pause )
   exit /B %errorlevel%
diff --git a/build.sh b/build.sh
new file mode 100755
index 000000000..fa4589be2
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e
+
+cmake -DBUILD_ARCHITECTURE=64 -DCONFIGURATION=Release -P cmake/configure-and-build.cmake
\ No newline at end of file
diff --git a/cmake/build.cmake b/cmake/build.cmake
index de0e68dfe..c89e90328 100644
--- a/cmake/build.cmake
+++ b/cmake/build.cmake
@@ -1,14 +1,25 @@
-message("Building CSE...")
-set(BUILD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/msvc/build)
-if ("${BUILD_ARCHITECTURE}" STREQUAL "64")
-  set(BUILD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/msvc/build64)
-endif()
+message("Building ${TARGET_NAME}...")
+if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
+  set(BUILD_ARGS -m)
+else()
+  set(BUILD_ARGS -j)
+endif ()
+
+include(cmake/utility.cmake)
+if (NOT DEFINED BUILD_DIRECTORY)
+  set_build_directory()
+endif ()
+
+if (NOT DEFINED TARGET_NAME)
+  set(TARGET_NAME CSE)
+endif ()
+
 execute_process(COMMAND ${CMAKE_COMMAND}
-  --build ${BUILD_DIR}
-  --config Release
-  --target CSE
-  -- -m
-  WORKING_DIRECTORY ${BUILD_DIR}
+  --build ${BUILD_DIRECTORY}
+  --config ${CONFIGURATION}
+  --target ${TARGET_NAME}
+  -- ${BUILD_ARGS}
+  WORKING_DIRECTORY ${BUILD_DIRECTORY}
   RESULT_VARIABLE success
 )
 if (${success} MATCHES "0")
diff --git a/cmake/configure-and-build.cmake b/cmake/configure-and-build.cmake
new file mode 100644
index 000000000..fa7a4a331
--- /dev/null
+++ b/cmake/configure-and-build.cmake
@@ -0,0 +1,2 @@
+include(cmake/configure.cmake)
+include(cmake/build.cmake)
\ No newline at end of file
diff --git a/cmake/configure.cmake b/cmake/configure.cmake
index 92dc4bb53..b4ebaba14 100644
--- a/cmake/configure.cmake
+++ b/cmake/configure.cmake
@@ -1,17 +1,39 @@
-set(TARGET_VS_ARCHITECTURE Win32)
-set(BUILD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/msvc/build)
 if ("${BUILD_ARCHITECTURE}" STREQUAL "64")
-  set(TARGET_VS_ARCHITECTURE x64)
-  set(BUILD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/msvc/build64)
+    set(TARGET_VS_ARCHITECTURE x64)
+else()
+    set(TARGET_VS_ARCHITECTURE Win32)
 endif()
-message("Making build directory: ${BUILD_DIR}")
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/msvc)
-file(MAKE_DIRECTORY ${BUILD_DIR})
+
+include(cmake/utility.cmake)
+if (NOT DEFINED BUILD_DIRECTORY)
+    set_build_directory()
+    set(EXECUTABLE_DIRECTORY ${BUILDS_DIRECTORY})
+endif ()
+
+if (NOT DEFINED CONFIGURATION)
+    set(CONFIGURATION Release)
+endif ()
+
+file(MAKE_DIRECTORY ${BUILD_DIRECTORY})
+
+set(configure_command ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} -DCSE_BUILD_ARCHITECTURE=${BUILD_ARCHITECTURE})
+
+if (DEFINED EXECUTABLE_DIRECTORY)
+    set(configure_command ${configure_command} -DCSE_EXECUTABLE_DIRECTORY=${EXECUTABLE_DIRECTORY})
+endif ()
+
+if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
+    set(configure_command ${configure_command} -T v142,version=14.29.16.11 -A ${TARGET_VS_ARCHITECTURE}  -DCMAKE_SYSTEM_VERSION=10.0.20348.0)
+else()
+    set(configure_command ${configure_command} -DCMAKE_BUILD_TYPE=${CONFIGURATION})
+endif()
+
 message("Generating project files...")
-execute_process(COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} -T v142,version=14.29.16.11 -A ${TARGET_VS_ARCHITECTURE} -DCSE_BUILD_ARCHITECTURE=${BUILD_ARCHITECTURE} -DCMAKE_SYSTEM_VERSION=10.0.20348.0
-  WORKING_DIRECTORY ${BUILD_DIR}
-  RESULT_VARIABLE success
+execute_process(COMMAND ${configure_command}
+    WORKING_DIRECTORY ${BUILD_DIRECTORY}
+    RESULT_VARIABLE success
 )
+
 if (NOT ${success} MATCHES "0")
   message(FATAL_ERROR "Generation step failed.")
 endif()
\ No newline at end of file
diff --git a/cmake/utility.cmake b/cmake/utility.cmake
new file mode 100644
index 000000000..ab256b4f9
--- /dev/null
+++ b/cmake/utility.cmake
@@ -0,0 +1,24 @@
+macro(set_build_directory)
+    set(BUILDS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/builds)
+    if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
+        if ("${BUILD_ARCHITECTURE}" STREQUAL "64")
+            set(TARGET_VS_ARCHITECTURE x64)
+            set(BUILD_DIRECTORY ${BUILDS_DIRECTORY}/msvc-64)
+        else()
+            set(TARGET_VS_ARCHITECTURE Win32)
+            set(BUILD_DIRECTORY ${BUILDS_DIRECTORY}/msvc-32)
+        endif()
+    elseif ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin")
+        if ("${CONFIGURATION}" STREQUAL "Debug")
+            set(BUILD_DIRECTORY ${BUILDS_DIRECTORY}/clang-debug)
+        else()
+            set(BUILD_DIRECTORY ${BUILDS_DIRECTORY}/clang-release)
+        endif()
+    elseif ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
+        if ("${CONFIGURATION}" STREQUAL "Debug")
+            set(BUILD_DIRECTORY ${BUILDS_DIRECTORY}/gcc-debug)
+        else()
+            set(BUILD_DIRECTORY ${BUILDS_DIRECTORY}/gcc-release)
+        endif()
+    endif ()
+endmacro()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1141310b6..def2af1ca 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -272,8 +272,6 @@ target_link_libraries(CSE ${libs})
 
 add_dependencies(CSE version_header)
 
-set(exeDir "${CMAKE_SOURCE_DIR}/msvc") # TODO: Change for other platforms. Alternatively, Bin/..?
-
 if ("${CSE_BUILD_ARCHITECTURE}" STREQUAL "64")
   set_target_properties(CSE PROPERTIES
     OUTPUT_NAME "CSE64"
@@ -286,6 +284,6 @@ set_target_properties(CSE PROPERTIES
 
 foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
     string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG_CAPS)
-    set_target_properties(CSE PROPERTIES RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG_CAPS} ${exeDir})
+    set_target_properties(CSE PROPERTIES RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG_CAPS} ${CSE_EXECUTABLE_DIRECTORY})
 endforeach()
 

From be7e3f57f55ce5165bed68e5e9159c21a97260f9 Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Fri, 18 Aug 2023 16:43:55 -0600
Subject: [PATCH 02/20] Fix build directory reference.

---
 cmake/build.cmake | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmake/build.cmake b/cmake/build.cmake
index c89e90328..11b38226d 100644
--- a/cmake/build.cmake
+++ b/cmake/build.cmake
@@ -1,4 +1,8 @@
+if (NOT DEFINED TARGET_NAME)
+  set(TARGET_NAME CSE)
+endif ()
 message("Building ${TARGET_NAME}...")
+
 if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
   set(BUILD_ARGS -m)
 else()
@@ -10,12 +14,8 @@ if (NOT DEFINED BUILD_DIRECTORY)
   set_build_directory()
 endif ()
 
-if (NOT DEFINED TARGET_NAME)
-  set(TARGET_NAME CSE)
-endif ()
-
 execute_process(COMMAND ${CMAKE_COMMAND}
-  --build ${BUILD_DIRECTORY}
+  --build .
   --config ${CONFIGURATION}
   --target ${TARGET_NAME}
   -- ${BUILD_ARGS}

From 302f214ef853b9e4a7426e30e7df495101663235 Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Fri, 18 Aug 2023 16:47:03 -0600
Subject: [PATCH 03/20] Install linux libraries for penumbra on CI.

---
 .github/actions/build-cse/action.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/actions/build-cse/action.yml b/.github/actions/build-cse/action.yml
index 6ef5c52b0..495643d5f 100644
--- a/.github/actions/build-cse/action.yml
+++ b/.github/actions/build-cse/action.yml
@@ -16,6 +16,10 @@ runs:
     - name: Get branch name
       uses: tj-actions/branch-names@v6.4
       id: branch-name
+    - name: Install Linux Libraries
+      if: runner.os == 'Linux'
+      shell: bash
+      run: sudo apt-get update && sudo apt-get -y install xorg-dev libgl1-mesa-dev
     - name: Save branch name
       run: echo "CI_GIT_BRANCH=${{steps.branch-name.outputs.current_branch}}" >> $GITHUB_ENV
       shell: bash

From 87f702e9847c2c8d6e409ca8131ac6c1bbeeea7f Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Fri, 18 Aug 2023 17:03:16 -0600
Subject: [PATCH 04/20] Fix artifact upload/download.

---
 .github/actions/download-cse-artifact/action.yml | 4 ++--
 .github/workflows/build-and-test.yml             | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/actions/download-cse-artifact/action.yml b/.github/actions/download-cse-artifact/action.yml
index 3f1597502..ffbb5ec19 100644
--- a/.github/actions/download-cse-artifact/action.yml
+++ b/.github/actions/download-cse-artifact/action.yml
@@ -6,5 +6,5 @@ runs:
     - name: Download executable artifact
       uses: actions/download-artifact@v3
       with:
-        name: CSE.exe
-        path: msvc
+        name: CSE_windows-2022-32bit_Release
+        path: build
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index b326f2548..473c82ba0 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Upload executable artifact
         uses: actions/upload-artifact@v3
         with:
-          name: CSE
+          name: CSE_${{ matrix.os }}-${{ matrix.os_ver }}-${{ matrix.arch }}bit_${{ matrix.config }}
           path: build/CSE*
       - name: Build wcmp executable
         run: cmake -DBUILD_ARCHITECTURE=${{ matrix.arch }} -DCONFIGURATION=${{ matrix.config }} -DTARGET_NAME=wcmp -DBUILD_DIRECTORY=build -P cmake/build.cmake
@@ -57,8 +57,11 @@ jobs:
         run: ctest -C ${{ matrix.config }} -j 2 --output-on-failure -E shadetest  # CI can't do GPU calcs at this time (the steps above get us close, but throws an exception on destruction)
         working-directory: build
   build-doc:
+    strategy:
+      fail-fast: false
     name: Build CSE documentation
     needs: build-cse
+    if: ${{ always() }}
     runs-on: windows-2022
     steps:
       - name: Checkout

From d3995700878a53874d72c3687cb7118c1e6f1f5c Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Mon, 21 Aug 2023 11:30:43 -0600
Subject: [PATCH 05/20] Temporary fix for CSE path used in documentation build.

---
 .github/actions/build-docs/action.yml | 3 +++
 doc/lib/cse.rb                        | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/actions/build-docs/action.yml b/.github/actions/build-docs/action.yml
index 2a00b85ac..86fa9fcef 100644
--- a/.github/actions/build-docs/action.yml
+++ b/.github/actions/build-docs/action.yml
@@ -19,3 +19,6 @@ runs:
       run: rake
       shell: bash
       working-directory: doc
+      env:
+        CSE_EXE_PATH: build/CSE.exe
+
diff --git a/doc/lib/cse.rb b/doc/lib/cse.rb
index 5f3875721..fc271d97d 100644
--- a/doc/lib/cse.rb
+++ b/doc/lib/cse.rb
@@ -7,10 +7,12 @@ module CSE
   # Create an Alias
   C = Command
 
+  cse_path = if ENV.has_key?('CSE_EXE_PATH') ? ENV['CSE_EXE_PATH'] : '..\\builds\\cse'
+
   # (Or (Array String) String) ?String -> String
   # Given an array of strings of options to cse and an optional input to
   Run = lambda do |opts, input=nil|
-    C::Run['..\\msvc\\cse', opts, input]
+    C::Run[cse_path, opts, input]
   end
 
   CullList = lambda do

From 693e820aff84bca09f7736b1c68eb904bdf1d28b Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Mon, 21 Aug 2023 12:22:31 -0600
Subject: [PATCH 06/20] Fix ternary statement.

---
 doc/lib/cse.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/lib/cse.rb b/doc/lib/cse.rb
index fc271d97d..de7ecc2ac 100644
--- a/doc/lib/cse.rb
+++ b/doc/lib/cse.rb
@@ -7,7 +7,7 @@ module CSE
   # Create an Alias
   C = Command
 
-  cse_path = if ENV.has_key?('CSE_EXE_PATH') ? ENV['CSE_EXE_PATH'] : '..\\builds\\cse'
+  cse_path = ENV.has_key?('CSE_EXE_PATH') ? ENV['CSE_EXE_PATH'] : '..\\builds\\cse'
 
   # (Or (Array String) String) ?String -> String
   # Given an array of strings of options to cse and an optional input to

From 8a4ca1ca06a7514bdb06e997aefc786ebae68dfd Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Mon, 21 Aug 2023 12:37:14 -0600
Subject: [PATCH 07/20] Allow experimental builds to fail.

---
 .github/workflows/build-and-test.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 473c82ba0..eb1fa3b63 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -12,23 +12,28 @@ jobs:
             os_ver: "2022"
             config: Release
             arch: "32"
+            experimental: false
           - os: windows
             os_ver: "2022"
             config: Release
             arch: "64"
+            experimental: true
           - os: macos
             os_ver: "11"
             config: Release
             arch: "64"
+            experimental: true
           - os: ubuntu
             os_ver: "22.04"
             config: Release
             arch: "64"
+            experimental: true
     defaults:
       run:
         shell: bash
     name: ${{ matrix.os }}-${{ matrix.os_ver }}-${{ matrix.arch }}bit ${{ matrix.config }}
     runs-on: ${{ matrix.os }}-${{ matrix.os_ver }}
+    continue-on-error: ${{ matrix.experimental }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3.3.0

From 456c4e3b195e7e3ab7ac129d85ab62a303fc323a Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Mon, 21 Aug 2023 12:53:55 -0600
Subject: [PATCH 08/20] Use Windows path delimiter.

---
 .github/actions/build-docs/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/build-docs/action.yml b/.github/actions/build-docs/action.yml
index 86fa9fcef..35520553c 100644
--- a/.github/actions/build-docs/action.yml
+++ b/.github/actions/build-docs/action.yml
@@ -20,5 +20,5 @@ runs:
       shell: bash
       working-directory: doc
       env:
-        CSE_EXE_PATH: build/CSE.exe
+        CSE_EXE_PATH: build\\CSE.exe
 

From 849e6b2aca3de0269c0368f53f22fc6022bd38c7 Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Mon, 21 Aug 2023 13:11:23 -0600
Subject: [PATCH 09/20] Fix Windows relative path.

---
 .github/actions/build-docs/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/build-docs/action.yml b/.github/actions/build-docs/action.yml
index 35520553c..b975a6e30 100644
--- a/.github/actions/build-docs/action.yml
+++ b/.github/actions/build-docs/action.yml
@@ -20,5 +20,5 @@ runs:
       shell: bash
       working-directory: doc
       env:
-        CSE_EXE_PATH: build\\CSE.exe
+        CSE_EXE_PATH: ..\\build\\CSE.exe
 

From 8e022ff2eec377101f1123e6af1c82da5a653fbd Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Mon, 21 Aug 2023 13:31:37 -0600
Subject: [PATCH 10/20] Add CSE Path to coverage check step.

---
 .github/workflows/build-and-test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index eb1fa3b63..a930c8a1c 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -80,6 +80,8 @@ jobs:
       - name: Run coverage check
         run: rake coverage
         working-directory: doc
+        env:
+          CSE_EXE_PATH: ..\\build\\CSE.exe
       - name: Upload documentation
         uses: actions/upload-artifact@v3
         with:

From 702278a68c81bedae24124472198678b389994e2 Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Wed, 28 Feb 2024 10:31:53 -0700
Subject: [PATCH 11/20] Improve build/ref directory and exectuable names.

---
 .github/actions/build-cse/action.yml          |  7 +++-
 .github/workflows/build-and-test.yml          | 13 +++++-
 CMakeLists.txt                                | 16 +++++++-
 build.bat                                     |  6 ++-
 build.sh                                      |  2 +-
 cmake/build.cmake                             | 10 +----
 cmake/configure.cmake                         | 16 +++-----
 cmake/diff-failed.cmake                       |  2 +-
 cmake/update-failed.cmake                     |  2 +-
 cmake/utility.cmake                           | 41 +++++++++++--------
 src/CMakeLists.txt                            | 18 +++++---
 test/CMakeLists.txt                           |  8 +---
 test/diff.bat.in                              |  2 +-
 .../1ZATTIC.REP                               |  0
 .../1ZKIVA.REP                                |  0
 .../2ZATTIC.REP                               |  0
 .../2ZONE.REP                                 |  0
 .../2ZUN.REP                                  |  0
 .../3ZAIRNETAH.REP                            |  0
 .../600.REP                                   |  0
 .../930.REP                                   |  0
 .../960.REP                                   |  0
 .../ACTEST1BL.REP                             |  0
 .../ASHPPKGROOM.REP                           |  0
 .../ASHPTEST2.REP                             |  0
 .../ASHPVC2.REP                               |  0
 .../ASHP_DFNG.REP                             |  0
 .../AUTOSIZE.REP                              |  0
 .../BT_TEST.REP                               |  0
 .../CHDHW.REP                                 |  0
 .../CRTERMINALAH.REP                          |  0
 .../DHWDU.rep                                 |  0
 .../DHWLS.rep                                 |  0
 .../DHW_AQUATHERMAIRE.REP                     |  0
 .../DHW_BRWL.REP                              |  0
 .../DHW_C.REP                                 |  0
 .../DHW_DR.REP                                |  0
 .../DHW_INV.REP                               |  0
 .../DHW_MFSIZING.REP                          |  0
 .../DHW_SOLAR.rep                             |  0
 .../DHW_UEF.REP                               |  0
 .../DHW_ZONE.REP                              |  0
 .../DWHR.REP                                  |  0
 .../ExportFileOutput.rep                      |  0
 .../FANCOIL.REP                               |  0
 .../FRESNO.REP                                |  0
 .../HERV.rep                                  |  0
 .../IZFANTEST.REP                             |  0
 .../LOADANDAFMETERS.REP                       |  0
 .../MASSTEST1.REP                             |  0
 .../MF8X.REP                                  |  0
 .../MINIMUM_RUNNING_FILE.REP                  |  0
 .../MULTIFAMILY-DOAS.REP                      |  0
 .../PVTest.rep                                |  0
 .../PV_BT_TEST.REP                            |  0
 .../QW5DS.REP                                 |  0
 .../SHADETEST.rep                             |  0
 .../WSHP.REP                                  |  0
 .../Z2SG.REP                                  |  0
 .../ZONETEST4W.REP                            |  0
 .../ZT5D.REP                                  |  0
 .../ashwat1.rep                               |  0
 .../bgtest.rep                                |  0
 .../commands.rep                              |  0
 .../dhw02.rep                                 |  0
 .../dhwloop32U.rep                            |  0
 .../dhwx.rep                                  |  0
 .../expressions.rep                           |  0
 .../oavtest2.rep                              |  0
 .../submeter.rep                              |  0
 .../wthr01.rep                                |  0
 test/update.bat.in                            |  2 +-
 72 files changed, 88 insertions(+), 57 deletions(-)
 rename test/{ref => ref-windows-msvc-32-release}/1ZATTIC.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/1ZKIVA.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/2ZATTIC.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/2ZONE.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/2ZUN.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/3ZAIRNETAH.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/600.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/930.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/960.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/ACTEST1BL.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/ASHPPKGROOM.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/ASHPTEST2.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/ASHPVC2.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/ASHP_DFNG.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/AUTOSIZE.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/BT_TEST.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/CHDHW.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/CRTERMINALAH.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/DHWDU.rep (100%)
 rename test/{ref => ref-windows-msvc-32-release}/DHWLS.rep (100%)
 rename test/{ref => ref-windows-msvc-32-release}/DHW_AQUATHERMAIRE.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/DHW_BRWL.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/DHW_C.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/DHW_DR.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/DHW_INV.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/DHW_MFSIZING.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/DHW_SOLAR.rep (100%)
 rename test/{ref => ref-windows-msvc-32-release}/DHW_UEF.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/DHW_ZONE.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/DWHR.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/ExportFileOutput.rep (100%)
 rename test/{ref => ref-windows-msvc-32-release}/FANCOIL.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/FRESNO.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/HERV.rep (100%)
 rename test/{ref => ref-windows-msvc-32-release}/IZFANTEST.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/LOADANDAFMETERS.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/MASSTEST1.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/MF8X.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/MINIMUM_RUNNING_FILE.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/MULTIFAMILY-DOAS.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/PVTest.rep (100%)
 rename test/{ref => ref-windows-msvc-32-release}/PV_BT_TEST.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/QW5DS.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/SHADETEST.rep (100%)
 rename test/{ref => ref-windows-msvc-32-release}/WSHP.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/Z2SG.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/ZONETEST4W.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/ZT5D.REP (100%)
 rename test/{ref => ref-windows-msvc-32-release}/ashwat1.rep (100%)
 rename test/{ref => ref-windows-msvc-32-release}/bgtest.rep (100%)
 rename test/{ref => ref-windows-msvc-32-release}/commands.rep (100%)
 rename test/{ref => ref-windows-msvc-32-release}/dhw02.rep (100%)
 rename test/{ref => ref-windows-msvc-32-release}/dhwloop32U.rep (100%)
 rename test/{ref => ref-windows-msvc-32-release}/dhwx.rep (100%)
 rename test/{ref => ref-windows-msvc-32-release}/expressions.rep (100%)
 rename test/{ref => ref-windows-msvc-32-release}/oavtest2.rep (100%)
 rename test/{ref => ref-windows-msvc-32-release}/submeter.rep (100%)
 rename test/{ref => ref-windows-msvc-32-release}/wthr01.rep (100%)

diff --git a/.github/actions/build-cse/action.yml b/.github/actions/build-cse/action.yml
index 495643d5f..0b0365ce7 100644
--- a/.github/actions/build-cse/action.yml
+++ b/.github/actions/build-cse/action.yml
@@ -5,8 +5,11 @@ inputs:
     description: Target architecture ("32" or "64" bit)
     default: "32"
   config:
-    description: Configuration (Release or Debug bit)
+    description: Configuration (Release or Debug)
     default: Release
+  compiler:
+    description: Compiler used for windows builds (clang or msvc)
+    default: msvc
   build_dir:
     description: Relative path to the build directory
     default: build
@@ -25,4 +28,4 @@ runs:
       shell: bash
     - name: Build and Configure
       shell: bash
-      run: cmake -DBUILD_ARCHITECTURE=${{ inputs.arch }} -DCONFIGURATION=${{ inputs.config }} -DBUILD_DIRECTORY=${{ inputs.build_dir }} -P cmake/configure-and-build.cmake
+      run: cmake -DBUILD_ARCHITECTURE=${{ inputs.arch }} -DCOMPILER_ID=${{ inputs.compiler }} -DCONFIGURATION=${{ inputs.config }} -DTARGET_NAME=CSE -DBUILD_DIRECTORY=${{ inputs.build_dir }} -P cmake/configure-and-build.cmake
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index a930c8a1c..ccd1d52b7 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -12,26 +12,36 @@ jobs:
             os_ver: "2022"
             config: Release
             arch: "32"
+            compiler: msvc
             experimental: false
           - os: windows
             os_ver: "2022"
             config: Release
             arch: "64"
+            compiler: msvc
+            experimental: true
+          - os: windows
+            os_ver: "2022"
+            config: Release
+            arch: "64"
+            compiler: clang
             experimental: true
           - os: macos
             os_ver: "11"
             config: Release
             arch: "64"
+            compiler: clang
             experimental: true
           - os: ubuntu
             os_ver: "22.04"
             config: Release
             arch: "64"
+            compiler: gcc
             experimental: true
     defaults:
       run:
         shell: bash
-    name: ${{ matrix.os }}-${{ matrix.os_ver }}-${{ matrix.arch }}bit ${{ matrix.config }}
+    name: ${{ matrix.os }}-${{ matrix.os_ver }}-${{ matrix.compiler }}-${{ matrix.arch }}bit ${{ matrix.config }}
     runs-on: ${{ matrix.os }}-${{ matrix.os_ver }}
     continue-on-error: ${{ matrix.experimental }}
     steps:
@@ -45,6 +55,7 @@ jobs:
         with:
           arch: ${{ matrix.arch }}
           config: ${{ matrix.config }}
+          compiler: ${{ matrix.compiler }}
       - name: Build cse_tests.exe (unit tests)
         run: cmake -DBUILD_ARCHITECTURE=${{ matrix.arch }} -DCONFIGURATION=${{ matrix.config }} -DTARGET_NAME=cse_tests -DBUILD_DIRECTORY=build -P cmake/build.cmake
       - name: Upload executable artifact
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 899387610..c30ed72c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,21 @@ else()
   endif()
 endif()
 
-if(NOT CSE_EXECUTABLE_DIRECTORY)
+# Build OS
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+  set(CSE_OS_NAME "macos")
+else()
+  string(TOLOWER ${CMAKE_SYSTEM_NAME} CSE_OS_NAME)
+endif()
+
+# Build Compiler
+if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
+  set(CSE_COMPILER_NAME "gcc")
+else()
+  string(TOLOWER ${CMAKE_CXX_COMPILER_ID} CSE_COMPILER_NAME)
+endif()
+
+if(NOT DEFINED CSE_EXECUTABLE_DIRECTORY)
   set(CSE_EXECUTABLE_DIRECTORY ${CMAKE_BINARY_DIR})
 endif()
 
diff --git a/build.bat b/build.bat
index 672a97deb..ac04266ad 100644
--- a/build.bat
+++ b/build.bat
@@ -5,7 +5,11 @@ if "%console_mode%"=="" (set console_mode=1& for %%x in (%cmdcmdline%) do if /i
 set arch="32"
 if "%1"=="64" (set arch="%1")
 
-cmake -DBUILD_ARCHITECTURE=%arch% -DCONFIGURATION=Release -P cmake/configure-and-build.cmake
+set compiler="msvc"
+if "%2"=="clang" (set compiler="clang")
+
+
+cmake -DBUILD_ARCHITECTURE=%arch% -DCONFIGURATION=Release -DCOMPILER_ID=%compiler% -P cmake/configure-and-build.cmake
 if %errorlevel% neq 0 (
   if "%parent%"=="%~0" ( if "%console_mode%"=="0" pause )
   exit /B %errorlevel%
diff --git a/build.sh b/build.sh
index fa4589be2..38182a428 100755
--- a/build.sh
+++ b/build.sh
@@ -2,4 +2,4 @@
 
 set -e
 
-cmake -DBUILD_ARCHITECTURE=64 -DCONFIGURATION=Release -P cmake/configure-and-build.cmake
\ No newline at end of file
+cmake -DCONFIGURATION=Release -P cmake/configure-and-build.cmake
\ No newline at end of file
diff --git a/cmake/build.cmake b/cmake/build.cmake
index 11b38226d..c2f9f1a4b 100644
--- a/cmake/build.cmake
+++ b/cmake/build.cmake
@@ -1,14 +1,8 @@
 if (NOT DEFINED TARGET_NAME)
-  set(TARGET_NAME CSE)
+  set(TARGET_NAME "all")
 endif ()
 message("Building ${TARGET_NAME}...")
 
-if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
-  set(BUILD_ARGS -m)
-else()
-  set(BUILD_ARGS -j)
-endif ()
-
 include(cmake/utility.cmake)
 if (NOT DEFINED BUILD_DIRECTORY)
   set_build_directory()
@@ -18,7 +12,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
   --build .
   --config ${CONFIGURATION}
   --target ${TARGET_NAME}
-  -- ${BUILD_ARGS}
+  -j
   WORKING_DIRECTORY ${BUILD_DIRECTORY}
   RESULT_VARIABLE success
 )
diff --git a/cmake/configure.cmake b/cmake/configure.cmake
index b4ebaba14..aefd3c47c 100644
--- a/cmake/configure.cmake
+++ b/cmake/configure.cmake
@@ -1,19 +1,9 @@
-if ("${BUILD_ARCHITECTURE}" STREQUAL "64")
-    set(TARGET_VS_ARCHITECTURE x64)
-else()
-    set(TARGET_VS_ARCHITECTURE Win32)
-endif()
-
 include(cmake/utility.cmake)
 if (NOT DEFINED BUILD_DIRECTORY)
     set_build_directory()
     set(EXECUTABLE_DIRECTORY ${BUILDS_DIRECTORY})
 endif ()
 
-if (NOT DEFINED CONFIGURATION)
-    set(CONFIGURATION Release)
-endif ()
-
 file(MAKE_DIRECTORY ${BUILD_DIRECTORY})
 
 set(configure_command ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} -DCSE_BUILD_ARCHITECTURE=${BUILD_ARCHITECTURE})
@@ -23,7 +13,11 @@ if (DEFINED EXECUTABLE_DIRECTORY)
 endif ()
 
 if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
-    set(configure_command ${configure_command} -T v142,version=14.29.16.11 -A ${TARGET_VS_ARCHITECTURE}  -DCMAKE_SYSTEM_VERSION=10.0.20348.0)
+    if (${COMPILER_ID} STREQUAL "msvc")
+        set(configure_command ${configure_command} -T v142,version=14.29.16.11 -A ${TARGET_VS_ARCHITECTURE}  -DCMAKE_SYSTEM_VERSION=10.0.20348.0)
+    elseif(${COMPILER_ID} STREQUAL "clang")
+        set(configure_command ${configure_command} -T ClangCL -A ${TARGET_VS_ARCHITECTURE})
+    endif ()
 else()
     set(configure_command ${configure_command} -DCMAKE_BUILD_TYPE=${CONFIGURATION})
 endif()
diff --git a/cmake/diff-failed.cmake b/cmake/diff-failed.cmake
index 43bcf4d5d..9cdb39253 100644
--- a/cmake/diff-failed.cmake
+++ b/cmake/diff-failed.cmake
@@ -7,7 +7,7 @@ if(EXISTS ${testLog})
       string(REGEX REPLACE "[0-9]+:([^;].*).Regression" "\\1" test_name "${test}")
       string(TOUPPER ${test_name} test_name)
       message("Diffing: ${test_name}.REP")
-      execute_process(COMMAND bc4.bat "${test_name}.REP" "ref/${test_name}.REP"
+      execute_process(COMMAND bc4.bat "${test_name}.REP" "${ref_dir}/${test_name}.REP"
         WORKING_DIRECTORY ${test_dir}
         RESULT_VARIABLE success
       )
diff --git a/cmake/update-failed.cmake b/cmake/update-failed.cmake
index c43bf8740..f28a99483 100644
--- a/cmake/update-failed.cmake
+++ b/cmake/update-failed.cmake
@@ -7,7 +7,7 @@ if(EXISTS ${testLog})
       string(REGEX REPLACE "[0-9]+:([^;].*).Regression" "\\1" test_name "${test}")
       string(TOUPPER ${test_name} test_name)
       message("Updating: ${test_name}.REP")
-      execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${test_name}.REP" "ref/${test_name}.REP"
+      execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${test_name}.REP" "${ref_dir}/${test_name}.REP"
         WORKING_DIRECTORY ${test_dir}
         RESULT_VARIABLE success
       )
diff --git a/cmake/utility.cmake b/cmake/utility.cmake
index ab256b4f9..61e1e3472 100644
--- a/cmake/utility.cmake
+++ b/cmake/utility.cmake
@@ -1,24 +1,33 @@
 macro(set_build_directory)
     set(BUILDS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/builds)
     if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
+        set(OS_ID "windows")
+        if (NOT DEFINED COMPILER_ID)
+            set(COMPILER_ID "msvc")
+        endif ()
+        if (NOT DEFINED BUILD_ARCHITECTURE)
+            set(BUILD_ARCHITECTURE "32")
+        endif ()
         if ("${BUILD_ARCHITECTURE}" STREQUAL "64")
             set(TARGET_VS_ARCHITECTURE x64)
-            set(BUILD_DIRECTORY ${BUILDS_DIRECTORY}/msvc-64)
-        else()
+        else ()
             set(TARGET_VS_ARCHITECTURE Win32)
-            set(BUILD_DIRECTORY ${BUILDS_DIRECTORY}/msvc-32)
-        endif()
-    elseif ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin")
-        if ("${CONFIGURATION}" STREQUAL "Debug")
-            set(BUILD_DIRECTORY ${BUILDS_DIRECTORY}/clang-debug)
-        else()
-            set(BUILD_DIRECTORY ${BUILDS_DIRECTORY}/clang-release)
-        endif()
-    elseif ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
-        if ("${CONFIGURATION}" STREQUAL "Debug")
-            set(BUILD_DIRECTORY ${BUILDS_DIRECTORY}/gcc-debug)
-        else()
-            set(BUILD_DIRECTORY ${BUILDS_DIRECTORY}/gcc-release)
-        endif()
+        endif ()
+    else ()
+        if (NOT DEFINED CONFIGURATION)
+            set(CONFIGURATION Release)
+        endif ()
+        string(TOLOWER "-${CONFIGURATION}" CONFIGURATION_STRING)
+        if (NOT DEFINED BUILD_ARCHITECTURE)
+            set(BUILD_ARCHITECTURE "64")
+        endif ()
+        if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin")
+            set(OS_ID "macos")
+            set(COMPILER_ID "appleclang")
+        elseif ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
+            set(OS_ID "linux")
+            set(COMPILER_ID "gcc")
+        endif ()
     endif ()
+    set(BUILD_DIRECTORY "${BUILDS_DIRECTORY}/${OS_ID}-${COMPILER_ID}-${BUILD_ARCHITECTURE}${CONFIGURATION_STRING}")
 endmacro()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e1834b952..80dbaa242 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -269,14 +269,20 @@ target_link_libraries(CSE ${libs})
 
 add_dependencies(CSE version_header)
 
-if ("${CSE_BUILD_ARCHITECTURE}" STREQUAL "64")
-  set_target_properties(CSE PROPERTIES
-    OUTPUT_NAME "CSE64"
-  )
-endif()
+if (${CSE_COMPILER_NAME} STREQUAL "msvc" AND ${CSE_BUILD_ARCHITECTURE} STREQUAL "32")
+  set(executable_name "CSE")
+  set(debug_postfix "d")
+else()
+  set(executable_name "cse-${CSE_COMPILER_NAME}-${CSE_BUILD_ARCHITECTURE}")
+  set(debug_postfix "-debug")
+endif ()
+
+set_target_properties(CSE PROPERTIES
+  OUTPUT_NAME "${executable_name}"
+)
 
 set_target_properties(CSE PROPERTIES
-  DEBUG_POSTFIX "d"
+  DEBUG_POSTFIX "${debug_postfix}"
 )
 
 foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2d5e146cc..c31dcd0ff 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -5,11 +5,7 @@ add_subdirectory(wcmp)
 add_subdirectory(error_handling)
 
 
-if ("${CSE_BUILD_ARCHITECTURE}" STREQUAL "64")
-  set( refdir "ref64")
-else()
-  set( refdir "ref")
-endif()
+set( ref_dir "ref-${CSE_OS_NAME}-${CSE_COMPILER_NAME}-${CSE_BUILD_ARCHITECTURE}-release")
 
 macro(make_cse_test case)
   get_filename_component(test_name ${case} NAME_WE)
@@ -20,7 +16,7 @@ macro(make_cse_test case)
   )
 
   add_test(NAME ${test_name}.Regression
-    COMMAND $<TARGET_FILE:wcmp> "${CMAKE_CURRENT_SOURCE_DIR}/${test_name}.rep" "${CMAKE_CURRENT_SOURCE_DIR}/${refdir}/${test_name}.rep" "!"
+    COMMAND $<TARGET_FILE:wcmp> "${CMAKE_CURRENT_SOURCE_DIR}/${test_name}.rep" "${CMAKE_CURRENT_SOURCE_DIR}/${ref_dir}-release/${test_name}.rep" "!"
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
   )
   set_tests_properties(${test_name}.Regression PROPERTIES DEPENDS ${test_name}.Run)
diff --git a/test/diff.bat.in b/test/diff.bat.in
index 3b33d7856..4e9aa5d2b 100644
--- a/test/diff.bat.in
+++ b/test/diff.bat.in
@@ -1 +1 @@
-cmake -Dtest_dir="@CMAKE_SOURCE_DIR@/test"  -P "@CMAKE_SOURCE_DIR@/cmake/diff-failed.cmake"
+cmake -Dtest_dir="@CMAKE_SOURCE_DIR@/test" -Dref_dir="@ref_dir" -P "@CMAKE_SOURCE_DIR@/cmake/diff-failed.cmake"
diff --git a/test/ref/1ZATTIC.REP b/test/ref-windows-msvc-32-release/1ZATTIC.REP
similarity index 100%
rename from test/ref/1ZATTIC.REP
rename to test/ref-windows-msvc-32-release/1ZATTIC.REP
diff --git a/test/ref/1ZKIVA.REP b/test/ref-windows-msvc-32-release/1ZKIVA.REP
similarity index 100%
rename from test/ref/1ZKIVA.REP
rename to test/ref-windows-msvc-32-release/1ZKIVA.REP
diff --git a/test/ref/2ZATTIC.REP b/test/ref-windows-msvc-32-release/2ZATTIC.REP
similarity index 100%
rename from test/ref/2ZATTIC.REP
rename to test/ref-windows-msvc-32-release/2ZATTIC.REP
diff --git a/test/ref/2ZONE.REP b/test/ref-windows-msvc-32-release/2ZONE.REP
similarity index 100%
rename from test/ref/2ZONE.REP
rename to test/ref-windows-msvc-32-release/2ZONE.REP
diff --git a/test/ref/2ZUN.REP b/test/ref-windows-msvc-32-release/2ZUN.REP
similarity index 100%
rename from test/ref/2ZUN.REP
rename to test/ref-windows-msvc-32-release/2ZUN.REP
diff --git a/test/ref/3ZAIRNETAH.REP b/test/ref-windows-msvc-32-release/3ZAIRNETAH.REP
similarity index 100%
rename from test/ref/3ZAIRNETAH.REP
rename to test/ref-windows-msvc-32-release/3ZAIRNETAH.REP
diff --git a/test/ref/600.REP b/test/ref-windows-msvc-32-release/600.REP
similarity index 100%
rename from test/ref/600.REP
rename to test/ref-windows-msvc-32-release/600.REP
diff --git a/test/ref/930.REP b/test/ref-windows-msvc-32-release/930.REP
similarity index 100%
rename from test/ref/930.REP
rename to test/ref-windows-msvc-32-release/930.REP
diff --git a/test/ref/960.REP b/test/ref-windows-msvc-32-release/960.REP
similarity index 100%
rename from test/ref/960.REP
rename to test/ref-windows-msvc-32-release/960.REP
diff --git a/test/ref/ACTEST1BL.REP b/test/ref-windows-msvc-32-release/ACTEST1BL.REP
similarity index 100%
rename from test/ref/ACTEST1BL.REP
rename to test/ref-windows-msvc-32-release/ACTEST1BL.REP
diff --git a/test/ref/ASHPPKGROOM.REP b/test/ref-windows-msvc-32-release/ASHPPKGROOM.REP
similarity index 100%
rename from test/ref/ASHPPKGROOM.REP
rename to test/ref-windows-msvc-32-release/ASHPPKGROOM.REP
diff --git a/test/ref/ASHPTEST2.REP b/test/ref-windows-msvc-32-release/ASHPTEST2.REP
similarity index 100%
rename from test/ref/ASHPTEST2.REP
rename to test/ref-windows-msvc-32-release/ASHPTEST2.REP
diff --git a/test/ref/ASHPVC2.REP b/test/ref-windows-msvc-32-release/ASHPVC2.REP
similarity index 100%
rename from test/ref/ASHPVC2.REP
rename to test/ref-windows-msvc-32-release/ASHPVC2.REP
diff --git a/test/ref/ASHP_DFNG.REP b/test/ref-windows-msvc-32-release/ASHP_DFNG.REP
similarity index 100%
rename from test/ref/ASHP_DFNG.REP
rename to test/ref-windows-msvc-32-release/ASHP_DFNG.REP
diff --git a/test/ref/AUTOSIZE.REP b/test/ref-windows-msvc-32-release/AUTOSIZE.REP
similarity index 100%
rename from test/ref/AUTOSIZE.REP
rename to test/ref-windows-msvc-32-release/AUTOSIZE.REP
diff --git a/test/ref/BT_TEST.REP b/test/ref-windows-msvc-32-release/BT_TEST.REP
similarity index 100%
rename from test/ref/BT_TEST.REP
rename to test/ref-windows-msvc-32-release/BT_TEST.REP
diff --git a/test/ref/CHDHW.REP b/test/ref-windows-msvc-32-release/CHDHW.REP
similarity index 100%
rename from test/ref/CHDHW.REP
rename to test/ref-windows-msvc-32-release/CHDHW.REP
diff --git a/test/ref/CRTERMINALAH.REP b/test/ref-windows-msvc-32-release/CRTERMINALAH.REP
similarity index 100%
rename from test/ref/CRTERMINALAH.REP
rename to test/ref-windows-msvc-32-release/CRTERMINALAH.REP
diff --git a/test/ref/DHWDU.rep b/test/ref-windows-msvc-32-release/DHWDU.rep
similarity index 100%
rename from test/ref/DHWDU.rep
rename to test/ref-windows-msvc-32-release/DHWDU.rep
diff --git a/test/ref/DHWLS.rep b/test/ref-windows-msvc-32-release/DHWLS.rep
similarity index 100%
rename from test/ref/DHWLS.rep
rename to test/ref-windows-msvc-32-release/DHWLS.rep
diff --git a/test/ref/DHW_AQUATHERMAIRE.REP b/test/ref-windows-msvc-32-release/DHW_AQUATHERMAIRE.REP
similarity index 100%
rename from test/ref/DHW_AQUATHERMAIRE.REP
rename to test/ref-windows-msvc-32-release/DHW_AQUATHERMAIRE.REP
diff --git a/test/ref/DHW_BRWL.REP b/test/ref-windows-msvc-32-release/DHW_BRWL.REP
similarity index 100%
rename from test/ref/DHW_BRWL.REP
rename to test/ref-windows-msvc-32-release/DHW_BRWL.REP
diff --git a/test/ref/DHW_C.REP b/test/ref-windows-msvc-32-release/DHW_C.REP
similarity index 100%
rename from test/ref/DHW_C.REP
rename to test/ref-windows-msvc-32-release/DHW_C.REP
diff --git a/test/ref/DHW_DR.REP b/test/ref-windows-msvc-32-release/DHW_DR.REP
similarity index 100%
rename from test/ref/DHW_DR.REP
rename to test/ref-windows-msvc-32-release/DHW_DR.REP
diff --git a/test/ref/DHW_INV.REP b/test/ref-windows-msvc-32-release/DHW_INV.REP
similarity index 100%
rename from test/ref/DHW_INV.REP
rename to test/ref-windows-msvc-32-release/DHW_INV.REP
diff --git a/test/ref/DHW_MFSIZING.REP b/test/ref-windows-msvc-32-release/DHW_MFSIZING.REP
similarity index 100%
rename from test/ref/DHW_MFSIZING.REP
rename to test/ref-windows-msvc-32-release/DHW_MFSIZING.REP
diff --git a/test/ref/DHW_SOLAR.rep b/test/ref-windows-msvc-32-release/DHW_SOLAR.rep
similarity index 100%
rename from test/ref/DHW_SOLAR.rep
rename to test/ref-windows-msvc-32-release/DHW_SOLAR.rep
diff --git a/test/ref/DHW_UEF.REP b/test/ref-windows-msvc-32-release/DHW_UEF.REP
similarity index 100%
rename from test/ref/DHW_UEF.REP
rename to test/ref-windows-msvc-32-release/DHW_UEF.REP
diff --git a/test/ref/DHW_ZONE.REP b/test/ref-windows-msvc-32-release/DHW_ZONE.REP
similarity index 100%
rename from test/ref/DHW_ZONE.REP
rename to test/ref-windows-msvc-32-release/DHW_ZONE.REP
diff --git a/test/ref/DWHR.REP b/test/ref-windows-msvc-32-release/DWHR.REP
similarity index 100%
rename from test/ref/DWHR.REP
rename to test/ref-windows-msvc-32-release/DWHR.REP
diff --git a/test/ref/ExportFileOutput.rep b/test/ref-windows-msvc-32-release/ExportFileOutput.rep
similarity index 100%
rename from test/ref/ExportFileOutput.rep
rename to test/ref-windows-msvc-32-release/ExportFileOutput.rep
diff --git a/test/ref/FANCOIL.REP b/test/ref-windows-msvc-32-release/FANCOIL.REP
similarity index 100%
rename from test/ref/FANCOIL.REP
rename to test/ref-windows-msvc-32-release/FANCOIL.REP
diff --git a/test/ref/FRESNO.REP b/test/ref-windows-msvc-32-release/FRESNO.REP
similarity index 100%
rename from test/ref/FRESNO.REP
rename to test/ref-windows-msvc-32-release/FRESNO.REP
diff --git a/test/ref/HERV.rep b/test/ref-windows-msvc-32-release/HERV.rep
similarity index 100%
rename from test/ref/HERV.rep
rename to test/ref-windows-msvc-32-release/HERV.rep
diff --git a/test/ref/IZFANTEST.REP b/test/ref-windows-msvc-32-release/IZFANTEST.REP
similarity index 100%
rename from test/ref/IZFANTEST.REP
rename to test/ref-windows-msvc-32-release/IZFANTEST.REP
diff --git a/test/ref/LOADANDAFMETERS.REP b/test/ref-windows-msvc-32-release/LOADANDAFMETERS.REP
similarity index 100%
rename from test/ref/LOADANDAFMETERS.REP
rename to test/ref-windows-msvc-32-release/LOADANDAFMETERS.REP
diff --git a/test/ref/MASSTEST1.REP b/test/ref-windows-msvc-32-release/MASSTEST1.REP
similarity index 100%
rename from test/ref/MASSTEST1.REP
rename to test/ref-windows-msvc-32-release/MASSTEST1.REP
diff --git a/test/ref/MF8X.REP b/test/ref-windows-msvc-32-release/MF8X.REP
similarity index 100%
rename from test/ref/MF8X.REP
rename to test/ref-windows-msvc-32-release/MF8X.REP
diff --git a/test/ref/MINIMUM_RUNNING_FILE.REP b/test/ref-windows-msvc-32-release/MINIMUM_RUNNING_FILE.REP
similarity index 100%
rename from test/ref/MINIMUM_RUNNING_FILE.REP
rename to test/ref-windows-msvc-32-release/MINIMUM_RUNNING_FILE.REP
diff --git a/test/ref/MULTIFAMILY-DOAS.REP b/test/ref-windows-msvc-32-release/MULTIFAMILY-DOAS.REP
similarity index 100%
rename from test/ref/MULTIFAMILY-DOAS.REP
rename to test/ref-windows-msvc-32-release/MULTIFAMILY-DOAS.REP
diff --git a/test/ref/PVTest.rep b/test/ref-windows-msvc-32-release/PVTest.rep
similarity index 100%
rename from test/ref/PVTest.rep
rename to test/ref-windows-msvc-32-release/PVTest.rep
diff --git a/test/ref/PV_BT_TEST.REP b/test/ref-windows-msvc-32-release/PV_BT_TEST.REP
similarity index 100%
rename from test/ref/PV_BT_TEST.REP
rename to test/ref-windows-msvc-32-release/PV_BT_TEST.REP
diff --git a/test/ref/QW5DS.REP b/test/ref-windows-msvc-32-release/QW5DS.REP
similarity index 100%
rename from test/ref/QW5DS.REP
rename to test/ref-windows-msvc-32-release/QW5DS.REP
diff --git a/test/ref/SHADETEST.rep b/test/ref-windows-msvc-32-release/SHADETEST.rep
similarity index 100%
rename from test/ref/SHADETEST.rep
rename to test/ref-windows-msvc-32-release/SHADETEST.rep
diff --git a/test/ref/WSHP.REP b/test/ref-windows-msvc-32-release/WSHP.REP
similarity index 100%
rename from test/ref/WSHP.REP
rename to test/ref-windows-msvc-32-release/WSHP.REP
diff --git a/test/ref/Z2SG.REP b/test/ref-windows-msvc-32-release/Z2SG.REP
similarity index 100%
rename from test/ref/Z2SG.REP
rename to test/ref-windows-msvc-32-release/Z2SG.REP
diff --git a/test/ref/ZONETEST4W.REP b/test/ref-windows-msvc-32-release/ZONETEST4W.REP
similarity index 100%
rename from test/ref/ZONETEST4W.REP
rename to test/ref-windows-msvc-32-release/ZONETEST4W.REP
diff --git a/test/ref/ZT5D.REP b/test/ref-windows-msvc-32-release/ZT5D.REP
similarity index 100%
rename from test/ref/ZT5D.REP
rename to test/ref-windows-msvc-32-release/ZT5D.REP
diff --git a/test/ref/ashwat1.rep b/test/ref-windows-msvc-32-release/ashwat1.rep
similarity index 100%
rename from test/ref/ashwat1.rep
rename to test/ref-windows-msvc-32-release/ashwat1.rep
diff --git a/test/ref/bgtest.rep b/test/ref-windows-msvc-32-release/bgtest.rep
similarity index 100%
rename from test/ref/bgtest.rep
rename to test/ref-windows-msvc-32-release/bgtest.rep
diff --git a/test/ref/commands.rep b/test/ref-windows-msvc-32-release/commands.rep
similarity index 100%
rename from test/ref/commands.rep
rename to test/ref-windows-msvc-32-release/commands.rep
diff --git a/test/ref/dhw02.rep b/test/ref-windows-msvc-32-release/dhw02.rep
similarity index 100%
rename from test/ref/dhw02.rep
rename to test/ref-windows-msvc-32-release/dhw02.rep
diff --git a/test/ref/dhwloop32U.rep b/test/ref-windows-msvc-32-release/dhwloop32U.rep
similarity index 100%
rename from test/ref/dhwloop32U.rep
rename to test/ref-windows-msvc-32-release/dhwloop32U.rep
diff --git a/test/ref/dhwx.rep b/test/ref-windows-msvc-32-release/dhwx.rep
similarity index 100%
rename from test/ref/dhwx.rep
rename to test/ref-windows-msvc-32-release/dhwx.rep
diff --git a/test/ref/expressions.rep b/test/ref-windows-msvc-32-release/expressions.rep
similarity index 100%
rename from test/ref/expressions.rep
rename to test/ref-windows-msvc-32-release/expressions.rep
diff --git a/test/ref/oavtest2.rep b/test/ref-windows-msvc-32-release/oavtest2.rep
similarity index 100%
rename from test/ref/oavtest2.rep
rename to test/ref-windows-msvc-32-release/oavtest2.rep
diff --git a/test/ref/submeter.rep b/test/ref-windows-msvc-32-release/submeter.rep
similarity index 100%
rename from test/ref/submeter.rep
rename to test/ref-windows-msvc-32-release/submeter.rep
diff --git a/test/ref/wthr01.rep b/test/ref-windows-msvc-32-release/wthr01.rep
similarity index 100%
rename from test/ref/wthr01.rep
rename to test/ref-windows-msvc-32-release/wthr01.rep
diff --git a/test/update.bat.in b/test/update.bat.in
index dba2b647b..da03fc9eb 100644
--- a/test/update.bat.in
+++ b/test/update.bat.in
@@ -1 +1 @@
-cmake -Dtest_dir="@CMAKE_SOURCE_DIR@/test"  -P "@CMAKE_SOURCE_DIR@/cmake/update-failed.cmake"
+cmake -Dtest_dir="@CMAKE_SOURCE_DIR@/test" -Dref_dir="@ref_dir" -P "@CMAKE_SOURCE_DIR@/cmake/update-failed.cmake"

From 145465c50ce1ef79aaa8e001d13291dfa2029ed3 Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Wed, 28 Feb 2024 10:51:23 -0700
Subject: [PATCH 12/20] Fix build directory and ref directory.

---
 cmake/build.cmake     |  3 ++-
 cmake/configure.cmake |  5 +++--
 cmake/utility.cmake   |  9 ++++-----
 test/CMakeLists.txt   | 12 +++++++-----
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/cmake/build.cmake b/cmake/build.cmake
index c2f9f1a4b..71502f79d 100644
--- a/cmake/build.cmake
+++ b/cmake/build.cmake
@@ -4,8 +4,9 @@ endif ()
 message("Building ${TARGET_NAME}...")
 
 include(cmake/utility.cmake)
+set_build_directory()
 if (NOT DEFINED BUILD_DIRECTORY)
-  set_build_directory()
+  set(BUILD_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builds/${BUILD_CONFIGURATION}")
 endif ()
 
 execute_process(COMMAND ${CMAKE_COMMAND}
diff --git a/cmake/configure.cmake b/cmake/configure.cmake
index aefd3c47c..3737e475b 100644
--- a/cmake/configure.cmake
+++ b/cmake/configure.cmake
@@ -1,6 +1,7 @@
 include(cmake/utility.cmake)
+set_build_directory()
 if (NOT DEFINED BUILD_DIRECTORY)
-    set_build_directory()
+    set(BUILD_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builds/${BUILD_CONFIGURATION}")
     set(EXECUTABLE_DIRECTORY ${BUILDS_DIRECTORY})
 endif ()
 
@@ -14,7 +15,7 @@ endif ()
 
 if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
     if (${COMPILER_ID} STREQUAL "msvc")
-        set(configure_command ${configure_command} -T v142,version=14.29.16.11 -A ${TARGET_VS_ARCHITECTURE}  -DCMAKE_SYSTEM_VERSION=10.0.20348.0)
+        set(configure_command ${configure_command} -T v142,version=14.29.16.11 -A ${TARGET_VS_ARCHITECTURE} -DCMAKE_SYSTEM_VERSION=10.0.20348.0)
     elseif(${COMPILER_ID} STREQUAL "clang")
         set(configure_command ${configure_command} -T ClangCL -A ${TARGET_VS_ARCHITECTURE})
     endif ()
diff --git a/cmake/utility.cmake b/cmake/utility.cmake
index 61e1e3472..ac99ef3cb 100644
--- a/cmake/utility.cmake
+++ b/cmake/utility.cmake
@@ -1,5 +1,4 @@
-macro(set_build_directory)
-    set(BUILDS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/builds)
+macro(set_build_configuration)
     if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
         set(OS_ID "windows")
         if (NOT DEFINED COMPILER_ID)
@@ -9,9 +8,9 @@ macro(set_build_directory)
             set(BUILD_ARCHITECTURE "32")
         endif ()
         if ("${BUILD_ARCHITECTURE}" STREQUAL "64")
-            set(TARGET_VS_ARCHITECTURE x64)
+            set(TARGET_VS_ARCHITECTURE "x64")
         else ()
-            set(TARGET_VS_ARCHITECTURE Win32)
+            set(TARGET_VS_ARCHITECTURE "Win32")
         endif ()
     else ()
         if (NOT DEFINED CONFIGURATION)
@@ -29,5 +28,5 @@ macro(set_build_directory)
             set(COMPILER_ID "gcc")
         endif ()
     endif ()
-    set(BUILD_DIRECTORY "${BUILDS_DIRECTORY}/${OS_ID}-${COMPILER_ID}-${BUILD_ARCHITECTURE}${CONFIGURATION_STRING}")
+    set(BUILD_CONFIGURATION "${OS_ID}-${COMPILER_ID}-${BUILD_ARCHITECTURE}${CONFIGURATION_STRING}")
 endmacro()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c31dcd0ff..d57f06322 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -15,11 +15,13 @@ macro(make_cse_test case)
   WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
   )
 
-  add_test(NAME ${test_name}.Regression
-    COMMAND $<TARGET_FILE:wcmp> "${CMAKE_CURRENT_SOURCE_DIR}/${test_name}.rep" "${CMAKE_CURRENT_SOURCE_DIR}/${ref_dir}-release/${test_name}.rep" "!"
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-  )
-  set_tests_properties(${test_name}.Regression PROPERTIES DEPENDS ${test_name}.Run)
+  if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${ref_dir}")
+    add_test(NAME ${test_name}.Regression
+      COMMAND $<TARGET_FILE:wcmp> "${CMAKE_CURRENT_SOURCE_DIR}/${test_name}.rep" "${CMAKE_CURRENT_SOURCE_DIR}/${ref_dir}/${test_name}.rep" "!"
+      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+    )
+    set_tests_properties(${test_name}.Regression PROPERTIES DEPENDS ${test_name}.Run)
+  endif ()
 endmacro()
 
 make_cse_test(minimum_running_file.cse)

From ada595a476243e0e8bf7b685a4155405562b2c92 Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Wed, 28 Feb 2024 10:53:29 -0700
Subject: [PATCH 13/20] Fix macro name.

---
 cmake/build.cmake     | 2 +-
 cmake/configure.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/build.cmake b/cmake/build.cmake
index 71502f79d..7c58762b0 100644
--- a/cmake/build.cmake
+++ b/cmake/build.cmake
@@ -4,7 +4,7 @@ endif ()
 message("Building ${TARGET_NAME}...")
 
 include(cmake/utility.cmake)
-set_build_directory()
+set_build_configuration()
 if (NOT DEFINED BUILD_DIRECTORY)
   set(BUILD_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builds/${BUILD_CONFIGURATION}")
 endif ()
diff --git a/cmake/configure.cmake b/cmake/configure.cmake
index 3737e475b..7cb11b733 100644
--- a/cmake/configure.cmake
+++ b/cmake/configure.cmake
@@ -1,5 +1,5 @@
 include(cmake/utility.cmake)
-set_build_directory()
+set_build_configuration()
 if (NOT DEFINED BUILD_DIRECTORY)
     set(BUILD_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builds/${BUILD_CONFIGURATION}")
     set(EXECUTABLE_DIRECTORY ${BUILDS_DIRECTORY})

From 81f71181faccf7b843b40c0cdf8ef8f4308fc657 Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Wed, 28 Feb 2024 11:31:16 -0700
Subject: [PATCH 14/20] Fix dtypes.h dependency.

---
 src/CMakeLists.txt       | 3 +++
 test/unit/CMakeLists.txt | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index febe5de35..dcdfa4e86 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -54,6 +54,9 @@ add_custom_command(
   WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 )
 
+# Needed to establish dependency for other targets that depend on dtypes.h
+add_custom_target(generate_dtypes DEPENDS ${CSE_BINARY_DIR}/src/dtypes.h)
+
 # Set CSE Version
 add_custom_target(version_header
   DEPENDS "${PROJECT_SOURCE_DIR}/src/csevrsn.in.h"
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index d4e868afb..07cafab19 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -8,6 +8,7 @@ set(source
 
 list(APPEND source ${cse_common_source})
 add_executable(cse_tests ${source})
+add_dependencies(cse_tests generate_dtypes)
 target_compile_definitions(cse_tests PRIVATE SOURCE_DIR="${CMAKE_SOURCE_DIR}")
 
 target_include_directories(cse_tests PRIVATE

From 496ee32630684a63a14f94f96ece0f64e0eb48ac Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Wed, 28 Feb 2024 11:58:54 -0700
Subject: [PATCH 15/20] Fix executable directory.

---
 cmake/configure.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmake/configure.cmake b/cmake/configure.cmake
index 7cb11b733..708f5c323 100644
--- a/cmake/configure.cmake
+++ b/cmake/configure.cmake
@@ -1,7 +1,8 @@
 include(cmake/utility.cmake)
 set_build_configuration()
 if (NOT DEFINED BUILD_DIRECTORY)
-    set(BUILD_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builds/${BUILD_CONFIGURATION}")
+    set(BUILDS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builds")
+    set(BUILD_DIRECTORY "${BUILDS_DIRECTORY}/${BUILD_CONFIGURATION}")
     set(EXECUTABLE_DIRECTORY ${BUILDS_DIRECTORY})
 endif ()
 

From 57caf50815bcde28ba941e7f31e7b76d7df7dd5f Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Wed, 28 Feb 2024 12:40:33 -0700
Subject: [PATCH 16/20] Make shell utility scripts cross-platform.

---
 test/CMakeLists.txt | 12 ++++++++++--
 test/diff.bat.in    |  3 ++-
 test/update.bat.in  |  3 ++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d57f06322..e38e3cfc5 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -86,7 +86,15 @@ make_cse_test(CRTerminalAH)
 make_cse_test(MF8X)
 make_cse_test(ExportFileOutput -DEXPORT_FILE_ABSOLUTE_PATH="${CMAKE_SOURCE_DIR}/test/absolutePathEXPORTFILE.csv")
 
-configure_file("diff.bat.in" "${CMAKE_BINARY_DIR}/diff.bat")
-configure_file("update.bat.in" "${CMAKE_BINARY_DIR}/update.bat")
+if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
+  set(script_ext "bat")
+  set(shell_path "REM Batch script")
+else()
+  set(script_ext "sh")
+  set(shell_path "#!/bin/bash")
+endif()
+
+configure_file("diff.bat.in" "${CMAKE_BINARY_DIR}/diff.${script_ext}" FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ)
+configure_file("update.bat.in" "${CMAKE_BINARY_DIR}/update.${script_ext}" FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ)
 
 
diff --git a/test/diff.bat.in b/test/diff.bat.in
index 4e9aa5d2b..927d63015 100644
--- a/test/diff.bat.in
+++ b/test/diff.bat.in
@@ -1 +1,2 @@
-cmake -Dtest_dir="@CMAKE_SOURCE_DIR@/test" -Dref_dir="@ref_dir" -P "@CMAKE_SOURCE_DIR@/cmake/diff-failed.cmake"
+@shell_path@
+cmake -Dtest_dir="@CMAKE_SOURCE_DIR@/test" -Dref_dir="@ref_dir@" -P "@CMAKE_SOURCE_DIR@/cmake/diff-failed.cmake"
diff --git a/test/update.bat.in b/test/update.bat.in
index da03fc9eb..0a368866f 100644
--- a/test/update.bat.in
+++ b/test/update.bat.in
@@ -1 +1,2 @@
-cmake -Dtest_dir="@CMAKE_SOURCE_DIR@/test" -Dref_dir="@ref_dir" -P "@CMAKE_SOURCE_DIR@/cmake/update-failed.cmake"
+@shell_path@
+cmake -Dtest_dir="@CMAKE_SOURCE_DIR@/test" -Dref_dir="@ref_dir@" -P "@CMAKE_SOURCE_DIR@/cmake/update-failed.cmake"

From 0db6e2cf0259c797aad741a2a503951e0a115230 Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Fri, 22 Mar 2024 13:20:21 -0600
Subject: [PATCH 17/20] Fix default target name for MSVC.

---
 cmake/build.cmake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cmake/build.cmake b/cmake/build.cmake
index 7c58762b0..29d474653 100644
--- a/cmake/build.cmake
+++ b/cmake/build.cmake
@@ -1,5 +1,9 @@
 if (NOT DEFINED TARGET_NAME)
-  set(TARGET_NAME "all")
+  if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
+    set(TARGET_NAME "ALL_BUILD") # Needed for MSVC (not necessarily all Windows builds)
+  else ()
+    set(TARGET_NAME "all")
+  endif ()
 endif ()
 message("Building ${TARGET_NAME}...")
 

From 35d603982ec5a98a92b10f43c46a9b74fee37df7 Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Fri, 22 Mar 2024 16:24:30 -0600
Subject: [PATCH 18/20] Shorten folder names.

---
 CMakeLists.txt                                                | 3 +++
 cmake/utility.cmake                                           | 4 ++--
 test/CMakeLists.txt                                           | 2 +-
 .../1ZATTIC.REP                                               | 0
 .../1ZKIVA.REP                                                | 0
 .../2ZATTIC.REP                                               | 0
 .../2ZONE.REP                                                 | 0
 .../2ZUN.REP                                                  | 0
 .../3ZAIRNETAH.REP                                            | 0
 .../600.REP                                                   | 0
 .../930.REP                                                   | 0
 .../960.REP                                                   | 0
 .../ACTEST1BL.REP                                             | 0
 .../ASHPPKGROOM.REP                                           | 0
 .../ASHPTEST2.REP                                             | 0
 .../ASHPVC2.REP                                               | 0
 .../ASHP_DFNG.REP                                             | 0
 .../AUTOSIZE.REP                                              | 0
 .../BT_TEST.REP                                               | 0
 .../CHDHW.REP                                                 | 0
 .../CRTERMINALAH.REP                                          | 0
 .../DHWDU.rep                                                 | 0
 .../DHWLS.rep                                                 | 0
 .../DHW_AQUATHERMAIRE.REP                                     | 0
 .../DHW_BRWL.REP                                              | 0
 .../DHW_C.REP                                                 | 0
 .../DHW_DR.REP                                                | 0
 .../DHW_INV.REP                                               | 0
 .../DHW_MFSIZING.REP                                          | 0
 .../DHW_SOLAR.rep                                             | 0
 .../DHW_UEF.REP                                               | 0
 .../DHW_ZONE.REP                                              | 0
 .../DWHR.REP                                                  | 0
 .../ExportFileOutput.rep                                      | 0
 .../FANCOIL.REP                                               | 0
 .../FRESNO.REP                                                | 0
 .../HERV.rep                                                  | 0
 .../IZFANTEST.REP                                             | 0
 .../LOADANDAFMETERS.REP                                       | 0
 .../MASSTEST1.REP                                             | 0
 .../MF8X.REP                                                  | 0
 .../MINIMUM_RUNNING_FILE.REP                                  | 0
 .../MULTIFAMILY-DOAS.REP                                      | 0
 .../PVTest.rep                                                | 0
 .../PV_BT_TEST.REP                                            | 0
 .../QW5DS.REP                                                 | 0
 .../SHADETEST.rep                                             | 0
 .../WSHP.REP                                                  | 0
 .../Z2SG.REP                                                  | 0
 .../ZONETEST4W.REP                                            | 0
 .../ZT5D.REP                                                  | 0
 .../ashwat1.rep                                               | 0
 .../bgtest.rep                                                | 0
 .../commands.rep                                              | 0
 .../dhw02.rep                                                 | 0
 .../dhwloop32U.rep                                            | 0
 .../dhwx.rep                                                  | 0
 .../expressions.rep                                           | 0
 .../oavtest2.rep                                              | 0
 .../submeter.rep                                              | 0
 .../wthr01.rep                                                | 0
 61 files changed, 6 insertions(+), 3 deletions(-)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/1ZATTIC.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/1ZKIVA.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/2ZATTIC.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/2ZONE.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/2ZUN.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/3ZAIRNETAH.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/600.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/930.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/960.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/ACTEST1BL.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/ASHPPKGROOM.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/ASHPTEST2.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/ASHPVC2.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/ASHP_DFNG.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/AUTOSIZE.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/BT_TEST.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/CHDHW.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/CRTERMINALAH.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/DHWDU.rep (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/DHWLS.rep (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/DHW_AQUATHERMAIRE.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/DHW_BRWL.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/DHW_C.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/DHW_DR.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/DHW_INV.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/DHW_MFSIZING.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/DHW_SOLAR.rep (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/DHW_UEF.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/DHW_ZONE.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/DWHR.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/ExportFileOutput.rep (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/FANCOIL.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/FRESNO.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/HERV.rep (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/IZFANTEST.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/LOADANDAFMETERS.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/MASSTEST1.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/MF8X.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/MINIMUM_RUNNING_FILE.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/MULTIFAMILY-DOAS.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/PVTest.rep (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/PV_BT_TEST.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/QW5DS.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/SHADETEST.rep (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/WSHP.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/Z2SG.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/ZONETEST4W.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/ZT5D.REP (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/ashwat1.rep (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/bgtest.rep (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/commands.rep (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/dhw02.rep (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/dhwloop32U.rep (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/dhwx.rep (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/expressions.rep (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/oavtest2.rep (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/submeter.rep (100%)
 rename test/{ref-windows-msvc-32-release => ref-win32-msvc-release}/wthr01.rep (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c30ed72c3..42141aec4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,9 @@ endif()
 # Build OS
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
   set(CSE_OS_NAME "macos")
+elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+  set(CSE_OS_NAME "win")
+else()
 else()
   string(TOLOWER ${CMAKE_SYSTEM_NAME} CSE_OS_NAME)
 endif()
diff --git a/cmake/utility.cmake b/cmake/utility.cmake
index ac99ef3cb..7448044cf 100644
--- a/cmake/utility.cmake
+++ b/cmake/utility.cmake
@@ -1,6 +1,6 @@
 macro(set_build_configuration)
     if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
-        set(OS_ID "windows")
+        set(OS_ID "win")
         if (NOT DEFINED COMPILER_ID)
             set(COMPILER_ID "msvc")
         endif ()
@@ -28,5 +28,5 @@ macro(set_build_configuration)
             set(COMPILER_ID "gcc")
         endif ()
     endif ()
-    set(BUILD_CONFIGURATION "${OS_ID}-${COMPILER_ID}-${BUILD_ARCHITECTURE}${CONFIGURATION_STRING}")
+    set(BUILD_CONFIGURATION "${OS_ID}${BUILD_ARCHITECTURE}-${COMPILER_ID}${CONFIGURATION_STRING}")
 endmacro()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e38e3cfc5..48782b3b5 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -5,7 +5,7 @@ add_subdirectory(wcmp)
 add_subdirectory(error_handling)
 
 
-set( ref_dir "ref-${CSE_OS_NAME}-${CSE_COMPILER_NAME}-${CSE_BUILD_ARCHITECTURE}-release")
+set( ref_dir "ref-${CSE_OS_NAME}${CSE_BUILD_ARCHITECTURE}-${CSE_COMPILER_NAME}-release")
 
 macro(make_cse_test case)
   get_filename_component(test_name ${case} NAME_WE)
diff --git a/test/ref-windows-msvc-32-release/1ZATTIC.REP b/test/ref-win32-msvc-release/1ZATTIC.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/1ZATTIC.REP
rename to test/ref-win32-msvc-release/1ZATTIC.REP
diff --git a/test/ref-windows-msvc-32-release/1ZKIVA.REP b/test/ref-win32-msvc-release/1ZKIVA.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/1ZKIVA.REP
rename to test/ref-win32-msvc-release/1ZKIVA.REP
diff --git a/test/ref-windows-msvc-32-release/2ZATTIC.REP b/test/ref-win32-msvc-release/2ZATTIC.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/2ZATTIC.REP
rename to test/ref-win32-msvc-release/2ZATTIC.REP
diff --git a/test/ref-windows-msvc-32-release/2ZONE.REP b/test/ref-win32-msvc-release/2ZONE.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/2ZONE.REP
rename to test/ref-win32-msvc-release/2ZONE.REP
diff --git a/test/ref-windows-msvc-32-release/2ZUN.REP b/test/ref-win32-msvc-release/2ZUN.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/2ZUN.REP
rename to test/ref-win32-msvc-release/2ZUN.REP
diff --git a/test/ref-windows-msvc-32-release/3ZAIRNETAH.REP b/test/ref-win32-msvc-release/3ZAIRNETAH.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/3ZAIRNETAH.REP
rename to test/ref-win32-msvc-release/3ZAIRNETAH.REP
diff --git a/test/ref-windows-msvc-32-release/600.REP b/test/ref-win32-msvc-release/600.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/600.REP
rename to test/ref-win32-msvc-release/600.REP
diff --git a/test/ref-windows-msvc-32-release/930.REP b/test/ref-win32-msvc-release/930.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/930.REP
rename to test/ref-win32-msvc-release/930.REP
diff --git a/test/ref-windows-msvc-32-release/960.REP b/test/ref-win32-msvc-release/960.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/960.REP
rename to test/ref-win32-msvc-release/960.REP
diff --git a/test/ref-windows-msvc-32-release/ACTEST1BL.REP b/test/ref-win32-msvc-release/ACTEST1BL.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/ACTEST1BL.REP
rename to test/ref-win32-msvc-release/ACTEST1BL.REP
diff --git a/test/ref-windows-msvc-32-release/ASHPPKGROOM.REP b/test/ref-win32-msvc-release/ASHPPKGROOM.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/ASHPPKGROOM.REP
rename to test/ref-win32-msvc-release/ASHPPKGROOM.REP
diff --git a/test/ref-windows-msvc-32-release/ASHPTEST2.REP b/test/ref-win32-msvc-release/ASHPTEST2.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/ASHPTEST2.REP
rename to test/ref-win32-msvc-release/ASHPTEST2.REP
diff --git a/test/ref-windows-msvc-32-release/ASHPVC2.REP b/test/ref-win32-msvc-release/ASHPVC2.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/ASHPVC2.REP
rename to test/ref-win32-msvc-release/ASHPVC2.REP
diff --git a/test/ref-windows-msvc-32-release/ASHP_DFNG.REP b/test/ref-win32-msvc-release/ASHP_DFNG.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/ASHP_DFNG.REP
rename to test/ref-win32-msvc-release/ASHP_DFNG.REP
diff --git a/test/ref-windows-msvc-32-release/AUTOSIZE.REP b/test/ref-win32-msvc-release/AUTOSIZE.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/AUTOSIZE.REP
rename to test/ref-win32-msvc-release/AUTOSIZE.REP
diff --git a/test/ref-windows-msvc-32-release/BT_TEST.REP b/test/ref-win32-msvc-release/BT_TEST.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/BT_TEST.REP
rename to test/ref-win32-msvc-release/BT_TEST.REP
diff --git a/test/ref-windows-msvc-32-release/CHDHW.REP b/test/ref-win32-msvc-release/CHDHW.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/CHDHW.REP
rename to test/ref-win32-msvc-release/CHDHW.REP
diff --git a/test/ref-windows-msvc-32-release/CRTERMINALAH.REP b/test/ref-win32-msvc-release/CRTERMINALAH.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/CRTERMINALAH.REP
rename to test/ref-win32-msvc-release/CRTERMINALAH.REP
diff --git a/test/ref-windows-msvc-32-release/DHWDU.rep b/test/ref-win32-msvc-release/DHWDU.rep
similarity index 100%
rename from test/ref-windows-msvc-32-release/DHWDU.rep
rename to test/ref-win32-msvc-release/DHWDU.rep
diff --git a/test/ref-windows-msvc-32-release/DHWLS.rep b/test/ref-win32-msvc-release/DHWLS.rep
similarity index 100%
rename from test/ref-windows-msvc-32-release/DHWLS.rep
rename to test/ref-win32-msvc-release/DHWLS.rep
diff --git a/test/ref-windows-msvc-32-release/DHW_AQUATHERMAIRE.REP b/test/ref-win32-msvc-release/DHW_AQUATHERMAIRE.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/DHW_AQUATHERMAIRE.REP
rename to test/ref-win32-msvc-release/DHW_AQUATHERMAIRE.REP
diff --git a/test/ref-windows-msvc-32-release/DHW_BRWL.REP b/test/ref-win32-msvc-release/DHW_BRWL.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/DHW_BRWL.REP
rename to test/ref-win32-msvc-release/DHW_BRWL.REP
diff --git a/test/ref-windows-msvc-32-release/DHW_C.REP b/test/ref-win32-msvc-release/DHW_C.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/DHW_C.REP
rename to test/ref-win32-msvc-release/DHW_C.REP
diff --git a/test/ref-windows-msvc-32-release/DHW_DR.REP b/test/ref-win32-msvc-release/DHW_DR.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/DHW_DR.REP
rename to test/ref-win32-msvc-release/DHW_DR.REP
diff --git a/test/ref-windows-msvc-32-release/DHW_INV.REP b/test/ref-win32-msvc-release/DHW_INV.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/DHW_INV.REP
rename to test/ref-win32-msvc-release/DHW_INV.REP
diff --git a/test/ref-windows-msvc-32-release/DHW_MFSIZING.REP b/test/ref-win32-msvc-release/DHW_MFSIZING.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/DHW_MFSIZING.REP
rename to test/ref-win32-msvc-release/DHW_MFSIZING.REP
diff --git a/test/ref-windows-msvc-32-release/DHW_SOLAR.rep b/test/ref-win32-msvc-release/DHW_SOLAR.rep
similarity index 100%
rename from test/ref-windows-msvc-32-release/DHW_SOLAR.rep
rename to test/ref-win32-msvc-release/DHW_SOLAR.rep
diff --git a/test/ref-windows-msvc-32-release/DHW_UEF.REP b/test/ref-win32-msvc-release/DHW_UEF.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/DHW_UEF.REP
rename to test/ref-win32-msvc-release/DHW_UEF.REP
diff --git a/test/ref-windows-msvc-32-release/DHW_ZONE.REP b/test/ref-win32-msvc-release/DHW_ZONE.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/DHW_ZONE.REP
rename to test/ref-win32-msvc-release/DHW_ZONE.REP
diff --git a/test/ref-windows-msvc-32-release/DWHR.REP b/test/ref-win32-msvc-release/DWHR.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/DWHR.REP
rename to test/ref-win32-msvc-release/DWHR.REP
diff --git a/test/ref-windows-msvc-32-release/ExportFileOutput.rep b/test/ref-win32-msvc-release/ExportFileOutput.rep
similarity index 100%
rename from test/ref-windows-msvc-32-release/ExportFileOutput.rep
rename to test/ref-win32-msvc-release/ExportFileOutput.rep
diff --git a/test/ref-windows-msvc-32-release/FANCOIL.REP b/test/ref-win32-msvc-release/FANCOIL.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/FANCOIL.REP
rename to test/ref-win32-msvc-release/FANCOIL.REP
diff --git a/test/ref-windows-msvc-32-release/FRESNO.REP b/test/ref-win32-msvc-release/FRESNO.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/FRESNO.REP
rename to test/ref-win32-msvc-release/FRESNO.REP
diff --git a/test/ref-windows-msvc-32-release/HERV.rep b/test/ref-win32-msvc-release/HERV.rep
similarity index 100%
rename from test/ref-windows-msvc-32-release/HERV.rep
rename to test/ref-win32-msvc-release/HERV.rep
diff --git a/test/ref-windows-msvc-32-release/IZFANTEST.REP b/test/ref-win32-msvc-release/IZFANTEST.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/IZFANTEST.REP
rename to test/ref-win32-msvc-release/IZFANTEST.REP
diff --git a/test/ref-windows-msvc-32-release/LOADANDAFMETERS.REP b/test/ref-win32-msvc-release/LOADANDAFMETERS.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/LOADANDAFMETERS.REP
rename to test/ref-win32-msvc-release/LOADANDAFMETERS.REP
diff --git a/test/ref-windows-msvc-32-release/MASSTEST1.REP b/test/ref-win32-msvc-release/MASSTEST1.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/MASSTEST1.REP
rename to test/ref-win32-msvc-release/MASSTEST1.REP
diff --git a/test/ref-windows-msvc-32-release/MF8X.REP b/test/ref-win32-msvc-release/MF8X.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/MF8X.REP
rename to test/ref-win32-msvc-release/MF8X.REP
diff --git a/test/ref-windows-msvc-32-release/MINIMUM_RUNNING_FILE.REP b/test/ref-win32-msvc-release/MINIMUM_RUNNING_FILE.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/MINIMUM_RUNNING_FILE.REP
rename to test/ref-win32-msvc-release/MINIMUM_RUNNING_FILE.REP
diff --git a/test/ref-windows-msvc-32-release/MULTIFAMILY-DOAS.REP b/test/ref-win32-msvc-release/MULTIFAMILY-DOAS.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/MULTIFAMILY-DOAS.REP
rename to test/ref-win32-msvc-release/MULTIFAMILY-DOAS.REP
diff --git a/test/ref-windows-msvc-32-release/PVTest.rep b/test/ref-win32-msvc-release/PVTest.rep
similarity index 100%
rename from test/ref-windows-msvc-32-release/PVTest.rep
rename to test/ref-win32-msvc-release/PVTest.rep
diff --git a/test/ref-windows-msvc-32-release/PV_BT_TEST.REP b/test/ref-win32-msvc-release/PV_BT_TEST.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/PV_BT_TEST.REP
rename to test/ref-win32-msvc-release/PV_BT_TEST.REP
diff --git a/test/ref-windows-msvc-32-release/QW5DS.REP b/test/ref-win32-msvc-release/QW5DS.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/QW5DS.REP
rename to test/ref-win32-msvc-release/QW5DS.REP
diff --git a/test/ref-windows-msvc-32-release/SHADETEST.rep b/test/ref-win32-msvc-release/SHADETEST.rep
similarity index 100%
rename from test/ref-windows-msvc-32-release/SHADETEST.rep
rename to test/ref-win32-msvc-release/SHADETEST.rep
diff --git a/test/ref-windows-msvc-32-release/WSHP.REP b/test/ref-win32-msvc-release/WSHP.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/WSHP.REP
rename to test/ref-win32-msvc-release/WSHP.REP
diff --git a/test/ref-windows-msvc-32-release/Z2SG.REP b/test/ref-win32-msvc-release/Z2SG.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/Z2SG.REP
rename to test/ref-win32-msvc-release/Z2SG.REP
diff --git a/test/ref-windows-msvc-32-release/ZONETEST4W.REP b/test/ref-win32-msvc-release/ZONETEST4W.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/ZONETEST4W.REP
rename to test/ref-win32-msvc-release/ZONETEST4W.REP
diff --git a/test/ref-windows-msvc-32-release/ZT5D.REP b/test/ref-win32-msvc-release/ZT5D.REP
similarity index 100%
rename from test/ref-windows-msvc-32-release/ZT5D.REP
rename to test/ref-win32-msvc-release/ZT5D.REP
diff --git a/test/ref-windows-msvc-32-release/ashwat1.rep b/test/ref-win32-msvc-release/ashwat1.rep
similarity index 100%
rename from test/ref-windows-msvc-32-release/ashwat1.rep
rename to test/ref-win32-msvc-release/ashwat1.rep
diff --git a/test/ref-windows-msvc-32-release/bgtest.rep b/test/ref-win32-msvc-release/bgtest.rep
similarity index 100%
rename from test/ref-windows-msvc-32-release/bgtest.rep
rename to test/ref-win32-msvc-release/bgtest.rep
diff --git a/test/ref-windows-msvc-32-release/commands.rep b/test/ref-win32-msvc-release/commands.rep
similarity index 100%
rename from test/ref-windows-msvc-32-release/commands.rep
rename to test/ref-win32-msvc-release/commands.rep
diff --git a/test/ref-windows-msvc-32-release/dhw02.rep b/test/ref-win32-msvc-release/dhw02.rep
similarity index 100%
rename from test/ref-windows-msvc-32-release/dhw02.rep
rename to test/ref-win32-msvc-release/dhw02.rep
diff --git a/test/ref-windows-msvc-32-release/dhwloop32U.rep b/test/ref-win32-msvc-release/dhwloop32U.rep
similarity index 100%
rename from test/ref-windows-msvc-32-release/dhwloop32U.rep
rename to test/ref-win32-msvc-release/dhwloop32U.rep
diff --git a/test/ref-windows-msvc-32-release/dhwx.rep b/test/ref-win32-msvc-release/dhwx.rep
similarity index 100%
rename from test/ref-windows-msvc-32-release/dhwx.rep
rename to test/ref-win32-msvc-release/dhwx.rep
diff --git a/test/ref-windows-msvc-32-release/expressions.rep b/test/ref-win32-msvc-release/expressions.rep
similarity index 100%
rename from test/ref-windows-msvc-32-release/expressions.rep
rename to test/ref-win32-msvc-release/expressions.rep
diff --git a/test/ref-windows-msvc-32-release/oavtest2.rep b/test/ref-win32-msvc-release/oavtest2.rep
similarity index 100%
rename from test/ref-windows-msvc-32-release/oavtest2.rep
rename to test/ref-win32-msvc-release/oavtest2.rep
diff --git a/test/ref-windows-msvc-32-release/submeter.rep b/test/ref-win32-msvc-release/submeter.rep
similarity index 100%
rename from test/ref-windows-msvc-32-release/submeter.rep
rename to test/ref-win32-msvc-release/submeter.rep
diff --git a/test/ref-windows-msvc-32-release/wthr01.rep b/test/ref-win32-msvc-release/wthr01.rep
similarity index 100%
rename from test/ref-windows-msvc-32-release/wthr01.rep
rename to test/ref-win32-msvc-release/wthr01.rep

From 33e09e36e4c1e90ce91dd3a0a515e1bf66447ab6 Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Fri, 22 Mar 2024 16:28:11 -0600
Subject: [PATCH 19/20] Remove extra flow control statement.

---
 CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42141aec4..1603b7947 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
   set(CSE_OS_NAME "macos")
 elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
   set(CSE_OS_NAME "win")
-else()
 else()
   string(TOLOWER ${CMAKE_SYSTEM_NAME} CSE_OS_NAME)
 endif()

From dbe3cb006071b9fddda67f6ed2a3d5e866ad024c Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Mon, 25 Mar 2024 09:16:32 -0600
Subject: [PATCH 20/20] Remove 'release' from ref directory name.

---
 test/CMakeLists.txt                                             | 2 +-
 test/{ref-win32-msvc-release => ref-win32-msvc}/1ZATTIC.REP     | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/1ZKIVA.REP      | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/2ZATTIC.REP     | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/2ZONE.REP       | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/2ZUN.REP        | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/3ZAIRNETAH.REP  | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/600.REP         | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/930.REP         | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/960.REP         | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/ACTEST1BL.REP   | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/ASHPPKGROOM.REP | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/ASHPTEST2.REP   | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/ASHPVC2.REP     | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/ASHP_DFNG.REP   | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/AUTOSIZE.REP    | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/BT_TEST.REP     | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/CHDHW.REP       | 0
 .../{ref-win32-msvc-release => ref-win32-msvc}/CRTERMINALAH.REP | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/DHWDU.rep       | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/DHWLS.rep       | 0
 .../DHW_AQUATHERMAIRE.REP                                       | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/DHW_BRWL.REP    | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/DHW_C.REP       | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/DHW_DR.REP      | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/DHW_INV.REP     | 0
 .../{ref-win32-msvc-release => ref-win32-msvc}/DHW_MFSIZING.REP | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/DHW_SOLAR.rep   | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/DHW_UEF.REP     | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/DHW_ZONE.REP    | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/DWHR.REP        | 0
 .../ExportFileOutput.rep                                        | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/FANCOIL.REP     | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/FRESNO.REP      | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/HERV.rep        | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/IZFANTEST.REP   | 0
 .../LOADANDAFMETERS.REP                                         | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/MASSTEST1.REP   | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/MF8X.REP        | 0
 .../MINIMUM_RUNNING_FILE.REP                                    | 0
 .../MULTIFAMILY-DOAS.REP                                        | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/PVTest.rep      | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/PV_BT_TEST.REP  | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/QW5DS.REP       | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/SHADETEST.rep   | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/WSHP.REP        | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/Z2SG.REP        | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/ZONETEST4W.REP  | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/ZT5D.REP        | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/ashwat1.rep     | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/bgtest.rep      | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/commands.rep    | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/dhw02.rep       | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/dhwloop32U.rep  | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/dhwx.rep        | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/expressions.rep | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/oavtest2.rep    | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/submeter.rep    | 0
 test/{ref-win32-msvc-release => ref-win32-msvc}/wthr01.rep      | 0
 59 files changed, 1 insertion(+), 1 deletion(-)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/1ZATTIC.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/1ZKIVA.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/2ZATTIC.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/2ZONE.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/2ZUN.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/3ZAIRNETAH.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/600.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/930.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/960.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/ACTEST1BL.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/ASHPPKGROOM.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/ASHPTEST2.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/ASHPVC2.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/ASHP_DFNG.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/AUTOSIZE.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/BT_TEST.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/CHDHW.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/CRTERMINALAH.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/DHWDU.rep (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/DHWLS.rep (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/DHW_AQUATHERMAIRE.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/DHW_BRWL.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/DHW_C.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/DHW_DR.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/DHW_INV.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/DHW_MFSIZING.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/DHW_SOLAR.rep (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/DHW_UEF.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/DHW_ZONE.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/DWHR.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/ExportFileOutput.rep (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/FANCOIL.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/FRESNO.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/HERV.rep (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/IZFANTEST.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/LOADANDAFMETERS.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/MASSTEST1.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/MF8X.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/MINIMUM_RUNNING_FILE.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/MULTIFAMILY-DOAS.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/PVTest.rep (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/PV_BT_TEST.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/QW5DS.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/SHADETEST.rep (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/WSHP.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/Z2SG.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/ZONETEST4W.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/ZT5D.REP (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/ashwat1.rep (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/bgtest.rep (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/commands.rep (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/dhw02.rep (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/dhwloop32U.rep (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/dhwx.rep (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/expressions.rep (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/oavtest2.rep (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/submeter.rep (100%)
 rename test/{ref-win32-msvc-release => ref-win32-msvc}/wthr01.rep (100%)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 48782b3b5..aad320e94 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -5,7 +5,7 @@ add_subdirectory(wcmp)
 add_subdirectory(error_handling)
 
 
-set( ref_dir "ref-${CSE_OS_NAME}${CSE_BUILD_ARCHITECTURE}-${CSE_COMPILER_NAME}-release")
+set( ref_dir "ref-${CSE_OS_NAME}${CSE_BUILD_ARCHITECTURE}-${CSE_COMPILER_NAME}")
 
 macro(make_cse_test case)
   get_filename_component(test_name ${case} NAME_WE)
diff --git a/test/ref-win32-msvc-release/1ZATTIC.REP b/test/ref-win32-msvc/1ZATTIC.REP
similarity index 100%
rename from test/ref-win32-msvc-release/1ZATTIC.REP
rename to test/ref-win32-msvc/1ZATTIC.REP
diff --git a/test/ref-win32-msvc-release/1ZKIVA.REP b/test/ref-win32-msvc/1ZKIVA.REP
similarity index 100%
rename from test/ref-win32-msvc-release/1ZKIVA.REP
rename to test/ref-win32-msvc/1ZKIVA.REP
diff --git a/test/ref-win32-msvc-release/2ZATTIC.REP b/test/ref-win32-msvc/2ZATTIC.REP
similarity index 100%
rename from test/ref-win32-msvc-release/2ZATTIC.REP
rename to test/ref-win32-msvc/2ZATTIC.REP
diff --git a/test/ref-win32-msvc-release/2ZONE.REP b/test/ref-win32-msvc/2ZONE.REP
similarity index 100%
rename from test/ref-win32-msvc-release/2ZONE.REP
rename to test/ref-win32-msvc/2ZONE.REP
diff --git a/test/ref-win32-msvc-release/2ZUN.REP b/test/ref-win32-msvc/2ZUN.REP
similarity index 100%
rename from test/ref-win32-msvc-release/2ZUN.REP
rename to test/ref-win32-msvc/2ZUN.REP
diff --git a/test/ref-win32-msvc-release/3ZAIRNETAH.REP b/test/ref-win32-msvc/3ZAIRNETAH.REP
similarity index 100%
rename from test/ref-win32-msvc-release/3ZAIRNETAH.REP
rename to test/ref-win32-msvc/3ZAIRNETAH.REP
diff --git a/test/ref-win32-msvc-release/600.REP b/test/ref-win32-msvc/600.REP
similarity index 100%
rename from test/ref-win32-msvc-release/600.REP
rename to test/ref-win32-msvc/600.REP
diff --git a/test/ref-win32-msvc-release/930.REP b/test/ref-win32-msvc/930.REP
similarity index 100%
rename from test/ref-win32-msvc-release/930.REP
rename to test/ref-win32-msvc/930.REP
diff --git a/test/ref-win32-msvc-release/960.REP b/test/ref-win32-msvc/960.REP
similarity index 100%
rename from test/ref-win32-msvc-release/960.REP
rename to test/ref-win32-msvc/960.REP
diff --git a/test/ref-win32-msvc-release/ACTEST1BL.REP b/test/ref-win32-msvc/ACTEST1BL.REP
similarity index 100%
rename from test/ref-win32-msvc-release/ACTEST1BL.REP
rename to test/ref-win32-msvc/ACTEST1BL.REP
diff --git a/test/ref-win32-msvc-release/ASHPPKGROOM.REP b/test/ref-win32-msvc/ASHPPKGROOM.REP
similarity index 100%
rename from test/ref-win32-msvc-release/ASHPPKGROOM.REP
rename to test/ref-win32-msvc/ASHPPKGROOM.REP
diff --git a/test/ref-win32-msvc-release/ASHPTEST2.REP b/test/ref-win32-msvc/ASHPTEST2.REP
similarity index 100%
rename from test/ref-win32-msvc-release/ASHPTEST2.REP
rename to test/ref-win32-msvc/ASHPTEST2.REP
diff --git a/test/ref-win32-msvc-release/ASHPVC2.REP b/test/ref-win32-msvc/ASHPVC2.REP
similarity index 100%
rename from test/ref-win32-msvc-release/ASHPVC2.REP
rename to test/ref-win32-msvc/ASHPVC2.REP
diff --git a/test/ref-win32-msvc-release/ASHP_DFNG.REP b/test/ref-win32-msvc/ASHP_DFNG.REP
similarity index 100%
rename from test/ref-win32-msvc-release/ASHP_DFNG.REP
rename to test/ref-win32-msvc/ASHP_DFNG.REP
diff --git a/test/ref-win32-msvc-release/AUTOSIZE.REP b/test/ref-win32-msvc/AUTOSIZE.REP
similarity index 100%
rename from test/ref-win32-msvc-release/AUTOSIZE.REP
rename to test/ref-win32-msvc/AUTOSIZE.REP
diff --git a/test/ref-win32-msvc-release/BT_TEST.REP b/test/ref-win32-msvc/BT_TEST.REP
similarity index 100%
rename from test/ref-win32-msvc-release/BT_TEST.REP
rename to test/ref-win32-msvc/BT_TEST.REP
diff --git a/test/ref-win32-msvc-release/CHDHW.REP b/test/ref-win32-msvc/CHDHW.REP
similarity index 100%
rename from test/ref-win32-msvc-release/CHDHW.REP
rename to test/ref-win32-msvc/CHDHW.REP
diff --git a/test/ref-win32-msvc-release/CRTERMINALAH.REP b/test/ref-win32-msvc/CRTERMINALAH.REP
similarity index 100%
rename from test/ref-win32-msvc-release/CRTERMINALAH.REP
rename to test/ref-win32-msvc/CRTERMINALAH.REP
diff --git a/test/ref-win32-msvc-release/DHWDU.rep b/test/ref-win32-msvc/DHWDU.rep
similarity index 100%
rename from test/ref-win32-msvc-release/DHWDU.rep
rename to test/ref-win32-msvc/DHWDU.rep
diff --git a/test/ref-win32-msvc-release/DHWLS.rep b/test/ref-win32-msvc/DHWLS.rep
similarity index 100%
rename from test/ref-win32-msvc-release/DHWLS.rep
rename to test/ref-win32-msvc/DHWLS.rep
diff --git a/test/ref-win32-msvc-release/DHW_AQUATHERMAIRE.REP b/test/ref-win32-msvc/DHW_AQUATHERMAIRE.REP
similarity index 100%
rename from test/ref-win32-msvc-release/DHW_AQUATHERMAIRE.REP
rename to test/ref-win32-msvc/DHW_AQUATHERMAIRE.REP
diff --git a/test/ref-win32-msvc-release/DHW_BRWL.REP b/test/ref-win32-msvc/DHW_BRWL.REP
similarity index 100%
rename from test/ref-win32-msvc-release/DHW_BRWL.REP
rename to test/ref-win32-msvc/DHW_BRWL.REP
diff --git a/test/ref-win32-msvc-release/DHW_C.REP b/test/ref-win32-msvc/DHW_C.REP
similarity index 100%
rename from test/ref-win32-msvc-release/DHW_C.REP
rename to test/ref-win32-msvc/DHW_C.REP
diff --git a/test/ref-win32-msvc-release/DHW_DR.REP b/test/ref-win32-msvc/DHW_DR.REP
similarity index 100%
rename from test/ref-win32-msvc-release/DHW_DR.REP
rename to test/ref-win32-msvc/DHW_DR.REP
diff --git a/test/ref-win32-msvc-release/DHW_INV.REP b/test/ref-win32-msvc/DHW_INV.REP
similarity index 100%
rename from test/ref-win32-msvc-release/DHW_INV.REP
rename to test/ref-win32-msvc/DHW_INV.REP
diff --git a/test/ref-win32-msvc-release/DHW_MFSIZING.REP b/test/ref-win32-msvc/DHW_MFSIZING.REP
similarity index 100%
rename from test/ref-win32-msvc-release/DHW_MFSIZING.REP
rename to test/ref-win32-msvc/DHW_MFSIZING.REP
diff --git a/test/ref-win32-msvc-release/DHW_SOLAR.rep b/test/ref-win32-msvc/DHW_SOLAR.rep
similarity index 100%
rename from test/ref-win32-msvc-release/DHW_SOLAR.rep
rename to test/ref-win32-msvc/DHW_SOLAR.rep
diff --git a/test/ref-win32-msvc-release/DHW_UEF.REP b/test/ref-win32-msvc/DHW_UEF.REP
similarity index 100%
rename from test/ref-win32-msvc-release/DHW_UEF.REP
rename to test/ref-win32-msvc/DHW_UEF.REP
diff --git a/test/ref-win32-msvc-release/DHW_ZONE.REP b/test/ref-win32-msvc/DHW_ZONE.REP
similarity index 100%
rename from test/ref-win32-msvc-release/DHW_ZONE.REP
rename to test/ref-win32-msvc/DHW_ZONE.REP
diff --git a/test/ref-win32-msvc-release/DWHR.REP b/test/ref-win32-msvc/DWHR.REP
similarity index 100%
rename from test/ref-win32-msvc-release/DWHR.REP
rename to test/ref-win32-msvc/DWHR.REP
diff --git a/test/ref-win32-msvc-release/ExportFileOutput.rep b/test/ref-win32-msvc/ExportFileOutput.rep
similarity index 100%
rename from test/ref-win32-msvc-release/ExportFileOutput.rep
rename to test/ref-win32-msvc/ExportFileOutput.rep
diff --git a/test/ref-win32-msvc-release/FANCOIL.REP b/test/ref-win32-msvc/FANCOIL.REP
similarity index 100%
rename from test/ref-win32-msvc-release/FANCOIL.REP
rename to test/ref-win32-msvc/FANCOIL.REP
diff --git a/test/ref-win32-msvc-release/FRESNO.REP b/test/ref-win32-msvc/FRESNO.REP
similarity index 100%
rename from test/ref-win32-msvc-release/FRESNO.REP
rename to test/ref-win32-msvc/FRESNO.REP
diff --git a/test/ref-win32-msvc-release/HERV.rep b/test/ref-win32-msvc/HERV.rep
similarity index 100%
rename from test/ref-win32-msvc-release/HERV.rep
rename to test/ref-win32-msvc/HERV.rep
diff --git a/test/ref-win32-msvc-release/IZFANTEST.REP b/test/ref-win32-msvc/IZFANTEST.REP
similarity index 100%
rename from test/ref-win32-msvc-release/IZFANTEST.REP
rename to test/ref-win32-msvc/IZFANTEST.REP
diff --git a/test/ref-win32-msvc-release/LOADANDAFMETERS.REP b/test/ref-win32-msvc/LOADANDAFMETERS.REP
similarity index 100%
rename from test/ref-win32-msvc-release/LOADANDAFMETERS.REP
rename to test/ref-win32-msvc/LOADANDAFMETERS.REP
diff --git a/test/ref-win32-msvc-release/MASSTEST1.REP b/test/ref-win32-msvc/MASSTEST1.REP
similarity index 100%
rename from test/ref-win32-msvc-release/MASSTEST1.REP
rename to test/ref-win32-msvc/MASSTEST1.REP
diff --git a/test/ref-win32-msvc-release/MF8X.REP b/test/ref-win32-msvc/MF8X.REP
similarity index 100%
rename from test/ref-win32-msvc-release/MF8X.REP
rename to test/ref-win32-msvc/MF8X.REP
diff --git a/test/ref-win32-msvc-release/MINIMUM_RUNNING_FILE.REP b/test/ref-win32-msvc/MINIMUM_RUNNING_FILE.REP
similarity index 100%
rename from test/ref-win32-msvc-release/MINIMUM_RUNNING_FILE.REP
rename to test/ref-win32-msvc/MINIMUM_RUNNING_FILE.REP
diff --git a/test/ref-win32-msvc-release/MULTIFAMILY-DOAS.REP b/test/ref-win32-msvc/MULTIFAMILY-DOAS.REP
similarity index 100%
rename from test/ref-win32-msvc-release/MULTIFAMILY-DOAS.REP
rename to test/ref-win32-msvc/MULTIFAMILY-DOAS.REP
diff --git a/test/ref-win32-msvc-release/PVTest.rep b/test/ref-win32-msvc/PVTest.rep
similarity index 100%
rename from test/ref-win32-msvc-release/PVTest.rep
rename to test/ref-win32-msvc/PVTest.rep
diff --git a/test/ref-win32-msvc-release/PV_BT_TEST.REP b/test/ref-win32-msvc/PV_BT_TEST.REP
similarity index 100%
rename from test/ref-win32-msvc-release/PV_BT_TEST.REP
rename to test/ref-win32-msvc/PV_BT_TEST.REP
diff --git a/test/ref-win32-msvc-release/QW5DS.REP b/test/ref-win32-msvc/QW5DS.REP
similarity index 100%
rename from test/ref-win32-msvc-release/QW5DS.REP
rename to test/ref-win32-msvc/QW5DS.REP
diff --git a/test/ref-win32-msvc-release/SHADETEST.rep b/test/ref-win32-msvc/SHADETEST.rep
similarity index 100%
rename from test/ref-win32-msvc-release/SHADETEST.rep
rename to test/ref-win32-msvc/SHADETEST.rep
diff --git a/test/ref-win32-msvc-release/WSHP.REP b/test/ref-win32-msvc/WSHP.REP
similarity index 100%
rename from test/ref-win32-msvc-release/WSHP.REP
rename to test/ref-win32-msvc/WSHP.REP
diff --git a/test/ref-win32-msvc-release/Z2SG.REP b/test/ref-win32-msvc/Z2SG.REP
similarity index 100%
rename from test/ref-win32-msvc-release/Z2SG.REP
rename to test/ref-win32-msvc/Z2SG.REP
diff --git a/test/ref-win32-msvc-release/ZONETEST4W.REP b/test/ref-win32-msvc/ZONETEST4W.REP
similarity index 100%
rename from test/ref-win32-msvc-release/ZONETEST4W.REP
rename to test/ref-win32-msvc/ZONETEST4W.REP
diff --git a/test/ref-win32-msvc-release/ZT5D.REP b/test/ref-win32-msvc/ZT5D.REP
similarity index 100%
rename from test/ref-win32-msvc-release/ZT5D.REP
rename to test/ref-win32-msvc/ZT5D.REP
diff --git a/test/ref-win32-msvc-release/ashwat1.rep b/test/ref-win32-msvc/ashwat1.rep
similarity index 100%
rename from test/ref-win32-msvc-release/ashwat1.rep
rename to test/ref-win32-msvc/ashwat1.rep
diff --git a/test/ref-win32-msvc-release/bgtest.rep b/test/ref-win32-msvc/bgtest.rep
similarity index 100%
rename from test/ref-win32-msvc-release/bgtest.rep
rename to test/ref-win32-msvc/bgtest.rep
diff --git a/test/ref-win32-msvc-release/commands.rep b/test/ref-win32-msvc/commands.rep
similarity index 100%
rename from test/ref-win32-msvc-release/commands.rep
rename to test/ref-win32-msvc/commands.rep
diff --git a/test/ref-win32-msvc-release/dhw02.rep b/test/ref-win32-msvc/dhw02.rep
similarity index 100%
rename from test/ref-win32-msvc-release/dhw02.rep
rename to test/ref-win32-msvc/dhw02.rep
diff --git a/test/ref-win32-msvc-release/dhwloop32U.rep b/test/ref-win32-msvc/dhwloop32U.rep
similarity index 100%
rename from test/ref-win32-msvc-release/dhwloop32U.rep
rename to test/ref-win32-msvc/dhwloop32U.rep
diff --git a/test/ref-win32-msvc-release/dhwx.rep b/test/ref-win32-msvc/dhwx.rep
similarity index 100%
rename from test/ref-win32-msvc-release/dhwx.rep
rename to test/ref-win32-msvc/dhwx.rep
diff --git a/test/ref-win32-msvc-release/expressions.rep b/test/ref-win32-msvc/expressions.rep
similarity index 100%
rename from test/ref-win32-msvc-release/expressions.rep
rename to test/ref-win32-msvc/expressions.rep
diff --git a/test/ref-win32-msvc-release/oavtest2.rep b/test/ref-win32-msvc/oavtest2.rep
similarity index 100%
rename from test/ref-win32-msvc-release/oavtest2.rep
rename to test/ref-win32-msvc/oavtest2.rep
diff --git a/test/ref-win32-msvc-release/submeter.rep b/test/ref-win32-msvc/submeter.rep
similarity index 100%
rename from test/ref-win32-msvc-release/submeter.rep
rename to test/ref-win32-msvc/submeter.rep
diff --git a/test/ref-win32-msvc-release/wthr01.rep b/test/ref-win32-msvc/wthr01.rep
similarity index 100%
rename from test/ref-win32-msvc-release/wthr01.rep
rename to test/ref-win32-msvc/wthr01.rep