diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 27added..ad4dcfa 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -134,14 +134,41 @@ jobs:
with:
path: "setup_script.iss"
options: /O+
- - name: Add msbuild to PATH
- if: matrix.config.os == 'windows-2022' && matrix.config.cc == 'cl'
- uses: microsoft/setup-msbuild@v1.1
- - name: Build MSI (Windows)
+
+
+ - name: Install WiX Toolset
+ run: |
+ choco install wixtoolset -y
+ echo "C:\Program Files (x86)\WiX Toolset v3.11\bin" >> $GITHUB_PATH
+
+ - name: Create MSI (Windows)
if: matrix.config.os == 'windows-2022' && matrix.config.cc == 'cl'
run: |
- dotnet tool install --global wix
- wix build qtedit4.wxs -o ./dist/qtedit4.msi
+ # Generate file lists using heat
+ wix heat dir dist/${{ matrix.config.build_dir }}/usr/bin -cg DLLFiles -gg -srd -sfrag -var var.DLLFiles -out DLLFiles.wxs
+ wix heat dir dist/${{ matrix.config.build_dir }}/usr/bin/generic -cg GenericDLLFiles -gg -srd -sfrag -var var.GenericDLLFiles -out GenericDLLFiles.wxs
+ wix heat dir dist/${{ matrix.config.build_dir }}/usr/share/icons/breeze -cg IconFiles -gg -srd -sfrag -var var.IconFiles -out IconFiles.wxs
+
+ # Build the MSI
+ wix build qtedit4.wxs DLLFiles.wxs GenericDLLFiles.wxs IconFiles.wxs -out dist/qtedit4.msi
+ shell: pwsh
+
+ - name: Upload MSI (Windows)
+ if: matrix.config.os == 'windows-2022' && matrix.config.cc == 'cl'
+ uses: actions/upload-artifact@v4
+ with:
+ name: qtedit4-qt671-x86_64.msi
+ path: dist/qtedit4.msi
+ - name: Upload Release Asset (Windows MSI)
+ uses: actions/upload-release-asset@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ with:
+ upload_url: ${{ steps.create_release.outputs.upload_url }}
+ asset_path: ./artifacts/qtedit4-qt671-x86_64.msi/qtedit4.msi
+ asset_name: qtedit4-qt671-x86_64.msi
+ asset_content_type: application/octet-stream
+
- name: Upload setup
if: matrix.config.os == 'windows-2022' && matrix.config.cc == 'cl'
uses: actions/upload-artifact@v4
diff --git a/qtedit4.wixobj b/qtedit4.wixobj
deleted file mode 100644
index c2067e8..0000000
--- a/qtedit4.wixobj
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/qtedit4.wxs b/qtedit4.wxs
new file mode 100644
index 0000000..dfe8b57
--- /dev/null
+++ b/qtedit4.wxs
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+