From 6075eadd693c77e449ddb2b9cc0dac77616afb04 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Wed, 1 Feb 2012 12:46:37 +0100 Subject: [PATCH] Bump to 10.0 and move to new buildsystem --- CLIENT_DATA/setup32.ins | 12 +++- Firefox-Setup-10.0.exe.sha1sum | 1 + FirefoxSetup9.0.1.exe.sha1sum | 1 - build.sh | 122 --------------------------------- builder-product.cfg | 27 ++++++++ builder-targets-cb.sh | 60 ++++++++++++++++ 6 files changed, 99 insertions(+), 124 deletions(-) create mode 100644 Firefox-Setup-10.0.exe.sha1sum delete mode 100644 FirefoxSetup9.0.1.exe.sha1sum delete mode 100644 build.sh create mode 100644 builder-product.cfg create mode 100644 builder-targets-cb.sh diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index 1049f3b..a0feeea 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -19,6 +19,16 @@ 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 - ; ---------------------------------------------------------------- @@ -81,7 +91,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" -ms +"$InstallExe$" -ms [Files_install] ; Example of recursively copying some files into the installation directory: diff --git a/Firefox-Setup-10.0.exe.sha1sum b/Firefox-Setup-10.0.exe.sha1sum new file mode 100644 index 0000000..b6ef57c --- /dev/null +++ b/Firefox-Setup-10.0.exe.sha1sum @@ -0,0 +1 @@ +f1298929cd2b7620abac6c68fe4c2b68822d78bd /home/mario/.opsi-dist-cache/firefox-10.0/Firefox-Setup-10.0.exe diff --git a/FirefoxSetup9.0.1.exe.sha1sum b/FirefoxSetup9.0.1.exe.sha1sum deleted file mode 100644 index f36efae..0000000 --- a/FirefoxSetup9.0.1.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -39344316bed4da9ac9d775db77018e4dd77071a4 /usr/portage/distfiles/FirefoxSetup9.0.1.exe diff --git a/build.sh b/build.sh deleted file mode 100644 index 7a83e71..0000000 --- a/build.sh +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/sh -PN="firefox" -VERSION="9.0.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://www.freesoftwarecenter.info/wp-content/uploads/2011/02/Mozilla_Firefox.png" -X86="ftp://ftp.mozilla.org/pub/firefox/releases/${VERSION}/win32-EUballot/de/Firefox%20Setup%20${VERSION}.exe" -#AMD64="http://downloads.sourceforge.net/sevenzip/7z920-x64.msi" -ICONFILE=${ICON##*/} -X86FILEDASH=${X86##*/} -X86FILE="FirefoxSetup${VERSION}.exe" -#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..8195236 --- /dev/null +++ b/builder-product.cfg @@ -0,0 +1,27 @@ +############################ +# Setup product information +############################ +VENDOR="mozilla.org" +PN="firefox" +VERSION="10.0" +RELEASE="1" +PRIORITY="0" +ADVICE="" + +# TYPE - defines, if the install files are public or restricted. +# Valid value: restrict | public +TYPE="public" + + +DL_FILE[0]="Mozilla_Firefox.png" +DL_SOURCE[0]="http://www.freesoftwarecenter.info/wp-content/uploads/2011/02/Mozilla_Firefox.png" + +DL_FILE[1]="Firefox-Setup-${VERSION}.exe" +DL_SOURCE[1]="ftp://ftp.mozilla.org/pub/firefox/releases/${VERSION}/win32-EUballot/de/Firefox%20Setup%20${VERSION}.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 + +DEVEL="1" \ No newline at end of file diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh new file mode 100644 index 0000000..639eff1 --- /dev/null +++ b/builder-targets-cb.sh @@ -0,0 +1,60 @@ +############################################################################## +# 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 config() { +# echo "Config - doing some commands before calling the builder_config" +# builder_config +# echo "Config - doing some commands after calling the builder_config" +#} + +#function prepare() { +# echo "Prepare" +# builder_prepare +#} + +function retrieve() { + echo "Retrieve" + builder_retrieve +} + +function create() { + echo "Create" + builder_create +} + +function package() { + echo "Package" + builder_package +} + +function publish() { + echo "Publish" + builder_publish +} + +function commit() { + echo "Commit" + # builder_commit +} +function cleanup() { + echo "Cleanup: output_dir: $output_dir" + # builder_cleanup +}