From fee68856516e087f7b633f0a32f5ebb03e769fbf Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Wed, 15 Feb 2012 05:29:19 +0100 Subject: [PATCH] move to new build system --- CLIENT_DATA/setup32.ins | 16 ++++- CLIENT_DATA/uninstall32.ins | 10 +++ Testing.txt | 28 ++++++++ build.sh | 122 -------------------------------- builder-product.cfg | 29 ++++++++ builder-targets-cb.sh | 25 +++++++ capslockgoodbye-2.0.zip.sha1sum | 1 + capslockgoodbye.zip.sha1sum | 1 - 8 files changed, 106 insertions(+), 126 deletions(-) create mode 100644 Testing.txt delete mode 100644 build.sh create mode 100644 builder-product.cfg create mode 100644 builder-targets-cb.sh create mode 100644 capslockgoodbye-2.0.zip.sha1sum delete mode 100644 capslockgoodbye.zip.sha1sum diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index d653d18..498d2c5 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 - ; ---------------------------------------------------------------- @@ -106,7 +116,7 @@ endif [Files_install] ; Example of recursively copying some files into the installation directory: ; -copy -s "%ScriptPath%\capslockgoodbye.exe" "$InstallDir$" +copy -s "$Executable$" "$InstallDir$" [Registry_install] ; Example of setting some values of an registry key: @@ -133,7 +143,7 @@ set_link parameters: working_dir: $InstallDir$ icon_file: $InstallDir$\capslockgoodbye.exe - icon_index: 1 + icon_index: 0 end_link ; ; Example of creating an shortcut to the installed exe on AllUsers desktop: @@ -147,7 +157,7 @@ set_link parameters: working_dir: $InstallDir$ icon_file: $InstallDir$\capslockgoodbye.exe - icon_index: 1 + icon_index: 0 end_link [Sub_get_licensekey] diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins index b9ba89e..958e595 100644 --- a/CLIENT_DATA/uninstall32.ins +++ b/CLIENT_DATA/uninstall32.ins @@ -17,6 +17,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 - ; ---------------------------------------------------------------- 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 496024c..0000000 --- a/build.sh +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/sh -PN="capslockgoodbye" -VERSION="2.0" -RELEASE="1" -PRIORITY="0" -ADVICE="" -TYPE="public" -# all downloads should not have any traling parameters like ?downlaodid=1234 .....(should rewrite in python) -ICON="http://melk.de/software/capslockgoodbye/capslockgb_logo.gif" -X86="http://melk.de/software/capslockgoodbye/capslockgoodbye.zip" -#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 - unzip -d $OUT/$PN/CLIENT_DATA /usr/portage/distfiles/$X86FILE - 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..41f43f0 --- /dev/null +++ b/builder-product.cfg @@ -0,0 +1,29 @@ +############################ +# Setup product information +############################ +VENDOR="melk.de" +PN="capslockgoodbye" +VERSION="2.0" +RELEASE="1" +PRIORITY="0" +ADVICE="" + +# TYPE - defines, if the install files are public or restricted. +# Valid value: restricted | public +TYPE="public" + + +DL_FILE[0]="capslockgb_logo.gif" +DL_SOURCE[0]="http://melk.de/software/capslockgoodbye/capslockgb_logo.gif" + +DL_FILE[1]="capslockgoodbye-${VERSION}.zip" +DL_SOURCE[1]="http://melk.de/software/capslockgoodbye/capslockgoodbye.zip" +DL_ARCH[1]="X86" +DL_EXTRACT_FORMAT[1]="unzip" + +# File array index for the image showing while installing the program +ICON_DL_INDEX=0 + +WINST_NAME[0]=Executable +WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1]@\\capslockgoodbye.exe" + 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/capslockgoodbye-2.0.zip.sha1sum b/capslockgoodbye-2.0.zip.sha1sum new file mode 100644 index 0000000..2798432 --- /dev/null +++ b/capslockgoodbye-2.0.zip.sha1sum @@ -0,0 +1 @@ +351dcef2d3f0a904a81ce5c36c42b08c11751750 /home/mario/.opsi-dist-cache/capslockgoodbye-2.0/X86/capslockgoodbye-2.0.zip diff --git a/capslockgoodbye.zip.sha1sum b/capslockgoodbye.zip.sha1sum deleted file mode 100644 index ba741f9..0000000 --- a/capslockgoodbye.zip.sha1sum +++ /dev/null @@ -1 +0,0 @@ -351dcef2d3f0a904a81ce5c36c42b08c11751750 /usr/portage/distfiles/capslockgoodbye.zip