From b0b9e3260bc92630dafb7f9374b80a92064757bd Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Tue, 28 Feb 2012 07:30:34 +0100 Subject: [PATCH] Add support for old version --- CLIENT_DATA/delsub3264.ins | 22 ++++++++++++++++++++++ CLIENT_DATA/setup3264.ins | 6 ++++++ CLIENT_DATA/uninstall3264.ins | 6 ++++++ builder-product.cfg | 2 ++ 4 files changed, 36 insertions(+) diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins index 491c005..761d785 100644 --- a/CLIENT_DATA/delsub3264.ins +++ b/CLIENT_DATA/delsub3264.ins @@ -4,6 +4,10 @@ ; credits: http://www.opsi.org/credits/ +Set $OldUninstallProgram32$ = $OldInstallDir32$ + "\uninstgs.exe" + +Set $OldUninstallProgram64$ = $OldInstallDir64$ + "\uninstgs.exe" + Set $UninstallProgram32$ = $InstallDir32$ + "\uninstgs.exe" Set $UninstallProgram64$ = $InstallDir64$ + "\uninstgs.exe" @@ -11,6 +15,12 @@ Set $UninstallProgram64$ = $InstallDir64$ + "\uninstgs.exe" if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only") Message "Uninstalling " + $ProductId$ + " 32 Bit..." + if FileExists($OldUninstallProgram32$) + comment "Uninstall program found, starting uninstall" + Winbatch_uninstall_32_old + sub_check_exitcode + endif + if FileExists($UninstallProgram32$) comment "Uninstall program found, starting uninstall" Winbatch_uninstall_32 @@ -26,6 +36,12 @@ endif if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only")) Message "Uninstalling " + $ProductId$ + " 64 Bit..." + if FileExists($OldUninstallProgram64$) + comment "Uninstall program found, starting uninstall" + Winbatch_uninstall_64_old + sub_check_exitcode + endif + if FileExists($UninstallProgram64$) comment "Uninstall program found, starting uninstall" Winbatch_uninstall_64 @@ -41,6 +57,9 @@ endif comment "Delete program shortcuts" LinkFolder_uninstall +[Winbatch_uninstall_32_old] +"$OldUninstallProgram32$" /S + [Winbatch_uninstall_32] "$UninstallProgram32$" /S @@ -49,6 +68,9 @@ LinkFolder_uninstall ; ; delete -sf "$InstallDir32$\" +[Winbatch_uninstall_64_old] +"$OldUninstallProgram64$" /S + [Winbatch_uninstall_64] "$UninstallProgram64$" /S diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index 53d30d9..3bf3680 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -6,11 +6,15 @@ [Actions] requiredWinstVersion >= "4.10.8.6" +DefVar $OldUninstallProgram32$ +DefVar $OldUninstallProgram64$ DefVar $UninstallProgram32$ DefVar $UninstallProgram64$ DefVar $LogDir$ DefVar $ProductId$ DefVar $MinimumSpace$ +DefVar $OldInstallDir32$ +DefVar $OldInstallDir64$ DefVar $InstallDir32$ DefVar $InstallDir64$ DefVar $ExitCode$ @@ -44,6 +48,8 @@ Set $MinimumSpace$ = "30 MB" ; the path were we find the product after the installation Set $InstallDir32$ = "%ProgramFiles32Dir%\gs\gs" + $VERSION$ Set $InstallDir64$ = "%ProgramFiles64Dir%\gs\gs" + $VERSION$ +Set $OldInstallDir32$ = "%ProgramFiles32Dir%\gs\gs" + $OLDVERSION$ +Set $OldInstallDir64$ = "%ProgramFiles64Dir%\gs\gs" + $OLDVERSION$ ; ---------------------------------------------------------------- if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$)) diff --git a/CLIENT_DATA/uninstall3264.ins b/CLIENT_DATA/uninstall3264.ins index db17db9..c22ec82 100644 --- a/CLIENT_DATA/uninstall3264.ins +++ b/CLIENT_DATA/uninstall3264.ins @@ -6,11 +6,15 @@ [Actions] requiredWinstVersion >= "4.10.8.6" +DefVar $OldUninstallProgram32$ +DefVar $OldUninstallProgram64$ DefVar $UninstallProgram32$ DefVar $UninstallProgram64$ DefVar $LogDir$ DefVar $ExitCode$ DefVar $ProductId$ +DefVar $OldInstallDir32$ +DefVar $OldInstallDir64$ DefVar $InstallDir32$ DefVar $InstallDir64$ DefVar $INST_SystemType$ @@ -38,6 +42,8 @@ Set $LogDir$ = "%SystemDrive%\tmp" Set $ProductId$ = "ghostscript" Set $InstallDir32$ = "%ProgramFiles32Dir%\gs\gs" + $VERSION$ Set $InstallDir64$ = "%ProgramFiles64Dir%\gs\gs" + $VERSION$ +Set $OldInstallDir32$ = "%ProgramFiles32Dir%\gs\gs" + $OLDVERSION$ +Set $OldInstallDir64$ = "%ProgramFiles64Dir%\gs\gs" + $OLDVERSION$ ; ---------------------------------------------------------------- diff --git a/builder-product.cfg b/builder-product.cfg index e6c1ff0..69eece0 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -28,3 +28,5 @@ DL_WINST_NAME[2]=Install64Exe # File array index for the image showing while installing the program ICON_DL_INDEX=0 +WINST_NAME[1]="OLDVERSION" +WINST_VALUE[1]="9.04" \ No newline at end of file