make paths relative

itisrazza · Mar 22, 2021 · 7e575db · 7e575db
1 parent d585909
commit 7e575db
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/BuildScripts/BuildInstaller.ps1 b/BuildScripts/BuildInstaller.ps1
@@ -2,7 +2,9 @@
 
 $innoPath = "C:\Program Files (x86)\Inno Setup 6"
 $projectVersion = Get-ProjectVersion
-$runtimeInstallerPath = "Installer/windowsdesktop-runtime-5.0.4-win-x86.exe"
+$platform = "win-x86"       # installer is always x86, cbf making x64 or arm64 for now
+
+$runtimeInstallerPath = "Installer/windowsdesktop-runtime-5.0.4-$platform.exe"
 
 # if the .net runtime isn't downloaded, download it
 if (-not ( Test-Path -Path $runtimeInstallerPath )) {
@@ -15,7 +17,8 @@ if (-not ( Test-Path -Path $runtimeInstallerPath )) {
 & "$innoPath/iscc.exe" `
     /DMyAppVersion="$projectVersion" `
     /DRuntimeInstallerPath="$runtimeInstallerPath" `
+    /DAppPlatform="$platform" `
     Installer/Setup.iss
 
 # move the installer to releases
-mv -Force "Installer/Output/win-x86-installer.exe" "Releases/"
+mv -Force "Installer/Output/$platform-installer.exe" "Releases/"
diff --git a/Installer/Setup.iss b/Installer/Setup.iss
@@ -30,12 +30,12 @@ DisableProgramGroupPage=yes
 ; Uncomment the following line to run in non administrative install mode (install for current user only.)
 ;PrivilegesRequired=lowest
 PrivilegesRequiredOverridesAllowed=dialog
-OutputBaseFilename=win-x86-installer
-SetupIconFile=D:\Sources\SuperSize\Assets\Logo\Installer.ico
+OutputBaseFilename={#AppPlatform}-installer
+SetupIconFile=..\Assets\Logo\Installer.ico
 Compression=lzma
 SolidCompression=yes
-WizardImageFile=D:\Sources\SuperSize\Installer\WizModernImage.bmp
-WizardSmallImageFile=D:\Sources\SuperSize\Installer\WizModernSmallImage.bmp
+WizardImageFile=WizModernImage.bmp
+WizardSmallImageFile=WizModernSmallImage.bmp
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -55,7 +55,7 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: de
 
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Flags: nowait postinstall skipifsilent; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"
-Filename: "{app}\windowsdesktop-runtime-5.0.4-win-x86.exe"; Parameters: "/install /quiet /norestart"; Description: "Install .NET Runtime"; StatusMsg: "Installing .NET 5 Desktop Runtime"
+Filename: "{app}\windowsdesktop-runtime-5.0.4-{#AppPlatform}.exe"; Parameters: "/install /quiet /norestart"; Description: "Install .NET Runtime"; StatusMsg: "Installing .NET 5 Desktop Runtime"
 
 [InstallDelete]
-Type: files; Name: "{app}\windowsdesktop-runtime-5.0.4-win-x86.exe"
+Type: files; Name: "{app}\windowsdesktop-runtime-5.0.4-{#AppPlatform}.exe"