- fix build-windows-installer.sh script

- fix paths in main.wxs
squidowl · Jul 21, 2024 · 25de46b · 25de46b
1 parent b093631
commit 25de46b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/scripts/build-windows-installer.sh b/scripts/build-windows-installer.sh
@@ -6,7 +6,7 @@ VERSION=$(cat VERSION)
 dotnet tool install --global wix
 
 # add required wix extension
-wix extension add WixToolset.Ui.wixex
+wix extension add WixToolset.UI.wixext
 
 # build the installer
-wix build -pdbtype none -arch x64 -d PackageVersion=$VERSION main.wxs -o halloy-installer.msi -ext ./.wix/extensions/WixToolset.Ui.wixext/5.0.1/wixext5/WixToolset.UI.wixext.dll
+wix build -pdbtype none -arch x64 -d PackageVersion=$VERSION $WXS_FILE -o halloy-installer.msi -ext WixToolset.UI.wixext
diff --git a/wix/main.wxs b/wix/main.wxs
@@ -76,9 +76,9 @@
  <Custom Action="LaunchApp" Before="InstallFinalize"/>
  </InstallExecuteSequence>
 
- <WixVariable Id="WixUILicenseRtf" Value="license.rtf"/>
- <WixVariable Id="WixUIDialogBmp" Value="dialog.png"/>
- <WixVariable Id="WixUIBannerBmp" Value="banner.png"/>
+ <WixVariable Id="WixUILicenseRtf" Value="wix/license.rtf"/>
+ <WixVariable Id="WixUIDialogBmp" Value="wix/dialog.png"/>
+ <WixVariable Id="WixUIBannerBmp" Value="wix/banner.png"/>
 
  <ui:WixUI Id="WixUI_InstallDir" InstallDirectory="INSTALLFOLDER" />
  </Package>