- adding TARGET to build-windows-installer.sh

- adding TARGET to main.wxs
squidowl · Jul 21, 2024 · 11ddef6 · 11ddef6
1 parent 25de46b
commit 11ddef6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/scripts/build-windows-installer.sh b/scripts/build-windows-installer.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 WXS_FILE="wix/main.wxs"
+TARGET="x86_64-pc-windows-msvc"
 VERSION=$(cat VERSION)
 
 # install latest wix
@@ -9,4 +10,4 @@ dotnet tool install --global wix
 wix extension add WixToolset.UI.wixext
 
 # build the installer
-wix build -pdbtype none -arch x64 -d PackageVersion=$VERSION $WXS_FILE -o halloy-installer.msi -ext WixToolset.UI.wixext
+wix build -pdbtype none -arch x64 -d PackageVersion=$VERSION $WXS_FILE -d Target=$TARGET -o halloy-installer.msi -ext WixToolset.UI.wixext
diff --git a/wix/main.wxs b/wix/main.wxs
@@ -28,7 +28,7 @@
  <ComponentGroup Id="MainComponents" Directory="INSTALLFOLDER">
 
  <Component>
- <File Id="Application" DiskId="1" Source="target/release/halloy.exe" KeyPath="yes">
+ <File Id="Application" DiskId="1" Source="target/$(Target)/release/halloy.exe" KeyPath="yes">
  <Shortcut
  Id="ApplicationStartMenuShortcutInFile"
  Name="halloy.exe"
@@ -47,7 +47,7 @@
  <RegistryValue Root="HKCR" Key="Halloy" Name="EditFlags" Value="2" Type="integer" />
  <RegistryValue Root="HKCR" Key="Halloy" Name="FriendlyTypeName" Value="Web URL" Type="string" />
  <RegistryValue Root="HKCR" Key="Halloy" Name="URL Protocol" Value="" Type="string" />
- <RegistryValue Root="HKCR" Key="Halloy\DefaultIcon" Value="[INSTALLFOLDER]Halloy.exe,1" Type="string" />
+ <RegistryValue Root="HKCR" Key="Halloy\DefaultIcon" Value="[INSTALLFOLDER]halloy.exe,1" Type="string" />
  <RegistryValue Root="HKCR" Key="Halloy\shell" Type="string" Value="open" />
  <RegistryValue Root="HKCR" Key="Halloy\shell\open\command" Type="string" Value="&quot;[INSTALLFOLDER]Halloy.exe&quot; &quot;%1&quot;" />