Skip to content

Commit

Permalink
Use WIX 5
Browse files Browse the repository at this point in the history 
IB-8024

Signed-off-by: Raul Metsma <[email protected]>
  • Loading branch information
@metsma
metsma committed May 6, 2024
1 parent 9faea16 commit 982e0b6
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 56 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
version: 6.6.2
version: 6.6.3
arch: win64_msvc2019_64
- name: Setup dev env
uses: ilammy/msvc-dev-cmd@v1
with:
arch: x64
- name: Install WiX
run: |
dotnet tool install --global wix
wix extension -g add WixToolset.UI.wixext/4.0.4
dotnet tool install -g wix --version 5.0.0
wix extension -g add WixToolset.UI.wixext/5.0.0
- name: Build
run: |
cmake -S . -B build `
Expand Down
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
cmake_minimum_required(VERSION 3.16)
if(NOT EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/VersionInfo.cmake)
message(FATAL_ERROR "cmake submodule directory empty, did you 'git clone --recursive'?")
endif()
if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW)
endif()
Expand Down
2 changes: 1 addition & 1 deletion cmake
Submodule cmake updated 3 files
+0 −42 modules/WelcomeDlg2.wxs
+2 −5 modules/WixUI_Minimal.wxs
+0 −64 modules/WixUI_Minimal2.wxs
81 changes: 29 additions & 52 deletions idupdater.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
<Package Name="Open-EID Updater" UpgradeCode="d3aa8bd7-e1e6-46d0-97a6-c9b87d2b830b"
Language="1033" Version="$(var.MSI_VERSION)" Codepage="1251" Manufacturer="RIA" InstallerVersion="500">
<SummaryInformation Keywords="Installer" />
<MediaTemplate EmbedCab="yes" CompressionLevel="high" />
<Icon Id="appicon.ico" SourceFile="$(var.appicon)" />
<Property Id="ARPPRODUCTICON" Value="appicon.ico" />
Expand All @@ -31,71 +30,49 @@
<ui:WixUI Id="WixUI_Minimal2" />

<StandardDirectory Id="ProgramFiles6432Folder">
<Directory Id="APPLICATIONFOLDER" Name="Open-EID" FileSource="$(var.qt_path)">
<Component Id="Application" Guid="ce49ec96-dc54-4b51-adae-8d5dd82b15d1">
<Directory Id="INSTALLFOLDER" Name="Open-EID" FileSource="$(var.qt_path)">
<Component Id="Application">
<File Id="id_updater.exe" Source="$(var.updater_path)" KeyPath="yes" />
<RegistryValue Root="HKMU" Key="Software\[Manufacturer]\Open-EID"
Name="Installed" Value="[APPLICATIONFOLDER]" Type="string" />
Name="Installed" Value="[INSTALLFOLDER]" Type="string" />
<?if $(sys.BUILDARCH) = x64 ?>
<RegistryValue Root="HKMU" Key="Software\Wow6432Node\[Manufacturer]\Open-EID"
Name="Installed" Value="[APPLICATIONFOLDER]" Type="string" />
Name="Installed" Value="[INSTALLFOLDER]" Type="string" />
<?endif?>
<?ifdef var.qt_path ?>
<File Source="$(var.VCPATH)\msvcp140$(var.qt_suffix).dll" />
<File Source="$(var.VCPATH)\vcruntime140$(var.qt_suffix).dll" />
<File Source="$(var.VCPATH)\msvcp140_1$(var.qt_suffix).dll" />
<File Source="$(var.VCPATH)\msvcp140_2$(var.qt_suffix).dll" />
</Component>
<File Source="$(var.VCPATH)\msvcp140$(var.qt_suffix).dll" />
<File Source="$(var.VCPATH)\vcruntime140$(var.qt_suffix).dll" />
<File Source="$(var.VCPATH)\msvcp140_1$(var.qt_suffix).dll" />
<File Source="$(var.VCPATH)\msvcp140_2$(var.qt_suffix).dll" />
<?if $(sys.BUILDARCH) != x86 ?>
<File Source="$(var.VCPATH)\vcruntime140_1$(var.qt_suffix).dll" />
<?endif?>
<File Source="$(var.libs_path)\libcrypto-3$(var.OpenSSLSuffix).dll" />
<File Source="$(var.libs_path)\libssl-3$(var.OpenSSLSuffix).dll" />
<File Name="Qt6Core$(var.qt_suffix).dll" />
<File Name="Qt6Gui$(var.qt_suffix).dll" />
<File Name="Qt6Network$(var.qt_suffix).dll" />
<File Name="Qt6PrintSupport$(var.qt_suffix).dll" />
<File Name="Qt6Svg$(var.qt_suffix).dll" />
<File Name="Qt6Widgets$(var.qt_suffix).dll" />
<File Name="D3DCompiler_47.dll" />
<File Name="opengl32sw.dll" />
<File Name="Qt6SvgWidgets$(var.qt_suffix).dll" />
<File Source="$(var.VCPATH)\vcruntime140_1$(var.qt_suffix).dll" />
<?endif?>
</Component>
<?ifdef var.qt_path ?>
<Directory Id="platforms" Name="platforms" FileSource="$(var.qt_path)\..\plugins\platforms">
<Component Id="qwindows.dll">
<File Name="qwindows$(var.qt_suffix).dll" />
</Component>
<File Source="$(var.libs_path)\libcrypto-3$(var.OpenSSLSuffix).dll" />
<File Source="$(var.libs_path)\libssl-3$(var.OpenSSLSuffix).dll" />
<File Name="Qt6Core$(var.qt_suffix).dll" />
<File Name="Qt6Gui$(var.qt_suffix).dll" />
<File Name="Qt6Network$(var.qt_suffix).dll" />
<File Name="Qt6PrintSupport$(var.qt_suffix).dll" />
<File Name="Qt6Svg$(var.qt_suffix).dll" />
<File Name="Qt6Widgets$(var.qt_suffix).dll" />
<File Name="D3DCompiler_47.dll" />
<File Name="opengl32sw.dll" />
<File Name="Qt6SvgWidgets$(var.qt_suffix).dll" />
<Directory Id="platforms" Name="platforms">
<File Source="$(var.qt_path)\..\plugins\platforms\qwindows$(var.qt_suffix).dll" />
</Directory>
<Directory Id="tls" Name="tls" FileSource="$(var.qt_path)\..\plugins\tls">
<Component Id="qopensslbackend.dll">
<File Name="qopensslbackend$(var.qt_suffix).dll" />
</Component>
<Directory Id="tls" Name="tls">
<File Source="$(var.qt_path)\..\plugins\tls\qopensslbackend$(var.qt_suffix).dll" />
</Directory>
<Directory Id="styles" Name="styles" FileSource="$(var.qt_path)\..\plugins\styles">
<Component Id="qwindowsvistastyle.dll">
<File Name="qwindowsvistastyle$(var.qt_suffix).dll" />
</Component>
<Directory Id="styles" Name="styles">
<File Source="$(var.qt_path)\..\plugins\styles\qwindowsvistastyle$(var.qt_suffix).dll" />
</Directory>
<Directory Id="imageformats" Name="imageformats" FileSource="$(var.qt_path)\..\plugins\imageformats">
<Component Id="imageformats.dll" Guid="4ae32624-e869-4e4c-8a1c-624c31133ce3">
<File Name="qsvg$(var.qt_suffix).dll" />
</Component>
<Directory Id="imageformats" Name="imageformats">
<File Source="$(var.qt_path)\..\plugins\imageformats\qsvg$(var.qt_suffix).dll" />
</Directory>
<?endif?>
</Directory>
</StandardDirectory>

<Feature Id="Install" Title="Open-EID" ConfigurableDirectory="APPLICATIONFOLDER">
<ComponentRef Id="Application" />
<?ifdef var.qt_path ?>
<ComponentRef Id="qwindows.dll" />
<ComponentRef Id="qwindowsvistastyle.dll" />
<ComponentRef Id="qopensslbackend.dll" />
<ComponentRef Id="imageformats.dll" />
<?endif?>
</Feature>

<CustomAction Id="ScheduleUpdater" Impersonate="no" Execute="deferred"
ExeCommand="-weekly" Return="ignore" FileRef="id_updater.exe" />
<CustomAction Id="UnScheduleUpdater" Impersonate="no" Execute="deferred"
Expand Down

0 comments on commit 982e0b6

Please sign in to comment.