Update templates to Nicer output with version in/uninstall information

2013-03-09 22:08:23 +01:00
parent 8b94c61b8e
commit 0fb94c8ba8
46 changed files with 577 additions and 91 deletions
--- a/sample/64bit/installer/license/CLIENT_DATA/delsub64.ins
+++ b/sample/64bit/installer/license/CLIENT_DATA/delsub64.ins
@@ -5,15 +5,30 @@


 Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe"
+Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$
 Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"

-Message "Uninstalling " + $ProductId$ + " ..."
+if FileExists($IniFile$)
+        Set $OLD_VERSION$ = GetValueFromInifile($IniFile$,"COMMON","VERSION","")
+        Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile$,"COMMON","CREATOR_TAG","")
+        Set $OLD_RELEASE$ = GetValueFromInifile($IniFile$,"COMMON","RELEASE","")
+endif
+Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..."

+if FileExists($IniFile$)
+        Set $UninstallProgramOld$ = GetValueFromInifile($IniFile$,"X86","UninstallProg","XXXXXXXX.exe")
+        if FileExists($UninstallProgramOld$)
+                comment "Uninstall program found, starting uninstall"
+                Winbatch_uninstall_old
+                sub_check_exitcode
+        endif
+endif
 if FileExists($UninstallProgram$)
 	comment "Uninstall program found, starting uninstall"
 	Winbatch_uninstall
 	sub_check_exitcode
 endif
+
 comment "Delete files"
 Files_uninstall /64Bit

@@ -23,6 +38,17 @@ Registry_uninstall /64Bit
 comment "Delete program shortcuts"
 LinkFolder_uninstall

+[Winbatch_uninstall_old]
+; Choose one of the following examples as basis for program uninstall
+;
+; === Nullsoft Scriptable Install System ================================================================
+; maby better Call as
+; Winbatch_uninstall /WaitforProcessending "Au_.exe" /Timeoutseconds 10
+; "$UninstallProgramOld$" /S
+;
+; === Inno Setup ========================================================================================
+; "$UninstallProgramOld$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
+
 [Winbatch_uninstall]
 ; Choose one of the following examples as basis for program uninstall
 ;
--- a/sample/64bit/installer/license/CLIENT_DATA/setup64.ins
+++ b/sample/64bit/installer/license/CLIENT_DATA/setup64.ins
@@ -7,6 +7,7 @@
 requiredWinstVersion >= "4.11.2.6"

 DefVar $UninstallProgram$
+DefVar $UninstallProgramOld$
 DefVar $IniFile$
 DefVar $IniCfgFile$
 DefVar $LogDir$
@@ -17,6 +18,9 @@ DefVar $ExitCode$
 DefVar $LicenseRequired$
 DefVar $LicenseKey$
 DefVar $LicensePool$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$

 Set $LogDir$ = "%SystemDrive%\tmp"

@@ -51,7 +55,7 @@ if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
 	; Stop process and set installation status to failed
 else
 	comment "Show product picture"
-	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 	
 	if FileExists("%ScriptPath%\delsub64.ins")
 		comment "Start uninstall sub section"
--- a/sample/64bit/installer/license/CLIENT_DATA/uninstall64.ins
+++ b/sample/64bit/installer/license/CLIENT_DATA/uninstall64.ins
@@ -7,6 +7,7 @@
 requiredWinstVersion >= "4.11.2.6"

 DefVar $UninstallProgram$
+DefVar $UninstallProgramOld$
 DefVar $IniFile$
 DefVar $IniCfgFile$
 DefVar $LogDir$
@@ -15,6 +16,9 @@ DefVar $ProductId$
 DefVar $InstallDir$
 DefVar $LicenseRequired$
 DefVar $LicensePool$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$

 Set $LogDir$ = "%SystemDrive%\tmp"

@@ -39,7 +43,7 @@ Set $LicensePool$     = "p_" + $ProductId$
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"

 comment "Show product picture"
-ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$

 Message "Uninstalling " + $ProductId$ + " ..."

--- a/sample/64bit/installer/nolicense/CLIENT_DATA/delsub64.ins
+++ b/sample/64bit/installer/nolicense/CLIENT_DATA/delsub64.ins
@@ -5,15 +5,30 @@


 Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe"
+Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$
 Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"

-Message "Uninstalling " + $ProductId$ + " ..."
+if FileExists($IniFile$)
+        Set $OLD_VERSION$ = GetValueFromInifile($IniFile$,"COMMON","VERSION","")
+        Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile$,"COMMON","CREATOR_TAG","")
+        Set $OLD_RELEASE$ = GetValueFromInifile($IniFile$,"COMMON","RELEASE","")
+endif
+Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..."

+if FileExists($IniFile$)
+        Set $UninstallProgramOld$ = GetValueFromInifile($IniFile$,"X86","UninstallProg","XXXXXXXX.exe")
+        if FileExists($UninstallProgramOld$)
+                comment "Uninstall program found, starting uninstall"
+                Winbatch_uninstall_old
+                sub_check_exitcode
+        endif
+endif
 if FileExists($UninstallProgram$)
 	comment "Uninstall program found, starting uninstall"
 	Winbatch_uninstall
 	sub_check_exitcode
 endif
+
 comment "Delete files"
 Files_uninstall /64Bit

@@ -23,6 +38,17 @@ Registry_uninstall /64Bit
 comment "Delete program shortcuts"
 LinkFolder_uninstall

+[Winbatch_uninstall_old]
+; Choose one of the following examples as basis for program uninstall
+;
+; === Nullsoft Scriptable Install System ================================================================
+; maby better Call as
+; Winbatch_uninstall /WaitforProcessending "Au_.exe" /Timeoutseconds 10
+; "$UninstallProgramOld$" /S
+;
+; === Inno Setup ========================================================================================
+; "$UninstallProgramOld$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
+
 [Winbatch_uninstall]
 ; Choose one of the following examples as basis for program uninstall
 ;
--- a/sample/64bit/installer/nolicense/CLIENT_DATA/setup64.ins
+++ b/sample/64bit/installer/nolicense/CLIENT_DATA/setup64.ins
@@ -7,6 +7,7 @@
 requiredWinstVersion >= "4.11.2.6"

 DefVar $UninstallProgram$
+DefVar $UninstallProgramOld$
 DefVar $IniFile$
 DefVar $IniCfgFile$
 DefVar $LogDir$
@@ -14,6 +15,9 @@ DefVar $ProductId$
 DefVar $MinimumSpace$
 DefVar $InstallDir$
 DefVar $ExitCode$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$

 Set $LogDir$ = "%SystemDrive%\tmp"

@@ -46,7 +50,7 @@ if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
 	; Stop process and set installation status to failed
 else
 	comment "Show product picture"
-	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 	
 	if FileExists("%ScriptPath%\delsub64.ins")
 		comment "Start uninstall sub section"
--- a/sample/64bit/installer/nolicense/CLIENT_DATA/uninstall64.ins
+++ b/sample/64bit/installer/nolicense/CLIENT_DATA/uninstall64.ins
@@ -7,12 +7,16 @@
 requiredWinstVersion >= "4.11.2.6"

 DefVar $UninstallProgram$
+DefVar $UninstallProgramOld$
 DefVar $IniFile$
 DefVar $IniCfgFile$
 DefVar $LogDir$
 DefVar $ExitCode$
 DefVar $ProductId$
 DefVar $InstallDir$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$

 Set $LogDir$ = "%SystemDrive%\tmp"

@@ -35,7 +39,7 @@ Set $InstallDir$      = "%ProgramFiles64Dir%\<path to the product>"
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"

 comment "Show product picture"
-ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$

 Message "Uninstalling " + $ProductId$ + " ..."

@@ -44,23 +48,3 @@ if FileExists("%ScriptPath%\delsub64.ins")
 	Sub "%ScriptPath%\delsub64.ins"
 endif

-if $LicenseRequired$ = "true"
-	comment "Licensing required, free license used"
-	Sub_free_license
-endif
-
-[Sub_free_license]
-comment "License management is enabled and will be used"
-
-comment "Trying to free license used for the product"
-DefVar $result$
-Set $result$ = FreeLicense($LicensePool$)
-; If there is an assignment of a license pool to the product, it is possible to use
-; Set $result$ = FreeLicense("", $ProductId$)
-;
-; If there is an assignment of a license pool to a windows software id, it is possible to use
-; DefVar $WindowsSoftwareId$
-; $WindowsSoftwareId$ = "..."
-; set $result$ = FreeLicense("", "", $WindowsSoftwareId$)
-
-
--- a/sample/64bit/msi/license/CLIENT_DATA/delsub64.ins
+++ b/sample/64bit/msi/license/CLIENT_DATA/delsub64.ins
@@ -6,7 +6,12 @@

 Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"

-Message "Uninstalling " + $ProductId$ + " ..."
+if FileExists($IniFile$)
+        Set $OLD_VERSION$ = GetValueFromInifile($IniFile$,"COMMON","VERSION","")
+        Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile$,"COMMON","CREATOR_TAG","")
+        Set $OLD_RELEASE$ = GetValueFromInifile($IniFile$,"COMMON","RELEASE","")
+endif
+Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..."

 if FileExists($IniFile$)
        Set $MsiIdOld$ = GetValueFromInifile($IniFile$,"X86_64","MsiId","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}")
@@ -31,6 +36,9 @@ Registry_uninstall /64Bit
 comment "Delete program shortcuts"
 LinkFolder_uninstall

+[Winbatch_uninstall_msi_old]
+msiexec /x $MsiIdOld$ /qb! REBOOT=ReallySuppress
+
 [Winbatch_uninstall_msi]
 msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress

--- a/sample/64bit/msi/license/CLIENT_DATA/setup64.ins
+++ b/sample/64bit/msi/license/CLIENT_DATA/setup64.ins
@@ -17,6 +17,9 @@ DefVar $ExitCode$
 DefVar $LicenseRequired$
 DefVar $LicenseKey$
 DefVar $LicensePool$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$

 Set $LogDir$ = "%SystemDrive%\tmp"

@@ -51,7 +54,7 @@ if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
 	; Stop process and set installation status to failed
 else
 	comment "Show product picture"
-	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 	
 	if FileExists("%ScriptPath%\delsub64.ins")
 		comment "Start uninstall sub section"
--- a/sample/64bit/msi/license/CLIENT_DATA/uninstall64.ins
+++ b/sample/64bit/msi/license/CLIENT_DATA/uninstall64.ins
@@ -15,6 +15,9 @@ DefVar $ProductId$
 DefVar $InstallDir$
 DefVar $LicenseRequired$
 DefVar $LicensePool$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$

 Set $LogDir$ = "%SystemDrive%\tmp"

@@ -39,7 +42,7 @@ Set $LicensePool$     = "p_" + $ProductId$
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"

 comment "Show product picture"
-ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$

 Message "Uninstalling " + $ProductId$ + " ..."

--- a/sample/64bit/msi/nolicense/CLIENT_DATA/delsub64.ins
+++ b/sample/64bit/msi/nolicense/CLIENT_DATA/delsub64.ins
@@ -6,7 +6,12 @@

 Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"

-Message "Uninstalling " + $ProductId$ + " ..."
+if FileExists($IniFile$)
+        Set $OLD_VERSION$ = GetValueFromInifile($IniFile$,"COMMON","VERSION","")
+        Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile$,"COMMON","CREATOR_TAG","")
+        Set $OLD_RELEASE$ = GetValueFromInifile($IniFile$,"COMMON","RELEASE","")
+endif
+Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..."

 if FileExists($IniFile$)
        Set $MsiIdOld$ = GetValueFromInifile($IniFile$,"X86_64","MsiId","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}")
@@ -31,6 +36,9 @@ Registry_uninstall /64Bit
 comment "Delete program shortcuts"
 LinkFolder_uninstall

+[Winbatch_uninstall_msi_old]
+msiexec /x $MsiIdOld$ /qb! REBOOT=ReallySuppress
+
 [Winbatch_uninstall_msi]
 msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress

--- a/sample/64bit/msi/nolicense/CLIENT_DATA/setup64.ins
+++ b/sample/64bit/msi/nolicense/CLIENT_DATA/setup64.ins
@@ -14,6 +14,9 @@ DefVar $ProductId$
 DefVar $MinimumSpace$
 DefVar $InstallDir$
 DefVar $ExitCode$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$

 Set $LogDir$ = "%SystemDrive%\tmp"

@@ -46,7 +49,7 @@ if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
 	; Stop process and set installation status to failed
 else
 	comment "Show product picture"
-	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 	
 	if FileExists("%ScriptPath%\delsub64.ins")
 		comment "Start uninstall sub section"
--- a/sample/64bit/msi/nolicense/CLIENT_DATA/uninstall64.ins
+++ b/sample/64bit/msi/nolicense/CLIENT_DATA/uninstall64.ins
@@ -13,6 +13,9 @@ DefVar $LogDir$
 DefVar $ExitCode$
 DefVar $ProductId$
 DefVar $InstallDir$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$

 Set $LogDir$ = "%SystemDrive%\tmp"

@@ -30,12 +33,14 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
 Set $InstallDir$      = "%ProgramFiles64Dir%\<path to the product>"
+Set $LicenseRequired$ = "false"
+Set $LicensePool$     = "p_" + $ProductId$
 ; ----------------------------------------------------------------

 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"

 comment "Show product picture"
-ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$

 Message "Uninstalling " + $ProductId$ + " ..."