From dce99f6b21ae616c25c0b6bea1266cdcb22a5a61 Mon Sep 17 00:00:00 2001
From: Diego Iastrubni <diegoiast@gmail.com>
Date: Thu, 19 Sep 2024 21:06:00 +0300
Subject: [PATCH] another test?

---
 .github/workflows/build.yml | 39 +++++++++++++++++++++++-----
 qtedit4.wixobj              | 51 -------------------------------------
 qtedit4.wxs                 | 42 ++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 57 deletions(-)
 delete mode 100644 qtedit4.wixobj
 create mode 100644 qtedit4.wxs

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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="*" Name="qtedit4" Language="1033" Version="0.0.0.2" Manufacturer="qtedit4" UpgradeCode="b0c9c8e2-833f-487d-81a5-bc26e028d495">
-        <Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" />
-
-        <MediaTemplate />
-
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="qtedit4" />
-            </Directory>
-        </Directory>
-
-        <Feature Id="ProductFeature" Title="qtedit4" Level="1">
-            <ComponentGroupRef Id="ProductComponents" />
-        </Feature>
-
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component Id="qtedit4.exe" Guid="1617fb4c-67cb-4474-b41e-74150a993340">
-                <File Source="dist\windows-msvc\usr\bin\qtedit4.exe" KeyPath="yes" />
-                <File Source="dist\windows-msvc\usr\bin\*.dll" />
-                <File Source="dist\windows-msvc\usr\bin\generic\*.dll" />
-                <File Source="dist\windows-msvc\usr\bin\iconengines\*.dll" />
-                <File Source="dist\windows-msvc\usr\bin\imageformats\*.dll" />
-                <File Source="dist\windows-msvc\usr\bin\networkinformation\*.dll" />
-                <File Source="dist\windows-msvc\usr\bin\platforms\*.dll" />
-                <File Source="dist\windows-msvc\usr\bin\styles\*.dll" />
-                <File Source="dist\windows-msvc\usr\bin\tls\*.dll" />
-            </Component>
-            <Component Id="Icons" Guid="0016482e-5624-481c-9bfd-9bd582e3803c">
-                <File Source="dist\windows-msvc\usr\share\icons\breeze\index.theme" />
-                <File Source="dist\windows-msvc\usr\share\icons\breeze\actions\16\*.svg" />
-                <File Source="dist\windows-msvc\usr\share\icons\breeze\actions\22\*.svg" />
-                <File Source="dist\windows-msvc\usr\share\icons\breeze\actions\32\*.svg" />
-                <File Source="dist\windows-msvc\usr\share\icons\breeze\devices\16\*.svg" />
-                <File Source="dist\windows-msvc\usr\share\icons\breeze\devices\22\*.svg" />
-                <File Source="dist\windows-msvc\usr\qtedit4.ico" />
-            </Component>
-        </ComponentGroup>
-
-        <Icon Id="qtedit4Icon" SourceFile="dist\windows-msvc\usr\qtedit4.ico" />
-
-        <Shortcut Id="desktopShortcut"
-                  Directory="DesktopFolder"
-                  Name="qtedit4"
-                  WorkingDirectory="INSTALLFOLDER"
-                  Icon="qtedit4Icon"
-                  IconIndex="0"
-                  Target="[INSTALLFOLDER]qtedit4.exe" />
-    </Product>
-</Wix>
diff --git a/qtedit4.wxs b/qtedit4.wxs
new file mode 100644
index 0000000..dfe8b57
--- /dev/null
+++ b/qtedit4.wxs
@@ -0,0 +1,42 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name="qtedit4" Language="1033" Version="0.0.0.2" Manufacturer="qtedit4" UpgradeCode="b0c9c8e2-833f-487d-81a5-bc26e028d495">
+    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+    <MediaTemplate EmbedCab="yes" />
+
+    <Feature Id="ProductFeature" Title="qtedit4">
+      <ComponentGroupRef Id="ProductComponents" />
+      <ComponentGroupRef Id="DLLFiles" />
+      <ComponentGroupRef Id="GenericDLLFiles" />
+      <ComponentGroupRef Id="IconFiles" />
+    </Feature>
+
+    <StandardDirectory Id="ProgramFiles6432Folder">
+      <Directory Id="INSTALLFOLDER" Name="qtedit4" />
+    </StandardDirectory>
+
+    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+      <Component>
+        <File Source="dist\windows-msvc\usr\bin\qtedit4.exe" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <!-- The following ComponentGroups will be generated by heat -->
+    <!-- ComponentGroup Id="DLLFiles" -->
+    <!-- ComponentGroup Id="GenericDLLFiles" -->
+    <!-- ComponentGroup Id="IconFiles" -->
+
+    <Icon Id="qtedit4Icon" SourceFile="dist\windows-msvc\usr\qtedit4.ico" />
+
+    <StandardDirectory Id="DesktopFolder">
+      <Component Id="DesktopShortcut" Guid="*">
+        <Shortcut Id="desktopShortcut"
+                  Name="qtedit4"
+                  WorkingDirectory="INSTALLFOLDER"
+                  Icon="qtedit4Icon"
+                  IconIndex="0"
+                  Target="[INSTALLFOLDER]qtedit4.exe" />
+        <RegistryValue Root="HKCU" Key="Software\qtedit4" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+      </Component>
+    </StandardDirectory>
+  </Package>
+</Wix>