From a0cfc31c9b1d436c54e18260aa215f1918fdddf6 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Fri, 24 Feb 2012 05:14:54 +0100 Subject: [PATCH] Move to new buildsystem / Bump / remove useless msi and license parts in *.ins --- CLIENT_DATA/delsub32.ins | 12 ------- CLIENT_DATA/setup32.ins | 70 ++++++------------------------------- CLIENT_DATA/uninstall32.ins | 44 ++++++----------------- Testing.txt | 28 +++++++++++++++ builder-product.cfg | 26 ++++++++++++++ builder-targets-cb.sh | 25 +++++++++++++ winscp436setup.exe.sha1sum | 1 - winscp437setup.exe.sha1sum | 1 + 8 files changed, 102 insertions(+), 105 deletions(-) create mode 100644 Testing.txt create mode 100644 builder-product.cfg create mode 100644 builder-targets-cb.sh delete mode 100644 winscp436setup.exe.sha1sum create mode 100644 winscp437setup.exe.sha1sum diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins index 8532744..7bff5ae 100644 --- a/CLIENT_DATA/delsub32.ins +++ b/CLIENT_DATA/delsub32.ins @@ -4,7 +4,6 @@ ; credits: http://www.opsi.org/credits/ -Set $MsiId$ = '{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}' Set $UninstallProgram$ = $InstallDir$ + "\uninst000.exe" Message "Uninstalling " + $ProductId$ + " ..." @@ -14,11 +13,6 @@ if FileExists($UninstallProgram$) Winbatch_uninstall sub_check_exitcode 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" - Winbatch_uninstall_msi - sub_check_exitcode -endif comment "Delete files" Files_uninstall /32Bit @@ -30,14 +24,8 @@ comment "Delete program shortcuts" LinkFolder_uninstall [Winbatch_uninstall] -; Choose one of the following examples as basis for program uninstall -; -; PuTTY 0.58+ uninstallers call 'putty -cleanup-during-uninstall' during uninstall. This causes a pop-up to appear which breaks the silent uninstall. "$UninstallProgram$" /VERYSILENT /NORESTART -[Winbatch_uninstall_msi] -msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress - [Files_uninstall] ; Example for recursively deleting the installation directory (don't forget the trailing backslash): ; diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index a92e10f..35790b0 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -6,19 +6,25 @@ [Actions] requiredWinstVersion >= "4.10.8.6" -DefVar $MsiId$ DefVar $UninstallProgram$ DefVar $LogDir$ DefVar $ProductId$ DefVar $MinimumSpace$ DefVar $InstallDir$ DefVar $ExitCode$ -DefVar $LicenseRequired$ -DefVar $LicenseKey$ -DefVar $LicensePool$ Set $LogDir$ = "%SystemDrive%\tmp" +; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh +; and adds the following variables: +; from builder-product.cfg : all variables definded by attribute WINST[index] +; from builder-product.cfg : VENDOR PN VERSION RELEASE PRIORITY ADVICE TYPE +; from opsi-builder.cfg : CREATOR_TAG CREATOR_NAME CREATOR_EMAIL +; auto generated winst-variables +; $IconFile$: path to product picture +; +@@BUILDER_VARIABLES@@ + ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- @@ -29,8 +35,6 @@ Set $ProductId$ = "winscp" Set $MinimumSpace$ = "20 MB" ; the path were we find the product after the installation Set $InstallDir$ = "%ProgramFiles32Dir%\WinSCP" -Set $LicenseRequired$ = "false" -Set $LicensePool$ = "p_" + $ProductId$ ; ---------------------------------------------------------------- if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$)) @@ -48,11 +52,6 @@ else Message "Installing " + $ProductId$ + " ..." - if $LicenseRequired$ = "true" - comment "Licensing required, reserve license and get license key" - Sub_get_licensekey - endif - comment "Start setup program" Winbatch_install Sub_check_exitcode @@ -66,22 +65,13 @@ 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] ; Choose one of the following examples as basis for your installation ; You can use $LicenseKey$ var to pass a license key to the installer ; -"%ScriptPath%\X86FILE" /VERYSILENT /NORESTART +"$InstallExe$" /VERYSILENT /NORESTART [Files_install] ; Example of recursively copying some files into the installation directory: @@ -130,44 +120,6 @@ endif ; icon_index: 2 ; end_link -[Sub_get_licensekey] -if opsiLicenseManagementEnabled - 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 -else - LogError "Fatal: license required, but license management not enabled" - isFatalError -endif - - [Sub_check_exitcode] comment "Test for installation success via exit code" set $ExitCode$ = getLastExitCode diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins index 195e125..f73b6b7 100644 --- a/CLIENT_DATA/uninstall32.ins +++ b/CLIENT_DATA/uninstall32.ins @@ -6,24 +6,29 @@ [Actions] requiredWinstVersion >= "4.10.8.6" -DefVar $MsiId$ DefVar $UninstallProgram$ DefVar $LogDir$ DefVar $ExitCode$ DefVar $ProductId$ DefVar $InstallDir$ -DefVar $LicenseRequired$ -DefVar $LicensePool$ Set $LogDir$ = "%SystemDrive%\tmp" +; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh +; and adds the following variables: +; from builder-product.cfg : all variables definded by attribute WINST[index] +; from builder-product.cfg : VENDOR PN VERSION RELEASE PRIORITY ADVICE TYPE +; from opsi-builder.cfg : CREATOR_TAG CREATOR_NAME CREATOR_EMAIL +; auto generated winst-variables +; $IconFile$: path to product picture +; +@@BUILDER_VARIABLES@@ + ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- Set $ProductId$ = "winscp" Set $InstallDir$ = "%ProgramFiles32Dir%\WinSCP" -Set $LicenseRequired$ = "false" -Set $LicensePool$ = "p_" + $ProductId$ ; ---------------------------------------------------------------- @@ -35,31 +40,4 @@ Message "Uninstalling " + $ProductId$ + " ..." if FileExists("%ScriptPath%\delsub32.ins") comment "Start uninstall sub section" Sub "%ScriptPath%\delsub32.ins" -endif - -if $LicenseRequired$ = "true" - comment "Licensing required, free license used" - Sub_free_license -endif - -[Sub_free_license] -if opsiLicenseManagementEnabled - 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$) -else - LogError "Error: licensing required, but license management not enabled" - isFatalError -endif - - - +endif \ No newline at end of file diff --git a/Testing.txt b/Testing.txt new file mode 100644 index 0000000..d6b5e6c --- /dev/null +++ b/Testing.txt @@ -0,0 +1,28 @@ +*** Qualitiymanagement/Testing procedure + +- Product: + - Name: productname + - Version: xxx + - Release: yyyy + +- Environment + - OS: Native windows XP-32Bit installation + - Preinstalled packages: None (also no aio) + - Files used while testing: + File1: http://domain.de/file.ext + +- Testing process: + OPSI-action: + - Installation (without dependencies like AIO/Firefox): ?? + Result: + - File extensions related to program: ?? + - Start menu entry: ?? + - Starting/using program: viewer works, File1 is shown correctly: ?? + + OPSI-action: + - Uninstall + Result: + - File extensions related to program: unrelated: ?? + - Start menu entry: none: ?? + + diff --git a/builder-product.cfg b/builder-product.cfg new file mode 100644 index 0000000..f6ede31 --- /dev/null +++ b/builder-product.cfg @@ -0,0 +1,26 @@ +############################ +# Setup product information +############################ +VENDOR="winscp.net" +PN="winscp" +VERSION="4.3.7" +RELEASE="1" +PRIORITY="0" +ADVICE="" + +# TYPE - defines, if the install files are public or restricted. +# Valid value: restricted | public +TYPE="public" + + +DL_FILE[0]="r6fnfoaa7kcoh857wrtm.png" +DL_SOURCE[0]="http://apfelportal.de/host/images/r6fnfoaa7kcoh857wrtm.png" + +DL_FILE[1]="winscp437setup.exe" +DL_SOURCE[1]="http://prdownloads.sourceforge.net/winscp/winscp437setup.exe" +DL_ARCH[1]="X86" +DL_WINST_NAME[1]=InstallExe + +# File array index for the image showing while installing the program +ICON_DL_INDEX=0 + diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh new file mode 100644 index 0000000..9a3d4a8 --- /dev/null +++ b/builder-targets-cb.sh @@ -0,0 +1,25 @@ +############################################################################## +# This optional file "builder-targets-cb.sh" will be called by builder.sh +# +# The targets will be called from thde opsi-builder using the following +# order: config, prepare, retrieve, create, package, publish, commit, cleanup +# You can overwrite the target functions in builder-targets-cb.sh +# +# You can define callback functions. The functions are called from +# opsi-builder within processing a target +# cb_package_makeproductfile +# +# You can use every variable defined in any configuration file or by +# the defined builder script itself. Also, calling the predefined +# targets builder_ is possible. +# +# Abstract: +# target order: config, prepare, retrieve, create, package, publish, commit, cleanup +# callbacks: +# +############################################################################## + +function cleanup() { + echo "Cleanup" + builder_cleanup +} diff --git a/winscp436setup.exe.sha1sum b/winscp436setup.exe.sha1sum deleted file mode 100644 index a418a05..0000000 --- a/winscp436setup.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -e6bb1b17c5c21713ab5727c31e46141400037df5 /usr/portage/distfiles/winscp436setup.exe diff --git a/winscp437setup.exe.sha1sum b/winscp437setup.exe.sha1sum new file mode 100644 index 0000000..e0b7d19 --- /dev/null +++ b/winscp437setup.exe.sha1sum @@ -0,0 +1 @@ +c9185f91a1184a929170c18c351c6060415aec6d /home/mario/.opsi-dist-cache/winscp-4.3.7/X86/winscp437setup.exe