Merge branch 'winfixes' into devel

Microsemi · Jul 17, 2023 · bec25ec · bec25ec
2 parents b6a1c90 + db8c644
commit bec25ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/dist/mkinstaller b/dist/mkinstaller
@@ -24,12 +24,12 @@
 ##
 ########################################################################
 
-# This script creates a windows installer package. It requires innosetup to
+# This script creates a windows installer package. It requires innosetup 6 to
 # be installed
 
 set -e
 
-export PATH="$PATH:/c/Program Files (x86)/Inno Setup 5"
+export PATH="$PATH:/c/Program Files (x86)/Inno Setup 6"
 
 function build()
 {

diff --git a/dist/switchtec.iss b/dist/switchtec.iss
@@ -1,11 +1,11 @@
 #define AppVersionStr GetFileProductVersion("x86_64-w64-mingw32/switchtec.exe")
-#define AppVersion GetFileVersion("x86_64-w64-mingw32/switchtec.exe")
+#define AppVersion GetVersionNumbersString("x86_64-w64-mingw32/switchtec.exe")
 
 [Setup]
 AppName=Switchtec Management CLI
 AppVersion={#AppVersionStr}
 VersionInfoVersion={#AppVersion}
-DefaultDirName={pf}\Switchtec
+DefaultDirName={commonpf}\Switchtec
 Compression=lzma2
 SolidCompression=yes
 ArchitecturesInstallIn64BitMode=x64
@@ -94,4 +94,4 @@ procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
 begin
     if CurUninstallStep = usPostUninstall
     then EnvRemovePath(ExpandConstant('{app}'));
-end;
+end;