Upgrade to Inno Setup 6

Author: pchev

buildpkg.sh

@@ -3,7 +3,8 @@
 version=$(grep 'ccdcielver' src/u_global.pas |head -1| cut -d\' -f2)
 
 builddir=/tmp/ccdciel  # Be sure this is set to a non existent directory, it is removed after the run!
-innosetup="C:\Program Files (x86)\Inno Setup 5\ISCC.exe"  # Install under Wine from http://www.jrsoftware.org/isinfo.php
+export WINEPREFIX=~/.wineinno6
+innosetup="C:\Program Files (x86)\Inno Setup 6\ISCC.exe"  # Install under Wine from http://www.jrsoftware.org/isinfo.php
 wine_build="Z:\tmp\ccdciel" # Change to match builddir, Z: is defined in ~/.wine/dosdevices
 
 arch=$(arch)

system_integration/Windows/installer/ccdciel/ccdciel_32.iss

@@ -8,7 +8,7 @@ AppVerName=CCDciel V3
 AppPublisherURL=http://sourceforge.net/projects/ccdciel
 AppSupportURL=http://sourceforge.net/projects/ccdciel
 AppUpdatesURL=http://sourceforge.net/projects/ccdciel
-DefaultDirName={pf32}\CCDciel
+DefaultDirName={commonpf32}\CCDciel
 UsePreviousAppDir=false
 DefaultGroupName=CCDciel
 AllowNoIcons=true
@@ -21,6 +21,7 @@ Uninstallable=true
 UninstallLogMode=append
 DirExistsWarning=no
 ShowLanguageDialog=yes
+WizardStyle=modern
 AppID={{6570df38-f18f-11e4-9532-fb2d36b55e00}
 
 [Tasks]
@@ -32,7 +33,7 @@ Source: Data\*; DestDir: {app}; Flags: ignoreversion recursesubdirs createallsub
 
 [Icons]
 Name: {group}\CCDciel; Filename: {app}\ccdciel.exe; WorkingDir: {app}
-Name: {userdesktop}\CCDciel; Filename: {app}\ccdciel.exe; WorkingDir: {app}; Tasks: desktopicon
+Name: {commondesktop}\CCDciel; Filename: {app}\ccdciel.exe; WorkingDir: {app}; Tasks: desktopicon
 
 [Code]
 {Uninstall previous version to avoid 32bit/64bit mismatch}

system_integration/Windows/installer/ccdciel/ccdciel_64.iss

@@ -9,7 +9,7 @@ AppVerName=CCDciel V3
 AppPublisherURL=http://sourceforge.net/projects/ccdciel
 AppSupportURL=http://sourceforge.net/projects/ccdciel
 AppUpdatesURL=http://sourceforge.net/projects/ccdciel
-DefaultDirName={pf}\CCDciel
+DefaultDirName={commonpf64}\CCDciel
 UsePreviousAppDir=false
 DefaultGroupName=CCDciel
 AllowNoIcons=true
@@ -22,6 +22,7 @@ Uninstallable=true
 UninstallLogMode=append
 DirExistsWarning=no
 ShowLanguageDialog=yes
+WizardStyle=modern
 AppID={{6570df38-f18f-11e4-9532-fb2d36b55e00}
 
 [Tasks]
@@ -33,7 +34,7 @@ Source: Data\*; DestDir: {app}; Flags: ignoreversion recursesubdirs createallsub
 
 [Icons]
 Name: {group}\CCDciel; Filename: {app}\ccdciel.exe; WorkingDir: {app}
-Name: {userdesktop}\CCDciel; Filename: {app}\ccdciel.exe; WorkingDir: {app}; Tasks: desktopicon
+Name: {commondesktop}\CCDciel; Filename: {app}\ccdciel.exe; WorkingDir: {app}; Tasks: desktopicon
 
 [Code]
 {Uninstall previous version to avoid 32bit/64bit mismatch}

system_integration/Windows/installer/ccdciel/ccdciel_dual.iss

@@ -8,7 +8,7 @@ AppPublisherURL=http://sourceforge.net/projects/ccdciel
 AppSupportURL=http://sourceforge.net/projects/ccdciel
 AppUpdatesURL=http://sourceforge.net/projects/ccdciel
 UsePreviousAppDir=true
-DefaultDirName={pf}\CCDciel
+DefaultDirName={commonpf}\CCDciel
 DefaultGroupName=CCDciel
 AllowNoIcons=true
 InfoBeforeFile=Presetup\readme.txt
@@ -20,6 +20,7 @@ Uninstallable=true
 UninstallLogMode=append
 DirExistsWarning=no
 ShowLanguageDialog=yes
+WizardStyle=modern
 AppID={{6570df38-f18f-11e4-9532-fb2d36b55e00}
 ArchitecturesInstallIn64BitMode=x64
 
@@ -36,7 +37,7 @@ Source: Data\*; DestDir: {app}; Flags: ignoreversion recursesubdirs createallsub
 
 [Icons]
 Name: {group}\CCDciel; Filename: {app}\ccdciel.exe; WorkingDir: {app}
-Name: {userdesktop}\CCDciel; Filename: {app}\ccdciel.exe; WorkingDir: {app}; Tasks: desktopicon
+Name: {commondesktop}\CCDciel; Filename: {app}\ccdciel.exe; WorkingDir: {app}; Tasks: desktopicon
 
 [Code]
 {Uninstall 32bit version on 64bit system}