Merge pull request #809 from fredzo/master

CI Build for Windows MSI installer
ngscopeclient · Nov 15, 2024 · 3be0d63 · 3be0d63
2 parents fdf8e31 + c0a4024
commit 3be0d63
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 12 deletions.
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -52,7 +52,22 @@ jobs:
           ffts:p
           hidapi:p
 
-    - name: Build
+    - name: Install WiX
+      if: ${{ matrix.sys == 'ucrt64' }}
+      run: |
+        choco install wixtoolset --force
+      shell: cmd
+
+    - name: Build And Dist
+      if: ${{ matrix.sys == 'ucrt64' }}
+      run: |
+        mkdir build
+        cd build
+        cmake .. -DWIXPATH="C:\Program Files (x86)\WiX Toolset v3.14\bin" -GNinja
+        ninja
+
+    - name: Build Only
+      if: ${{ matrix.sys != 'ucrt64' }}
       run: |
         mkdir build
         cd build
@@ -77,14 +92,16 @@ jobs:
     #     name: glscopeclient-windows-${{ runner.os }}-${{ github.job }}
     #     path: msys2/*.zst
 
-    # - name: Upload Artifacts (ngscopeclient portable zip)
-    #   uses: actions/upload-artifact@v4
-    #   with:
-    #     name: ngscopeclient-windows-portable-${{ runner.os }}-${{ github.job }}
-    #     path: build/dist/ngscopeclient*.zip
+    - name: Upload Artifacts (ngscopeclient portable zip)
+      if: ${{ matrix.sys == 'ucrt64' }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: ngscopeclient-windows-portable-${{ runner.os }}-${{ github.job }}
+        path: build/dist/ngscopeclient*.zip
 
-    # - name: Upload Artifacts (ngscopeclient MSI)
-    #   uses: actions/upload-artifact@v4
-    #   with:
-    #     name: ngscopeclient-${{ runner.os }}-${{ github.job }}.msi
-    #     path: build/dist/ngscopeclient*.msi
+    - name: Upload Artifacts (ngscopeclient MSI)
+      if: ${{ matrix.sys == 'ucrt64' }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: ngscopeclient-${{ runner.os }}-${{ github.job }}.msi
+        path: build/dist/ngscopeclient*.msi
diff --git a/src/ngscopeclient/CMakeLists.txt b/src/ngscopeclient/CMakeLists.txt
@@ -245,7 +245,7 @@ if(WIXPATH AND WIN32)
 				${CMAKE_BINARY_DIR}/lib/scopeprotocols/libscopeprotocols.dll
 				${CMAKE_BINARY_DIR}/src/ngscopeclient/ngscopeclient.exe
 				${CMAKE_BINARY_DIR}/dist/ngscopeclient_windows_x64
-		COMMAND bash -c \"cp -R /mingw64/share/licenses ${CMAKE_BINARY_DIR}/dist/ngscopeclient_windows_x64\"
+		COMMAND bash -c \"cp -R ${MINGW64_BIN_PATH}/../share/licenses ${CMAKE_BINARY_DIR}/dist/ngscopeclient_windows_x64\"
 		COMMAND bash -c \"wget https://github.com/bvernoux/mingw-bundledlls/releases/download/v0.2.4/mingw-bundledlls-0.2.4-1-x86_64.pkg.tar.zst && pacman -U --noconfirm mingw-bundledlls-*.pkg.tar.zst && rm -f mingw-bundledlls-*.pkg.tar.zst\"
 		COMMAND bash -c \"export MINGW_BUNDLEDLLS_SEARCH_PATH='${MINGW64_BIN_PATH}\;../../lib/log\;../../lib/scopeexports\;../../lib/scopehal\;../../lib/scopeprotocols\;../../lib/xptools' && mingw-bundledlls ${CMAKE_BINARY_DIR}/dist/ngscopeclient_windows_x64/ngscopeclient.exe --copy\")