Migrate Windows build system to CLANG64 (Mudlet#57)

* update to clang64

* use qt-clang as qt key

* compile qttools to prevent version mismatch

* f that, qt compile takes too long, lets compile the qt that pacman would give us

* fix hardcoded qt version, fail if pacman cant find qt

* provide linux and mac with QT_VERSION

Author: jmckisson

.github/workflows/build.yml

@@ -84,6 +84,8 @@ jobs:
 
     - name: (Linux, macOS) Build Qt StateMachine Module
       if: runner.os == 'Linux' || runner.os == 'macOS'
+      env:
+        QT_VERSION: ${{matrix.qt}}
       run: |
         # Make the build script executable and run it
         chmod +x ./CI/build-qt-statemachine.sh
@@ -93,7 +95,7 @@ jobs:
       if: runner.os == 'Windows'
       uses: msys2/setup-msys2@v2
       with:
-        msystem: MINGW64
+        msystem: CLANG64
         update: true
 
     - name: (Windows) Build Environment Setup
@@ -109,7 +111,7 @@ jobs:
       uses: actions/cache/restore@v5
       with:
         path: ${{env.QT_ROOT}}
-        key: qt
+        key: qt-clang-${{env.QT_VERSION}}
 
     - name: (Windows) Compile Qt
       if: runner.os == 'Windows' && steps.restore-qt.outputs.cache-hit != 'true'

CI/build-qt-statemachine.sh

@@ -8,7 +8,7 @@ set -e
 echo "=== Building Qt ScXML Module from Source ==="
 
 # Set variables
-QT_STATEMACHINE_VERSION="6.9.1"
+QT_STATEMACHINE_VERSION="${QT_VERSION}"
 WORKSPACE_DIR="${RUNNER_WORKSPACE:-$HOME/bootstrap}"
 QT_DIR="${WORKSPACE_DIR}/Qt/${QT_STATEMACHINE_VERSION}/$(uname | tr '[:upper:]' '[:lower:]')_$(uname -m)"
 
@@ -29,9 +29,10 @@ cd "$BUILD_DIR"
 
 # Download Qt SCXML source from official Qt releases
 echo "=== Downloading Qt SCXML source from official releases ==="
-SCXML_URL="https://download.qt.io/official_releases/qt/6.9/6.9.1/submodules/qtscxml-everywhere-src-6.9.1.tar.xz"
+QT_MINOR="${QT_VERSION%.*}"
+SCXML_URL="https://download.qt.io/official_releases/qt/${QT_MINOR}/${QT_VERSION}/submodules/qtscxml-everywhere-src-${QT_VERSION}.tar.xz"
 
-if [[ ! -f "qtscxml-everywhere-src-6.9.1.tar.xz" ]]; then
+if [[ ! -f "qtscxml-everywhere-src-${QT_VERSION}.tar.xz" ]]; then
     echo "Downloading $SCXML_URL"
     wget -q "$SCXML_URL" || {
         echo "Failed to download Qt SCXML source"
@@ -41,11 +42,11 @@ fi
 
 # Extract the source
 echo "=== Extracting Qt SCXML source ==="
-if [[ ! -d "qtscxml-everywhere-src-6.9.1" ]]; then
-    tar xf qtscxml-everywhere-src-6.9.1.tar.xz
+if [[ ! -d "qtscxml-everywhere-src-${QT_VERSION}" ]]; then
+    tar xf "qtscxml-everywhere-src-${QT_VERSION}.tar.xz"
 fi
 
-cd qtscxml-everywhere-src-6.9.1
+cd "qtscxml-everywhere-src-${QT_VERSION}"
 
 # Configure
 echo "=== Configuring Qt ScXML build ==="

CI/build-win.sh

@@ -40,27 +40,14 @@
 # 2 - Unsupported MSYS2/MINGGW shell type
 # 3 - Unsupported build type
 
-if [ "${MSYSTEM}" = "MSYS" ]; then
-  echo "Please run this script from an MINGW32 or MINGW64 type bash terminal appropriate"
-  echo "to the bitness you want to work on. You may do this once for each of them should"
-  echo "you wish to do both."
-  exit 2
-elif [ "${MSYSTEM}" = "MINGW64" ]; then
-  export BUILD_BITNESS="64"
-else
-  echo "This script is not set up to handle systems of type ${MSYSTEM}, only MINGW32 or"
-  echo "MINGW64 are currently supported. Please rerun this in a bash terminal of one"
-  echo "of those two types."
+if [ "${MSYSTEM}" != "CLANG64" ]; then
+  echo "Please run this script from a CLANG64 type bash terminal."
+  echo "Current MSYSTEM is: ${MSYSTEM}"
   exit 2
 fi
 
-
-MINGW_BASE_DIR="${GHCUP_MSYS2}\mingw32"
-export MINGW_BASE_DIR
-MINGW_INTERNAL_BASE_DIR="/mingw${BUILD_BITNESS}"
-export MINGW_INTERNAL_BASE_DIR
-PATH="${MINGW_INTERNAL_BASE_DIR}/usr/local/bin:${MINGW_INTERNAL_BASE_DIR}/bin:/usr/bin:${PATH}"
-export PATH
+export MINGW_BASE_DIR="${MSYSTEM_PREFIX}"
+export PATH="${MINGW_BASE_DIR}/usr/local/bin:${MINGW_BASE_DIR}/bin:/usr/bin:${PATH}"
 RUNNER_WORKSPACE_UNIX_PATH=$(echo "${RUNNER_WORKSPACE}" | sed 's|\\|/|g' | sed 's|D:|/d|g')
 export CCACHE_DIR=${RUNNER_WORKSPACE_UNIX_PATH}/ccache
 
@@ -76,7 +63,7 @@ LAUNCH_INI_PATH="${GITHUB_WORKSPACE}/resources/launch.ini"
 Qt6_PREFIX=${RUNNER_WORKSPACE}/qt-static-install
 QT_DIR=${Qt6_PREFIX}/lib/cmake/Qt6
 export QT_DIR
-QT_LINGUIST_DIR=$(cygpath -w /mingw64/lib/cmake/Qt6LinguistTools)
+QT_LINGUIST_DIR=$(cygpath -w ${MSYSTEM_PREFIX}/lib/cmake/Qt6LinguistTools)
 echo "Qt6_PREFIX is: ${Qt6_PREFIX}"
 echo "QT_DIR is: ${QT_DIR}"
 echo "QT_LINGUIST_DIR is: ${QT_LINGUIST_DIR}"
@@ -110,8 +97,7 @@ while IFS= read -r line || [[ -n "$line" ]]; do
     echo "Found Qt6LinguistToolsConfig.cmake at: ${QT_LINGUIST_DIR}/Qt6LinguistToolsConfig.cmake"
   else
     echo "ERROR: Qt6LinguistToolsConfig.cmake not found at: ${QT_LINGUIST_DIR}/Qt6LinguistToolsConfig.cmake"
-    # Try to find it in system installation
-    find "/mingw64" -name "Qt6LinguistToolsConfig.cmake" -type f 2>/dev/null
+    find "${MSYSTEM_PREFIX}" -name "Qt6LinguistToolsConfig.cmake" -type f 2>/dev/null
     exit 1
   fi
 
@@ -121,13 +107,13 @@ while IFS= read -r line || [[ -n "$line" ]]; do
 
   # Debug: Check what PCRE2 libraries are available
   echo "Checking for PCRE2 libraries..."
-  find /mingw64/lib -name "*pcre*" -type f 2>/dev/null | head -5
+  find ${MSYSTEM_PREFIX}/lib -name "*pcre*" -type f 2>/dev/null | head -5
   find "${RUNNER_WORKSPACE}/qt-static-install" -name "*pcre*" -type f 2>/dev/null | head -5
 
   # Find the actual PCRE2 library path
-  PCRE2_LIB_PATH=$(find /mingw64/lib -name "libpcre2-16.a" -type f | head -1)
+  PCRE2_LIB_PATH=$(find ${MSYSTEM_PREFIX}/lib -name "libpcre2-16.a" -type f | head -1)
   if [ -z "$PCRE2_LIB_PATH" ]; then
-    PCRE2_LIB_PATH=$(find /mingw64/lib -name "*pcre2*" -type f | head -1)
+    PCRE2_LIB_PATH=$(find ${MSYSTEM_PREFIX}/lib -name "*pcre2*" -type f | head -1)
   fi
   echo "Found PCRE2 library at: $PCRE2_LIB_PATH"
 
@@ -153,8 +139,7 @@ if(NOT TARGET Qt6::BundledPcre2)
         find_library(QT_BUNDLED_PCRE2_LIB
             NAMES pcre2-16 libpcre2-16
             PATHS
-                "/mingw64/lib"
-                "C:/a/_temp/msys64/mingw64/lib"
+                "$ENV{MSYSTEM_PREFIX}/lib"
             NO_DEFAULT_PATH
         )
     endif()
@@ -180,8 +165,9 @@ if(NOT TARGET Qt6::BundledPcre2)
     endif()
 endif()
 
-set(Qt6BundledPcre2_VERSION "6.9.1")
+set(Qt6BundledPcre2_VERSION "QT_VERSION_PLACEHOLDER")
 EOF
+    sed -i "s/QT_VERSION_PLACEHOLDER/${QT_VERSION}/" "${QT_CMAKE_DIR}/Qt6BundledPcre2/Qt6BundledPcre2Config.cmake"
     echo "Created Qt6BundledPcre2Config.cmake"
   fi
 
@@ -194,7 +180,7 @@ set(Qt6Bundled${bundled_lib}_FOUND TRUE)
 if(NOT TARGET Qt6::Bundled${bundled_lib})
     add_library(Qt6::Bundled${bundled_lib} INTERFACE IMPORTED)
 endif()
-set(Qt6Bundled${bundled_lib}_VERSION "6.9.1")
+set(Qt6Bundled${bundled_lib}_VERSION "${QT_VERSION}")
 EOF
       echo "Created Qt6Bundled${bundled_lib}Config.cmake"
     fi
@@ -207,8 +193,7 @@ EOF
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_PREFIX_PATH="$(cygpath -w $Qt6_PREFIX)" \
     -DQt6LinguistTools_DIR="${QT_LINGUIST_DIR}" \
-    -DQt6BundledPcre2_DIR="$(cygpath -w /a/_temp/msys64/mingw64/lib/cmake/Qt6)" \
-    -DCMAKE_IGNORE_PATH="/a/_temp/msys64/mingw64/lib/cmake/Qt6" \
+    -DCMAKE_IGNORE_PATH="${MSYSTEM_PREFIX}/lib/cmake/Qt6" \
     ..
 
   if [ $? -ne 0 ]; then

CI/compile-qt-win.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-echo "=== Cloning Qt Source Repository ==="
+echo "=== Cloning Qt Source Repository (v${QT_VERSION}) ==="
 cd ${RUNNER_WORKSPACE}
-git clone --branch v6.9.1 --depth 1 --no-recurse-submodules https://github.com/qt/qt5.git qt6-source
+git clone --branch v${QT_VERSION} --depth 1 --no-recurse-submodules https://github.com/qt/qt5.git qt6-source
 cd qt6-source
 git submodule update --init qtbase
 
@@ -20,7 +20,6 @@ export CMAKE_SUPPRESS_DEVELOPER_WARNINGS=ON
   -nomake tests -nomake examples \
   -skip qt3d -skip qtmultimedia -skip qtdeclarative -skip qtshadertools -skip qtquick -skip designer \
   -no-opengl -no-dbus \
-  -platform win32-g++ \
   -qt-pcre \
   -openssl-linked \
   -- \
@@ -47,21 +46,22 @@ else
     cd qt-scxml-build
 
     # Try downloading from Qt's additional libraries (this may or may not work)
-    wget -q https://download.qt.io/official_releases/qt/6.9/6.9.1/submodules/qtscxml-everywhere-src-6.9.1.tar.xz || \
+    QT_MINOR="${QT_VERSION%.*}"
+    wget -q "https://download.qt.io/official_releases/qt/${QT_MINOR}/${QT_VERSION}/submodules/qtscxml-everywhere-src-${QT_VERSION}.tar.xz" || \
     echo "Could not download ScXML from additional libraries"
-    
-    if [[ -f qtscxml-everywhere-src-6.9.1.tar.xz ]]; then
+
+    if [[ -f "qtscxml-everywhere-src-${QT_VERSION}.tar.xz" ]]; then
         echo "Found ScXML source, building..."
-        tar xf qtscxml-everywhere-src-6.9.1.tar.xz
-        cd qtscxml-everywhere-src-6.9.1
+        tar xf "qtscxml-everywhere-src-${QT_VERSION}.tar.xz"
+        cd "qtscxml-everywhere-src-${QT_VERSION}"
         mkdir build && cd build
         cmake .. \
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_PREFIX_PATH=${RUNNER_WORKSPACE}/qt-static-install \
             -DCMAKE_INSTALL_PREFIX=${RUNNER_WORKSPACE}/qt-static-install \
             -DBUILD_SHARED_LIBS=OFF \
             -DQT_BUILD_SHARED_LIBS=OFF \
-            -G "MinGW Makefiles"
+            -G Ninja
         cmake --build . --parallel
         cmake --install .
     else

CI/deploy-win.sh

@@ -29,19 +29,9 @@
 # 4 - nuget error
 # 5 - squirrel error
 
-if [ "${MSYSTEM}" = "MSYS" ]; then
-  echo "Please run this script from an MINGW32 or MINGW64 type bash terminal appropriate"
-  echo "to the bitness you want to work on. You may do this once for each of them should"
-  echo "you wish to do both."
-  exit 2
-elif [ "${MSYSTEM}" = "MINGW64" ]; then
-  export BUILD_BITNESS="64"
-  export BUILDCOMPONENT="x86_64"
-  export ARCH="x86"
-else
-  echo "This script is not set up to handle systems of type ${MSYSTEM}, only MINGW32 or"
-  echo "MINGW64 are currently supported. Please rerun this in a bash terminal of one"
-  echo "of those two types."
+if [ "${MSYSTEM}" != "CLANG64" ]; then
+  echo "Please run this script from a CLANG64 type bash terminal."
+  echo "Current MSYSTEM is: ${MSYSTEM}"
   exit 2
 fi
 

CI/package-win.sh

@@ -45,23 +45,13 @@
 # 4 - Directory to be used to assemble the package is NOT empty
 # 6 - No Mudlet.exe file found to work with
 
-if [ "${MSYSTEM}" = "MSYS" ]; then
-  echo "Please run this script from an MINGW32 or MINGW64 type bash terminal appropriate"
-  echo "to the bitness you want to work on. You may do this once for each of them should"
-  echo "you wish to do both."
-  exit 2
-elif [ "${MSYSTEM}" = "MINGW64" ]; then
-  export BUILD_BITNESS="64"
-else
-  echo "This script is not set up to handle systems of type ${MSYSTEM}, only MINGW32 or"
-  echo "MINGW64 are currently supported. Please rerun this in a bash terminal of one"
-  echo "of those two types."
+if [ "${MSYSTEM}" != "CLANG64" ]; then
+  echo "Please run this script from a CLANG64 type bash terminal."
+  echo "Current MSYSTEM is: ${MSYSTEM}"
   exit 2
 fi
 
 BUILD_CONFIG="release"
-MINGW_INTERNAL_BASE_DIR="/mingw${BUILD_BITNESS}"
-export MINGW_INTERNAL_BASE_DIR
 GITHUB_WORKSPACE_UNIX_PATH=$(echo ${GITHUB_WORKSPACE} | sed 's|\\|/|g' | sed 's|D:|/d|g')
 
 echo "MSYSTEM is: ${MSYSTEM}"
@@ -132,9 +122,9 @@ while IFS= read -r line || [[ -n "$line" ]]; do
   echo ""
   #echo "Examining MudletInstaller application to identify other needed libraries..."
 
-  #  NEEDED_LIBS=$("${MINGW_INTERNAL_BASE_DIR}/bin/ntldd" --recursive ./MudletInstaller.exe \
+  #  NEEDED_LIBS=$("${MSYSTEM_PREFIX}/bin/ntldd" --recursive ./MudletInstaller.exe \
   #    | /usr/bin/grep -v "Qt6" \
-  #    | /usr/bin/grep -i "mingw" \
+  #    | /usr/bin/grep -i "clang64" \
   #    | /usr/bin/cut -d ">" -f2 \
   #    | /usr/bin/cut -d "(" -f1 \
   #    | /usr/bin/sort)

CI/setup-win-sdk.sh

@@ -50,30 +50,14 @@
 # 7 - One of more packages failed to install
 
 
-if [ "${MSYSTEM}" = "MINGW64" ]; then
-  export BUILD_BITNESS="64"
-  export BUILDCOMPONENT="x86_64"
-elif [ "${MSYSTEM}" = "MSYS" ]; then
-  echo "Please run this script from an MINGW32 or MINGW64 type bash terminal appropriate"
-  echo "to the bitness you want to work on. You may do this once for each of them should"
-  echo "you wish to do both."
-  exit 2
-else
-  echo "This script is not set up to handle systems of type ${MSYSTEM}, only MINGW32 or"
-  echo "MINGW64 are currently supported. Please rerun this in a bash terminal of one"
-  echo "of those two types."
+if [ "${MSYSTEM}" != "CLANG64" ]; then
+  echo "Please run this script from a CLANG64 type bash terminal."
+  echo "Current MSYSTEM is: ${MSYSTEM}"
   exit 2
 fi
 
-# We use this internally - but it is actually the same as ${MINGW_PREFIX}
-export MINGW_BASE_DIR=$MSYSTEM_PREFIX
-# A more compact - but not necessarily understood by other than MSYS/MINGW
-# executables - path:
-export MINGW_INTERNAL_BASE_DIR="/mingw${BUILD_BITNESS}"
-#
-# FIXME: don't add duplicates but rearrange instead to put them in the "right" order:
-#
-export PATH="${MINGW_INTERNAL_BASE_DIR}/usr/local/bin:${MINGW_INTERNAL_BASE_DIR}/bin:/usr/bin:${PATH}"
+export MINGW_BASE_DIR="${MSYSTEM_PREFIX}"
+export PATH="${MINGW_BASE_DIR}/usr/local/bin:${MINGW_BASE_DIR}/bin:/usr/bin:${PATH}"
 echo "MSYSTEM is: ${MSYSTEM}"
 echo "PATH is now: ${PATH}"
 echo ""
@@ -118,27 +102,27 @@ while true; do
     perl \
     bison \
     flex \
-    "mingw-w64-${BUILDCOMPONENT}-ccache" \
-    "mingw-w64-${BUILDCOMPONENT}-ntldd" \
-    "mingw-w64-${BUILDCOMPONENT}-toolchain" \
-    "mingw-w64-${BUILDCOMPONENT}-zlib" \
-    "mingw-w64-${BUILDCOMPONENT}-icu" \
-    "mingw-w64-${BUILDCOMPONENT}-openssl" \
-    "mingw-w64-${BUILDCOMPONENT}-cmake" \
-    "mingw-w64-${BUILDCOMPONENT}-ninja" \
-    "mingw-w64-${BUILDCOMPONENT}-pcre2" \
-    "mingw-w64-${BUILDCOMPONENT}-bzip2" \
-    "mingw-w64-${BUILDCOMPONENT}-qt6-tools" \
-    "mingw-w64-${BUILDCOMPONENT}-qt6-translations" \
-    "mingw-w64-${BUILDCOMPONENT}-freetype" \
-    "mingw-w64-${BUILDCOMPONENT}-harfbuzz" \
-    "mingw-w64-${BUILDCOMPONENT}-libjpeg-turbo" \
-    "mingw-w64-${BUILDCOMPONENT}-libpng" \
-    "mingw-w64-${BUILDCOMPONENT}-zstd" \
-    "mingw-w64-${BUILDCOMPONENT}-libb2" \
-    "mingw-w64-${BUILDCOMPONENT}-brotli" \
-    "mingw-w64-${BUILDCOMPONENT}-graphite2" \
-    "mingw-w64-${BUILDCOMPONENT}-gettext"; then
+    "${MINGW_PACKAGE_PREFIX}-ccache" \
+    "${MINGW_PACKAGE_PREFIX}-ntldd" \
+    "${MINGW_PACKAGE_PREFIX}-toolchain" \
+    "${MINGW_PACKAGE_PREFIX}-zlib" \
+    "${MINGW_PACKAGE_PREFIX}-icu" \
+    "${MINGW_PACKAGE_PREFIX}-openssl" \
+    "${MINGW_PACKAGE_PREFIX}-cmake" \
+    "${MINGW_PACKAGE_PREFIX}-ninja" \
+    "${MINGW_PACKAGE_PREFIX}-pcre2" \
+    "${MINGW_PACKAGE_PREFIX}-bzip2" \
+    "${MINGW_PACKAGE_PREFIX}-qt6-tools" \
+    "${MINGW_PACKAGE_PREFIX}-qt6-translations" \
+    "${MINGW_PACKAGE_PREFIX}-freetype" \
+    "${MINGW_PACKAGE_PREFIX}-harfbuzz" \
+    "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo" \
+    "${MINGW_PACKAGE_PREFIX}-libpng" \
+    "${MINGW_PACKAGE_PREFIX}-zstd" \
+    "${MINGW_PACKAGE_PREFIX}-libb2" \
+    "${MINGW_PACKAGE_PREFIX}-brotli" \
+    "${MINGW_PACKAGE_PREFIX}-graphite2" \
+    "${MINGW_PACKAGE_PREFIX}-gettext"; then
       break
   fi
 
@@ -158,12 +142,21 @@ ccache --max-size=10G
 #echo "=== Listing Environment Variables ==="
 #printenv
 
+# Detect the Qt version installed by pacman so we can build a matching static qtbase
+QT_VERSION=$(pacman -Q "${MINGW_PACKAGE_PREFIX}-qt6-base" | awk '{print $2}' | sed 's/-.*//')
+if [ -z "$QT_VERSION" ]; then
+  echo "ERROR: Could not detect Qt version from pacman"
+  exit 1
+fi
+echo "Detected system Qt version: ${QT_VERSION}"
+echo "QT_VERSION=${QT_VERSION}" >> $GITHUB_ENV
+
 echo "Debugging libbz2 symbols"
 echo "BZ2 library:"
-find /mingw64/lib -name "*bz2*" -type f
+find ${MSYSTEM_PREFIX}/lib -name "*bz2*" -type f
 echo "PCRE2 library:"
-find /mingw64/lib -name "*pcre2*" -type f
+find ${MSYSTEM_PREFIX}/lib -name "*pcre2*" -type f
 echo "Freetype library:"
-find /mingw64/lib -name "*freetype*" -type f
+find ${MSYSTEM_PREFIX}/lib -name "*freetype*" -type f
 
 exit 0