try doing the same on msys

Author: lkeegan

.github/workflows/release.yml

@@ -37,51 +37,46 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # - os: "ubuntu-22.04"
-          #   shell: "bash"
-          #   BOOST_INSTALL_PREFIX: "/opt/smelibs"
-          #   BOOST_BOOTSTRAP_OPTIONS: "--with-toolset=clang"
-          #   BOOST_B2_OPTIONS: "cxxflags=-fPIC"
-          #   TBB_ENABLE_IPO: "ON"
-          # - os: "ubuntu-22.04-arm"
-          #   shell: "bash"
-          #   BOOST_INSTALL_PREFIX: "/opt/smelibs"
-          #   BOOST_BOOTSTRAP_OPTIONS: "--with-toolset=clang"
-          #   BOOST_B2_OPTIONS: "cxxflags=-fPIC"
-          #   TBB_ENABLE_IPO: "ON"
+          - os: "ubuntu-22.04"
+            shell: "bash"
+            BOOST_INSTALL_PREFIX: "/opt/smelibs"
+            BOOST_BOOTSTRAP_OPTIONS: "--with-toolset=clang"
+            BOOST_B2_OPTIONS: "cxxflags=-fPIC"
+            TBB_ENABLE_IPO: "ON"
+          - os: "ubuntu-22.04-arm"
+            shell: "bash"
+            BOOST_INSTALL_PREFIX: "/opt/smelibs"
+            BOOST_BOOTSTRAP_OPTIONS: "--with-toolset=clang"
+            BOOST_B2_OPTIONS: "cxxflags=-fPIC"
+            TBB_ENABLE_IPO: "ON"
           - os: "macos-13"
             shell: "bash"
             BOOST_INSTALL_PREFIX: "/opt/smelibs"
             BOOST_B2_OPTIONS: 'cxxflags="-mmacosx-version-min=11" linkflags="-mmacosx-version-min=11"'
             TBB_ENABLE_IPO: "ON"
-            VTK_OPTIONS: "-DFREETYPE_LIBRARY_RELEASE=/opt/smelibs/lib/libQt6BundledFreetype.a -DFREETYPE_INCLUDE_DIR_freetype2=/opt/smelibs/include/QtFreetype -DFREETYPE_INCLUDE_DIR_ft2build=/opt/smelibs/include/QtFreetype"
           - os: "macos-14"
             shell: "bash"
             BOOST_INSTALL_PREFIX: "/opt/smelibs"
             BOOST_B2_OPTIONS: 'cxxflags="-mmacosx-version-min=11" linkflags="-mmacosx-version-min=11"'
             TBB_ENABLE_IPO: "ON"
-            VTK_OPTIONS: "-DFREETYPE_LIBRARY_RELEASE=/opt/smelibs/lib/libQt6BundledFreetype.a -DFREETYPE_INCLUDE_DIR_freetype2=/opt/smelibs/include/QtFreetype -DFREETYPE_INCLUDE_DIR_ft2build=/opt/smelibs/include/QtFreetype"
-            # - os: "windows-2022"
-            #   shell: "msys2 {0}"
-            #   BOOST_INSTALL_PREFIX: "C:/smelibs"
-            #   BOOST_B2_OPTIONS: "address-model=64"
-            #   TBB_ENABLE_IPO: "OFF"
-            #   VTK_OPTIONS: "-DFREETYPE_LIBRARY_RELEASE=/c/smelibs/lib/libQt6BundledFreetype.a -DFREETYPE_INCLUDE_DIR_freetype2=/c/smelibs/include/QtFreetype -DFREETYPE_INCLUDE_DIR_ft2build=/c/smelibs/include/QtFreetype"
+          - os: "windows-2022"
+            shell: "msys2 {0}"
+            BOOST_INSTALL_PREFIX: "C:/smelibs"
+            BOOST_B2_OPTIONS: "address-model=64"
+            TBB_ENABLE_IPO: "OFF"
             # - os: "windows-11-arm"
             #   shell: "msys2 {0}"
             #   BOOST_INSTALL_PREFIX: "C:/smelibs"
             #   BOOST_B2_OPTIONS: "address-model=64"
             #   TBB_ENABLE_IPO: "OFF"
-            #   VTK_OPTIONS: "-DFREETYPE_LIBRARY_RELEASE=/c/smelibs/lib/libQt6BundledFreetype.a -DFREETYPE_INCLUDE_DIR_freetype2=/c/smelibs/include/QtFreetype -DFREETYPE_INCLUDE_DIR_ft2build=/c/smelibs/include/QtFreetype"
     defaults:
       run:
         shell: ${{ matrix.shell }}
     env:
       BOOST_INSTALL_PREFIX: ${{ matrix.BOOST_INSTALL_PREFIX }}
-      # BOOST_BOOTSTRAP_OPTIONS: ${{ matrix.BOOST_BOOTSTRAP_OPTIONS }}
+      BOOST_BOOTSTRAP_OPTIONS: ${{ matrix.BOOST_BOOTSTRAP_OPTIONS }}
       BOOST_B2_OPTIONS: ${{ matrix.BOOST_B2_OPTIONS }}
       TBB_ENABLE_IPO: ${{ matrix.TBB_ENABLE_IPO }}
-      VTK_OPTIONS: ${{ matrix.VTK_OPTIONS }}
     steps:
       - uses: spatial-model-editor/[email protected]
         with:

build.sh

@@ -604,10 +604,18 @@ time ninja
 ${SUDO_CMD} ninja install
 cd ../../
 
-# try to combine .a libs on macos only for now
-cp /opt/smelibs/lib/libQt6BundledFreetype.a /opt/smelibs/lib/ft.a
-libtool -static -o /opt/smelibs/lib/libCombinedFreetype.a /opt/smelibs/lib/libQt6BundledFreetype.a /opt/smelibs/lib/libQt6BundledLibpng.a /opt/smelibs/lib/libz.a
-VTK_OPTIONS="-DFREETYPE_LIBRARY_RELEASE=/opt/smelibs/lib/libCombinedFreetype.a -DFREETYPE_INCLUDE_DIR_freetype2=/opt/smelibs/include/QtFreetype -DFREETYPE_INCLUDE_DIR_ft2build=/opt/smelibs/include/QtFreetype"
+# combine the static libs implicitly required by qt's bundled freetype lib into a single .a lib for vtk to use
+if [ "$RUNNER_OS" != "Linux" ]; then
+    if [ "$RUNNER_OS" == "macOS" ]; then
+        # combine using libtool on mac
+        libtool -static -o /opt/smelibs/lib/libCombinedFreetype.a /opt/smelibs/lib/libQt6BundledFreetype.a /opt/smelibs/lib/libQt6BundledLibpng.a /opt/smelibs/lib/libz.a
+    elif [ "$RUNNER_OS" == "windows" ]; then
+        # combine using ld and ar on msys
+        ld -r -o libCombinedFreetype.o /opt/smelibs/lib/libQt6BundledFreetype.a /opt/smelibs/lib/libQt6BundledLibpng.a /opt/smelibs/lib/libz.a
+        ar rcs /opt/smelibs/lib/libCombinedFreetype.a libCombinedFreetype.o
+    fi
+    VTK_OPTIONS="-DFREETYPE_LIBRARY_RELEASE=/opt/smelibs/lib/libCombinedFreetype.a -DFREETYPE_INCLUDE_DIR_freetype2=/opt/smelibs/include/QtFreetype -DFREETYPE_INCLUDE_DIR_ft2build=/opt/smelibs/include/QtFreetype"
+fi
 
 # build minimal static version of VTK including GUISupportQt and RenderingQt modules
 git clone -b $VTK_VERSION --depth 1 https://github.com/Kitware/VTK.git