bump to upstream

This commit is contained in:
Mario Fetka
2012-02-28 04:33:18 +01:00
parent 95c5349598
commit 966470cd85
9 changed files with 43 additions and 42 deletions

View File

@@ -4,19 +4,19 @@
; credits: http://www.opsi.org/credits/
Set $MsiId32$ = '{E630D30A-79EE-407A-8F51-9D57D1F45230}'
Set $UninstallProgram32$ = $InstallDir32$ + "\uninstgs.exe"
Set $MsiId64$ = '{2E415339-7210-4A3B-84EA-E50FE7565F0D}'
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 not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId32$ + "] DisplayName") = "")
comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
Winbatch_uninstall_msi_32
if FileExists($UninstallProgram32$)
comment "Uninstall program found, starting uninstall"
Winbatch_uninstall_32
sub_check_exitcode
endif
comment "Delete files"
Files_uninstall_32 /32Bit
comment "Cleanup registry"
@@ -26,12 +26,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 not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId64$ + "] DisplayName") = "")
comment "MSI id " + $MsiId64$ + " found in registry, starting msiexec to uninstall"
Winbatch_uninstall_msi_64
if FileExists($UninstallProgram64$)
comment "Uninstall program found, starting uninstall"
Winbatch_uninstall_64
sub_check_exitcode
endif
comment "Delete files"
Files_uninstall_64 /64Bit
comment "Cleanup registry"
@@ -41,16 +41,16 @@ endif
comment "Delete program shortcuts"
LinkFolder_uninstall
[Winbatch_uninstall_msi_32]
msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
[Winbatch_uninstall_32]
"$UninstallProgram32$" /S
[Files_uninstall_32]
; Example for recursively deleting the installation directory (don't forget the trailing backslash):
;
; delete -sf "$InstallDir32$\"
[Winbatch_uninstall_msi_64]
msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress
[Winbatch_uninstall_64]
"$UninstallProgram64$" /S
[Files_uninstall_64]
; Example for recursively deleting the installation directory (don't forget the trailing backslash):

View File

@@ -6,8 +6,8 @@
[Actions]
requiredWinstVersion >= "4.10.8.6"
DefVar $MsiId32$
DefVar $MsiId64$
DefVar $UninstallProgram32$
DefVar $UninstallProgram64$
DefVar $LogDir$
DefVar $ProductId$
DefVar $MinimumSpace$
@@ -40,10 +40,10 @@ Set $LogDir$ = "%SystemDrive%\tmp"
; therefore please: only lower letters, no umlauts,
; no white space use '-' as a seperator
Set $ProductId$ = "ghostscript"
Set $MinimumSpace$ = "20 MB"
Set $MinimumSpace$ = "30 MB"
; the path were we find the product after the installation
Set $InstallDir32$ = "%ProgramFiles32Dir%\gs"
Set $InstallDir64$ = "%ProgramFiles64Dir%\gs"
Set $InstallDir32$ = "%ProgramFiles32Dir%\gs\gs$VERSION$"
Set $InstallDir64$ = "%ProgramFiles64Dir%\gs\gs$VERSION$"
; ----------------------------------------------------------------
if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
@@ -54,9 +54,9 @@ else
comment "Show product picture"
ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
if FileExists("%ScriptPath%\delsub.ins")
if FileExists("%ScriptPath%\delsub3264.ins")
comment "Start uninstall sub section"
Sub "%ScriptPath%\delsub.ins"
Sub "%ScriptPath%\delsub3264.ins"
endif
comment "installing"
@@ -90,7 +90,7 @@ else
endif
[Winbatch_install_32]
msiexec /i "$Install32Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress
"$Install32Exe$" /S
[Files_install_32]
; Example of recursively copying some files into the installation directory:
@@ -98,7 +98,7 @@ msiexec /i "$Install32Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLU
; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
[Winbatch_install_64]
msiexec /i "$Install64Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress
"$Install64Exe$" /S
[Files_install_64]
; Example of recursively copying some files into the installation directory:

View File

@@ -6,8 +6,8 @@
[Actions]
requiredWinstVersion >= "4.10.8.6"
DefVar $MsiId32$
DefVar $MsiId64$
DefVar $UninstallProgram32$
DefVar $UninstallProgram64$
DefVar $LogDir$
DefVar $ExitCode$
DefVar $ProductId$
@@ -36,8 +36,10 @@ Set $LogDir$ = "%SystemDrive%\tmp"
; - Please edit the following values -
; ----------------------------------------------------------------
Set $ProductId$ = "ghostscript"
Set $InstallDir32$ = "%ProgramFiles32Dir%\gs"
Set $InstallDir64$ = "%ProgramFiles64Dir%\gs"
Set $InstallDir32$ = "%ProgramFiles32Dir%\gs\gs$VERSION$"
Set $InstallDir64$ = "%ProgramFiles64Dir%\gs\gs$VERSION$"
Set $LicenseRequired$ = "false"
Set $LicensePool$ = "p_" + $ProductId$
; ----------------------------------------------------------------
@@ -46,8 +48,7 @@ ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
Message "Uninstalling " + $ProductId$ + " ..."
if FileExists("%ScriptPath%\delsub.ins")
if FileExists("%ScriptPath%\delsub3264.ins")
comment "Start uninstall sub section"
Sub "%ScriptPath%\delsub.ins"
Sub "%ScriptPath%\delsub3264.ins"
endif