Skip to content

Commit

Permalink
another test?
Browse files Browse the repository at this point in the history
  • Loading branch information
diegoiast committed Sep 19, 2024
1 parent b9c46a2 commit dce99f6
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 57 deletions.
39 changes: 33 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
- 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
Expand Down
51 changes: 0 additions & 51 deletions qtedit4.wixobj

This file was deleted.

42 changes: 42 additions & 0 deletions qtedit4.wxs
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit dce99f6

Please sign in to comment.