From ef5e4cb0db5bd3f904b5884a6cd5721a018f8682 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Wed, 9 May 2012 18:45:20 +0200 Subject: [PATCH] Bump and move to new buildsystem und new name --- CLIENT_DATA/delsub32.ins | 12 --- CLIENT_DATA/setup32.ins | 63 +++-------- CLIENT_DATA/uninstall32.ins | 43 ++------ FileZilla_3.2.7.1_win32-setup.exe.sha1sum | 1 - FileZilla_3.5.3_win32-setup.exe.sha1sum | 1 + OPSI/control | 4 +- Testing.txt | 28 +++++ build.sh | 121 ---------------------- builder-product.cfg | 27 +++++ builder-targets-cb.sh | 25 +++++ filezilla-150x150.png.sha1sum | 1 - filezilla-2.png.sha1sum | 1 + 12 files changed, 107 insertions(+), 220 deletions(-) delete mode 100644 FileZilla_3.2.7.1_win32-setup.exe.sha1sum create mode 100644 FileZilla_3.5.3_win32-setup.exe.sha1sum create mode 100644 Testing.txt delete mode 100644 build.sh create mode 100644 builder-product.cfg create mode 100644 builder-targets-cb.sh delete mode 100644 filezilla-150x150.png.sha1sum create mode 100644 filezilla-2.png.sha1sum diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins index 8c2da50..f8f1e73 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$ + "\unistall.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$" /S -[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 2f3f9e2..9844e71 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -6,31 +6,35 @@ [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 - ; ---------------------------------------------------------------- ;$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$ = "filezilla" +Set $ProductId$ = "filezilla.filezilla" Set $MinimumSpace$ = "20 MB" ; the path were we find the product after the installation Set $InstallDir$ = "%ProgramFiles32Dir%\FileZilla FTP Client" -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 @@ -81,7 +80,7 @@ endif ; 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" /S +"$InstallExe$" /S [Files_install] ; Example of recursively copying some files into the installation directory: @@ -130,44 +129,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 38c69da..d15bc9a 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$ = "filezilla" +Set $ProductId$ = "filezilla.filezilla" Set $InstallDir$ = "%ProgramFiles32Dir%\FileZilla FTP Client" -Set $LicenseRequired$ = "false" -Set $LicensePool$ = "p_" + $ProductId$ ; ---------------------------------------------------------------- @@ -37,29 +42,3 @@ if FileExists("%ScriptPath%\delsub32.ins") 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 - - - diff --git a/FileZilla_3.2.7.1_win32-setup.exe.sha1sum b/FileZilla_3.2.7.1_win32-setup.exe.sha1sum deleted file mode 100644 index de3200c..0000000 --- a/FileZilla_3.2.7.1_win32-setup.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -560e34eef8373dd5e0202e7a478a259ca71c6f51 /usr/portage/distfiles/FileZilla_3.2.7.1_win32-setup.exe diff --git a/FileZilla_3.5.3_win32-setup.exe.sha1sum b/FileZilla_3.5.3_win32-setup.exe.sha1sum new file mode 100644 index 0000000..d104b2e --- /dev/null +++ b/FileZilla_3.5.3_win32-setup.exe.sha1sum @@ -0,0 +1 @@ +33e970f64f439e50619a181fb88e416759548264 /home/mario/.opsi-dist-cache/filezilla.filezilla-3.5.3/X86/FileZilla_3.5.3_win32-setup.exe diff --git a/OPSI/control b/OPSI/control index c8803a0..bc4d36b 100644 --- a/OPSI/control +++ b/OPSI/control @@ -5,7 +5,7 @@ incremental: False [Product] type: localboot -id: filezilla +id: filezilla.filezilla name: FileZilla description: FileZilla ist ein modernes und leistungsstarkes FTP-Programm fuer Windows, MAC und Linux Betriebssysteme. advice: ADVICE @@ -32,7 +32,7 @@ default: ["system specific"] [ProductDependency] action: setup -requiredProduct: aio +requiredProduct: sereby.aio requiredStatus: installed requirementType: before 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/build.sh b/build.sh deleted file mode 100644 index 40349a6..0000000 --- a/build.sh +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/sh -PN="filezilla" -VERSION="3.2.7.1" -RELEASE="1" -PRIORITY="0" -ADVICE="" -TYPE="public" -# all downloads should not have any traling parameters like ?downlaodid=1234 .....(should rewrite in python) -ICON="http://das365tageexperiment.com/internet-marketing/wp-content/uploads/2011/06/filezilla-150x150.png" -X86="http://heanet.dl.sourceforge.net/project/filezilla/FileZilla_Client/3.2.7.1/FileZilla_3.2.7.1_win32-setup.exe" -#AMD64="http://downloads.sourceforge.net/sevenzip/7z920-x64.msi" -ICONFILE=${ICON##*/} -X86FILE=${X86##*/} -#AMD64FILE=${AMD64##*/} - - if [ -e /var/tmp/opsi/upload/$TYPE/${PN}_${VERSION}-${RELEASE}.opsi ] - then - echo "package ${PN}_${VERSION}-${RELEASE}.opsi already generated" - exit 1 - fi - -OUT=$(mktemp -d /tmp/output.XXXXXXXXXX) || { echo "Failed to create temp dir"; exit 1; } -mkdir $OUT/$PN -cp -Rv OPSI CLIENT_DATA $OUT/$PN -unix2dos $OUT/$PN/CLIENT_DATA/* - - if [ -e /usr/portage/distfiles/$ICONFILE ] - then - if [ -e $ICONFILE.sha1sum ] - then - SHA1SUM=`cat $ICONFILE.sha1sum` - CHECKSUM=`sha1sum /usr/portage/distfiles/$ICONFILE` - if [ "$CHECKSUM" = "$SHA1SUM" ] - then - convert -colorspace rgb /usr/portage/distfiles/$ICONFILE -transparent white -background transparent -resize 160x160\> \ - -size 160x160 xc:transparent +swap -gravity center -composite $OUT/$PN/CLIENT_DATA/$PN.png - else - echo "The checksums do not match." - exit 1 - fi - else - echo "You need to create the checksums with: sha1sum /usr/portage/distfiles/$ICONFILE > $ICONFILE.sha1sum" - exit 1 - fi - else - echo "Downloading file" - wget -P /usr/portage/distfiles/ $ICON - exit 1 - fi - - if [ -e /usr/portage/distfiles/$X86FILE ] - then - if [ -e $X86FILE.sha1sum ] - then - SHA1SUM=`cat $X86FILE.sha1sum` - CHECKSUM=`sha1sum /usr/portage/distfiles/$X86FILE` - if [ "$CHECKSUM" = "$SHA1SUM" ] - then - cp /usr/portage/distfiles/$X86FILE $OUT/$PN/CLIENT_DATA - else - echo "The checksums do not match." - exit 1 - fi - else - echo "You need to create the checksums with: sha1sum /usr/portage/distfiles/$X86FILE > $X86FILE.sha1sum" - exit 1 - fi - else - echo "Downloading file" - wget -O /usr/portage/distfiles/$X86FILE $X86 - exit 1 - fi - -# if [ -e /usr/portage/distfiles/$AMD64FILE ] -# then -# if [ -e $AMD64FILE.sha1sum ] -# then -# SHA1SUM=`cat $AMD64FILE.sha1sum` -# CHECKSUM=`sha1sum /usr/portage/distfiles/$AMD64FILE` -# if [ "$CHECKSUM" = "$SHA1SUM" ] -# then -# cp /usr/portage/distfiles/$AMD64FILE $OUT/$PN/CLIENT_DATA -# else -# echo "The checksums do not match." -# exit 1 -# fi -# else -# echo "You need to create the checksums with: sha1sum /usr/portage/distfiles/$AMD64FILE > $AMD64FILE.sha1sum" -# exit 1 -# fi -# else -# echo "Downloading file" -# wget -P /usr/portage/distfiles/ $AMD64 -# exit 1 -# fi - -sed -e "s!VERSION!$VERSION!g" -e "s!RELEASE!$RELEASE!g" -e "s!PRIORITY!$PRIORITY!g" -e "s!ADVICE!$ADVICE!g" -i $OUT/$PN/OPSI/control -#sed -e "s!X86FILE!$X86FILE!g" -e "s!AMD64FILE!$AMD64FILE!g" -i $OUT/$PN/CLIENT_DATA/setup.ins -sed -e "s!X86FILE!$X86FILE!g" -i $OUT/$PN/CLIENT_DATA/setup32.ins - -if test -d ".git"; then - git log --date-order --date=short | \ - sed -e '/^commit.*$/d' | \ - awk '/^Author/ {sub(/\\$/,""); getline t; print $0 t; next}; 1' | \ - sed -e 's/^Author: //g' | \ - sed -e 's/>Date: \([0-9]*-[0-9]*-[0-9]*\)/>\t\1/g' | \ - sed -e 's/^\(.*\) \(\)\t\(.*\)/\3 \1 \2/g' > $OUT/$PN/OPSI/changelog.txt -else - echo "No git repository present." - exit 1 -fi - -pushd $OUT -opsi-makeproductfile -v $OUT/$PN -popd - -mkdir -p /var/tmp/opsi/upload/$TYPE/ -cp -afv $OUT/*.opsi /var/tmp/opsi/upload/$TYPE/ - -#rm -rf $OUT - diff --git a/builder-product.cfg b/builder-product.cfg new file mode 100644 index 0000000..0556aba --- /dev/null +++ b/builder-product.cfg @@ -0,0 +1,27 @@ +############################ +# Setup product information +############################ +VENDOR="filezilla.de" +PN="filezilla.filezilla" +VERSION="3.5.3" +RELEASE="3" +PRIORITY="0" +ADVICE="" + +# TYPE - defines, if the install files are public or restricted. +# Valid value: restricted | public +TYPE="public" + + + +DL_FILE[0]="filezilla-2.png" +DL_SOURCE[0]="http://rocketdock.com/images/screenshots/thumbnails/filezilla-2.png" + +DL_FILE[1]="FileZilla_${VERSION}_win32-setup.exe" +DL_SOURCE[1]="http://sourceforge.net/projects/filezilla/files/FileZilla_Client/${VERSION}/FileZilla_${VERSION}_win32-setup.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/filezilla-150x150.png.sha1sum b/filezilla-150x150.png.sha1sum deleted file mode 100644 index a76d6ca..0000000 --- a/filezilla-150x150.png.sha1sum +++ /dev/null @@ -1 +0,0 @@ -9689eb15b9c42042f1b81e17677be9275d1ab524 /usr/portage/distfiles/filezilla-150x150.png diff --git a/filezilla-2.png.sha1sum b/filezilla-2.png.sha1sum new file mode 100644 index 0000000..81bc19a --- /dev/null +++ b/filezilla-2.png.sha1sum @@ -0,0 +1 @@ +5ad3740c6cfb8bdcdee8554ae962782bc1acedc2 /home/mario/.opsi-dist-cache/filezilla.filezilla-3.5.3//filezilla-2.png