From e2c6f2292391a839b7c7ac2147b9a89b093df866 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sun, 10 Mar 2013 16:34:44 +0100 Subject: [PATCH] correct to new build system --- CLIENT_DATA/delsub32.ins | 25 +++++++++------- CLIENT_DATA/login.ins | 24 ++++++++++++++++ CLIENT_DATA/setup32.ins | 57 ++++++++++++++++++++++++------------- CLIENT_DATA/uninstall32.ins | 16 ++++++----- builder-product.cfg | 7 +++-- 5 files changed, 90 insertions(+), 39 deletions(-) create mode 100644 CLIENT_DATA/login.ins diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins index 7c9024c..6f1e92a 100644 --- a/CLIENT_DATA/delsub32.ins +++ b/CLIENT_DATA/delsub32.ins @@ -1,20 +1,25 @@ ; Copyright (c) uib gmbh (www.uib.de) ; This sourcecode is owned by uib gmbh ; and published under the Terms of the General Public License. -; credits: http://www.opsi.org/credits/ +; credits: http://www.opsi.org/en/credits/ 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","MsiId","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}") - if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld$ + "] DisplayName") = "") - comment "Old MSI id " + $MsiIdOld$ + " found in registry, starting msiexec to uninstall old version" - Winbatch_uninstall_msi_old - sub_check_exitcode - endif + Set $MsiIdOld$ = GetValueFromInifile($IniFile$,"X86","MsiId","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}") + if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld$ + "] DisplayName") = "") + comment "Old MSI id " + $MsiIdOld$ + " found in registry, starting msiexec to uninstall old version" + Winbatch_uninstall_msi_old + sub_check_exitcode + endif endif if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId$ + "] DisplayName") = "") comment "MSI id " + $MsiId$ + " found in registry, starting msiexec to uninstall" @@ -38,9 +43,9 @@ msiexec /x $MsiIdOld$ /qb! REBOOT=ReallySuppress msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress [Files_uninstall] -; Example for recursively deleting the installation directory (don't forget the trailing backslash): +; Example for recursively deleting the installation directory: ; -; delete -sf "$InstallDir$\" +del -sf "$InstallDir$\" [Registry_uninstall] ; Example of deleting a registry key: diff --git a/CLIENT_DATA/login.ins b/CLIENT_DATA/login.ins new file mode 100644 index 0000000..7b85744 --- /dev/null +++ b/CLIENT_DATA/login.ins @@ -0,0 +1,24 @@ +; Copyright (c) uib gmbh (www.uib.de) +; This sourcecode is owned by uib gmbh +; and published under the Terms of the General Public License. +; credits: http://www.opsi.org/en/credits/ + +[Actions] +Message "Profile Patch for VLC ...." + +comment "Did we run this script before ? - and set version stamp in profile" +if getValue("installationstate", getProductMap) = "installed" + comment "Product is installed" + if not (scriptWasExecutedBefore) + comment "loginscript was not run yet " + Files_profile_copy + Registry_currentuser_set + endif +endif + +[Files_profile_copy] +copy "%Scriptpath%\profiles\*.*" "%CurrentAppdataDir%\ACME" + +[Registry_currentuser_set] +openkey [HKCU\Software\ACME] +set "show_greeting_window" = "no" diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index 923d2df..b63de52 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -1,14 +1,12 @@ ; Copyright (c) uib gmbh (www.uib.de) ; This sourcecode is owned by uib ; and published under the Terms of the General Public License. -; credits: http://www.opsi.org/credits/ +; credits: http://www.opsi.org/en/credits/ [Actions] -requiredWinstVersion >= "4.10.8.6" +requiredWinstVersion >= "4.11.2.6" -; DefVar $MsiId$ DefVar $MsiIdOld$ -DefVar $UninstallProgram$ DefVar $IniFile$ DefVar $IniCfgFile$ DefVar $LogDir$ @@ -16,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" @@ -35,29 +36,30 @@ Set $LogDir$ = "%SystemDrive%\tmp" ;$ProductId$ should be the name of the product in opsi ; therefore please: only lower letters, no umlauts, ; no white space use '-' as a seperator -Set $ProductId$ = "adobe.acrobatreader9" -Set $MinimumSpace$ = "150 MB" +Set $MinimumSpace$ = "335 MB" ; the path were we find the product after the installation Set $InstallDir$ = "%ProgramFiles32Dir%\Adobe\Reader 9.0\Reader\" -Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" ; ---------------------------------------------------------------- +Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" + if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$)) LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$ - isFatalError + isFatalError "No Space" ; 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%\delsub32.ins") comment "Start uninstall sub section" Sub "%ScriptPath%\delsub32.ins" endif - Message "Installing " + $ProductId$ + " ..." + Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..." comment "Start setup program" + ChangeDirectory "%SCRIPTPATH%" Winbatch_install Sub_check_exitcode @@ -70,19 +72,34 @@ else comment "Create shortcuts" LinkFolder_install - comment "Test for installation success" - ; Test if software marked as installed in registry - ; if (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}] DisplayName") = "") - ; logError "Fatal: After Installation 32 bit [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}] not found" - ; isFatalError - ; else - ; comment "Successful Installation" - ; endif - endif [Winbatch_install] -msiexec /i "$InstallMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress +; Choose one of the following examples as basis for your installation +; You can use $LicenseKey$ var to pass a license key to the installer +; +; === Nullsoft Scriptable Install System ================================================================ +; "%ScriptPath%\Setup.exe" /S +; +; === MSI package ======================================================================================= +; You may use the parameter PIDKEY=$Licensekey$ +; msiexec /i "%ScriptPath%\some.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress +; +; === InstallShield + MSI===================================================================================== +; Attention: The path to the log file should not contain any whitespaces +; "%ScriptPath%\setup.exe" /s /v" /l* $LogDir$\$ProductId$.install_log.txt /qb! ALLUSERS=1 REBOOT=ReallySuppress" +; "%ScriptPath%\setup.exe" /s /v" /qb! ALLUSERS=2 REBOOT=ReallySuppress" +; +; === InstallShield ===================================================================================== +; Create setup.iss answer file by running: setup.exe /r /f1"c:\setup.iss" +; You may use an answer file by the parameter /f1"c:\setup.iss" +; "%ScriptPath%\setup.exe" /s /sms /f2"$LogDir$\$ProductId$.install_log.txt" +; +; === Inno Setup ======================================================================================== +; http://unattended.sourceforge.net/InnoSetup_Switches_ExitCodes.html +; You may create setup answer file by: setup.exe /SAVEINF="filename" +; You may use an answer file by the parameter /LOADINF="filename" +; "%ScriptPath%\setup.exe" /sp- /silent /norestart /nocancel /SUPPRESSMSGBOXES [Files_install] ; copy the ini file to the InstallDir diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins index 1e6972a..2667646 100644 --- a/CLIENT_DATA/uninstall32.ins +++ b/CLIENT_DATA/uninstall32.ins @@ -1,20 +1,21 @@ ; Copyright (c) uib gmbh (www.uib.de) ; This sourcecode is owned by uib gmbh ; and published under the Terms of the General Public License. -; credits: http://www.opsi.org/credits/ +; credits: http://www.opsi.org/en/credits/ [Actions] -requiredWinstVersion >= "4.10.8.6" +requiredWinstVersion >= "4.11.2.6" -; DefVar $MsiId$ DefVar $MsiIdOld$ -DefVar $UninstallProgram$ -DefVar $LogDir$ 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" @@ -31,13 +32,13 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- -Set $ProductId$ = "adobe.acrobatreader9" Set $InstallDir$ = "%ProgramFiles32Dir%\Adobe\Reader 9.0\Reader\" ; ---------------------------------------------------------------- +Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" comment "Show product picture" -ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$ +ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ Message "Uninstalling " + $ProductId$ + " ..." @@ -45,3 +46,4 @@ if FileExists("%ScriptPath%\delsub32.ins") comment "Start uninstall sub section" Sub "%ScriptPath%\delsub32.ins" endif + diff --git a/builder-product.cfg b/builder-product.cfg index 6ac2d9d..9ebd052 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -3,6 +3,8 @@ ############################ VENDOR="adobe.com" PN="adobe.acrobatreader9" +NAME="Adobe Reader IX" +DESCRIPTION="Adobe Reader ist ein Computerprogramm des Unternehmens Adobe zum Anzeigen von PDF-Dokumenten, also ein Dateibetrachter." VERSION="9.5.4" RELEASE="1" PRIORITY="0" @@ -27,6 +29,7 @@ ICON_DL_INDEX=0 WINST_NAME[0]="InstallMsi" WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1]@\\AcroRead.msi" -WINST_NAME[1]="MsiId" -WINST_VALUE[1]="{AC76BA86-7AD7-1031-7B44-A95000000001}" +OPSI_INI_SECTION[0]="X86" +OPSI_INI_OPTION[0]="MsiId" +OPSI_INI_VALUE[0]="{AC76BA86-7AD7-1031-7B44-A95000000001}"