From 29fec17273ebe23d65a7b8c7c482d8953ca5e4a0 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Fri, 15 Mar 2013 13:37:58 +0100 Subject: [PATCH] update to new opsi builder template --- CLIENT_DATA/delsub3264.ins | 84 ++++++++++++----------------------- CLIENT_DATA/login.ins | 24 ++++++++++ CLIENT_DATA/setup3264.ins | 72 +++++++----------------------- CLIENT_DATA/uninstall3264.ins | 40 +++-------------- builder-product.cfg | 13 +++--- 5 files changed, 84 insertions(+), 149 deletions(-) create mode 100644 CLIENT_DATA/login.ins diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins index c3f7f1d..c0fdcce 100644 --- a/CLIENT_DATA/delsub3264.ins +++ b/CLIENT_DATA/delsub3264.ins @@ -1,34 +1,29 @@ ; 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 $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe" -Set $UninstallProgram64$ = $InstallDir64$ + "\uninstall.exe" Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" + Set $IniFile64$ = $InstallDir64$ + "\opsi-" + $ProductId$ + ".ini" - - 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($IniFile32$) - Set $MsiIdOld32$ = GetValueFromInifile($IniFile32$,"X86","MsiId32","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}") - if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld32$ + "] DisplayName") = "") - comment "Old MSI id " + $MsiIdOld32$ + " found in registry, starting msiexec to uninstall old version" - Winbatch_uninstall_msi_old_32 - sub_check_exitcode - endif - endif - - if FileExists($UninstallProgram32$) - comment "Uninstall program found, starting uninstall" - Winbatch_uninstall_32 - sub_check_exitcode + Set $OLD_VERSION$ = GetValueFromInifile($IniFile32$,"COMMON","VERSION","") + Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile32$,"COMMON","CREATOR_TAG","") + Set $OLD_RELEASE$ = GetValueFromInifile($IniFile32$,"COMMON","RELEASE","") endif + Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 32 Bit..." + if FileExists($IniFile32$) + Set $MsiIdOld32$ = GetValueFromInifile($IniFile32$,"X86","MsiId32","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}") + if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld32$ + "] DisplayName") = "") + comment "Old MSI id " + $MsiIdOld32$ + " found in registry, starting msiexec to uninstall old version" + Winbatch_uninstall_msi_old_32 + sub_check_exitcode + endif + endif 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 @@ -42,22 +37,21 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif 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($IniFile64$) - Set $MsiIdOld64$ = GetValueFromInifile($IniFile64$,"X86_64","MsiId64","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}") - if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld64$ + "] DisplayName") = "") - comment "Old MSI id " + $MsiIdOld64$ + " found in registry, starting msiexec to uninstall old version" - Winbatch_uninstall_msi_old_64 - sub_check_exitcode - endif - endif - if FileExists($UninstallProgram64$) - comment "Uninstall program found, starting uninstall" - Winbatch_uninstall_64 - sub_check_exitcode + Set $OLD_VERSION$ = GetValueFromInifile($IniFile64$,"COMMON","VERSION","") + Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile64$,"COMMON","CREATOR_TAG","") + Set $OLD_RELEASE$ = GetValueFromInifile($IniFile64$,"COMMON","RELEASE","") endif + Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 64 Bit..." + if FileExists($IniFile64$) + Set $MsiIdOld64$ = GetValueFromInifile($IniFile64$,"X86_64","MsiId64","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}") + if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld64$ + "] DisplayName") = "") + comment "Old MSI id " + $MsiIdOld64$ + " found in registry, starting msiexec to uninstall old version" + Winbatch_uninstall_msi_old_64 + sub_check_exitcode + endif + endif 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 @@ -73,16 +67,6 @@ endif comment "Delete program shortcuts" LinkFolder_uninstall -[Winbatch_uninstall_32] -; Choose one of the following examples as basis for program uninstall -; -; === Nullsoft Scriptable Install System ================================================================ -; "$UninstallProgram32$" /S -; -; === Inno Setup ======================================================================================== -; "$UninstallProgram32$" /silent /norestart /SUPPRESSMSGBOXES - - [Winbatch_uninstall_msi_old_32] msiexec /x $MsiIdOld32$ /qb! REBOOT=ReallySuppress @@ -92,17 +76,7 @@ msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress [Files_uninstall_32] ; Example for recursively deleting the installation directory (don't forget the trailing backslash): ; -; delete -sf "$InstallDir32$\" - -[Winbatch_uninstall_64] -; Choose one of the following examples as basis for program uninstall -; -; === Nullsoft Scriptable Install System ================================================================ -; "$UninstallProgram64$" /S -; -; === Inno Setup ======================================================================================== -; "$UninstallProgram64$" /silent /norestart /SUPPRESSMSGBOXES - +delete -sf "$InstallDir32$\" [Winbatch_uninstall_msi_old_64] msiexec /x $MsiIdOld64$ /qb! REBOOT=ReallySuppress @@ -111,9 +85,9 @@ msiexec /x $MsiIdOld64$ /qb! REBOOT=ReallySuppress msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress [Files_uninstall_64] -; Example for recursively deleting the installation directory (don't forget the trailing backslash): +; Example for recursively deleting the installation directory: ; -; delete -sf "$InstallDir64$\" +del -sf "$InstallDir64$\" [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/setup3264.ins b/CLIENT_DATA/setup3264.ins index 9215104..5394378 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -1,18 +1,14 @@ ; 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 $MsiId32$ DefVar $MsiIdOld32$ -DefVar $UninstallProgram32$ DefVar $IniFile32$ -; DefVar $MsiId64$ DefVar $MsiIdOld64$ -DefVar $UninstallProgram64$ DefVar $IniFile64$ DefVar $IniCfgFile$ DefVar $LogDir$ @@ -21,16 +17,15 @@ DefVar $MinimumSpace$ DefVar $InstallDir32$ DefVar $InstallDir64$ DefVar $ExitCode$ -DefVar $LicenseRequired$ -DefVar $LicenseKey$ -DefVar $LicensePool$ DefVar $INST_SystemType$ DefVar $INST_architecture$ +DefVar $OLD_VERSION$ +DefVar $OLD_CREATOR_TAG$ +DefVar $OLD_RELEASE$ Set $INST_SystemType$ = GetSystemType set $INST_architecture$ = GetProductProperty("install_architecture","system specific") - Set $LogDir$ = "%SystemDrive%\tmp" ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh @@ -49,39 +44,33 @@ 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$ = "pdfsam.pdfsam" Set $MinimumSpace$ = "20 MB" ; the path were we find the product after the installation Set $InstallDir32$ = "%ProgramFiles32Dir%\PDF Split And Merge Enhanced" Set $InstallDir64$ = "%ProgramFiles64Dir%\PDF Split And Merge Enhanced" -Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" -Set $LicenseRequired$ = "false" -Set $LicensePool$ = "p_" + $ProductId$ ; ---------------------------------------------------------------- +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 ; 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%\delsub3264.ins") comment "Start uninstall sub section" Sub "%ScriptPath%\delsub3264.ins" endif - if $LicenseRequired$ = "true" - comment "Licensing required, reserve license and get license key" - Sub_get_licensekey - endif - comment "installing" if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only") - Message "Installing " + $ProductId$ + " 32 Bit..." + Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..." comment "Start setup program" + ChangeDirectory "%SCRIPTPATH%" Winbatch_install_32 Sub_check_exitcode comment "Copy files" @@ -93,8 +82,9 @@ else endif if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only")) - Message "Installing " + $ProductId$ + " 64 Bit..." + Message "Installing " + $ProductId$ + " " + $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..." comment "Start setup program" + ChangeDirectory "%SCRIPTPATH%" Winbatch_install_64 Sub_check_exitcode comment "Copy files" @@ -108,9 +98,10 @@ else endif [Winbatch_install_32] -msiexec /i "$Install32Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress +msiexec /i "$Install32Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress [Files_install_32] +; copy the ini file to the InstallDir copy "$IniCfgFile$" "$InstallDir32$" ; Example of recursively copying some files into the installation directory: @@ -118,9 +109,10 @@ copy "$IniCfgFile$" "$InstallDir32$" ; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$" [Winbatch_install_64] -msiexec /i "$Install64Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress +msiexec /i "Install64Msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress [Files_install_64] +; copy the ini file to the InstallDir copy "$IniCfgFile$" "$InstallDir64$" ; Example of recursively copying some files into the installation directory: @@ -169,38 +161,6 @@ copy "$IniCfgFile$" "$InstallDir64$" ; icon_index: 2 ; end_link -[Sub_get_licensekey] -comment "License management is enabled and will be used" - -comment "Trying to get a license key" -Set $LicenseKey$ = demandLicenseKey ($LicensePool$) -; If there is an assignment of exactly one licensepool to the product the following call is possible: -; Set $LicenseKey$ = demandLicenseKey ("", $ProductId$) -; -; If there is an assignment of a license pool to a windows software id, it is possible to use: -; DefVar $WindowsSoftwareId$ -; $WindowsSoftwareId$ = "..." -; Set $LicenseKey$ = demandLicenseKey ("", "", $WindowsSoftwareId$) - -DefVar $ServiceErrorClass$ -set $ServiceErrorClass$ = getLastServiceErrorClass -comment "Error class: " + $ServiceErrorClass$ - -if $ServiceErrorClass$ = "None" - comment "Everything fine, we got the license key '" + $LicenseKey$ + "'" -else - if $ServiceErrorClass$ = "LicenseConfigurationError" - LogError "Fatal: license configuration must be corrected" - LogError getLastServiceErrorMessage - isFatalError - else - if $ServiceErrorClass$ = "LicenseMissingError" - LogError "Fatal: required license is not supplied" - isFatalError - endif - endif -endif - [Sub_check_exitcode] comment "Test for installation success via exit code" set $ExitCode$ = getLastExitCode diff --git a/CLIENT_DATA/uninstall3264.ins b/CLIENT_DATA/uninstall3264.ins index 5d6b296..948002e 100644 --- a/CLIENT_DATA/uninstall3264.ins +++ b/CLIENT_DATA/uninstall3264.ins @@ -1,18 +1,14 @@ ; 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 $MsiId32$ DefVar $MsiIdOld32$ -DefVar $UninstallProgram32$ DefVar $IniFile32$ -; DefVar $MsiId64$ DefVar $MsiIdOld64$ -DefVar $UninstallProgram64$ DefVar $IniFile64$ DefVar $IniCfgFile$ DefVar $LogDir$ @@ -20,15 +16,15 @@ DefVar $ExitCode$ DefVar $ProductId$ DefVar $InstallDir32$ DefVar $InstallDir64$ -DefVar $LicenseRequired$ -DefVar $LicensePool$ DefVar $INST_SystemType$ DefVar $INST_architecture$ +DefVar $OLD_VERSION$ +DefVar $OLD_CREATOR_TAG$ +DefVar $OLD_RELEASE$ Set $INST_SystemType$ = GetSystemType set $INST_architecture$ = GetProductProperty("install_architecture","system specific") - Set $LogDir$ = "%SystemDrive%\tmp" ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh @@ -44,16 +40,14 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- -Set $ProductId$ = "pdfsam.pdfsam" Set $InstallDir32$ = "%ProgramFiles32Dir%\PDF Split And Merge Enhanced" Set $InstallDir64$ = "%ProgramFiles64Dir%\PDF Split And Merge Enhanced" -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$ + " ..." @@ -62,23 +56,3 @@ if FileExists("%ScriptPath%\delsub3264.ins") Sub "%ScriptPath%\delsub3264.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$) - - diff --git a/builder-product.cfg b/builder-product.cfg index 271cd66..708208b 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -3,6 +3,8 @@ ############################ VENDOR="pdfsam.org" PN="pdfsam.pdfsam" +NAME="PDF Split and Merge" +DESCRIPTION="A free open source tool to split and merge pdf documents" VERSION="2.2.2e" RELEASE="3" PRIORITY="0" @@ -29,9 +31,10 @@ DL_WINST_NAME[2]=Install64Msi # File array index for the image showing while installing the program ICON_DL_INDEX=0 -WINST_NAME[0]="MsiId32" -WINST_VALUE[0]="{5038AC82-F11E-11E1-AE77-E50D6188709B}" - -WINST_NAME[1]="MsiId64" -WINST_VALUE[1]="{5038AC82-F11E-11E1-AE77-E50D6188709B}" +OPSI_INI_SECTION[0]="X86" +OPSI_INI_OPTION[0]="MsiId32" +OPSI_INI_VALUE[0]="{126B830E-16E7-11E2-B42B-92326288709B}" +OPSI_INI_SECTION[1]="X86_64" +OPSI_INI_OPTION[1]="MsiId64" +OPSI_INI_VALUE[1]="{126B830E-16E7-11E2-B42B-92326288709B}"