Bump

CLIENT_DATA/setup.ins

@@ -28,6 +28,16 @@ set $INST_architecture$ = GetProductProperty("install_architecture","system spec
 
 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                             -
 ; ----------------------------------------------------------------
@@ -96,7 +106,7 @@ endif
 ; You can use $LicenseKey$ var to pass a license key to the installer
 ;
 ; === Nullsoft Scriptable Install System ================================================================
-"%ScriptPath%\X86FILE" /verysilent ALLUSERS=1
+"$Install32Exe$" /verysilent ALLUSERS=1
 
 [Files_install_32]
 ; Example of recursively copying some files into the installation directory:
@@ -109,7 +119,7 @@ endif
 ;
 ; === MSI package =======================================================================================
 ; You may use the parameter PIDKEY=$Licensekey$
-"%ScriptPath%\AMD64FILE" /verysilent ALLUSERS=1
+"$Install64Exe$" /verysilent ALLUSERS=1
 
 [Files_install_64]
 ; Example of recursively copying some files into the installation directory:

CLIENT_DATA/uninstall.ins

@@ -26,6 +26,16 @@ set $INST_architecture$ = GetProductProperty("install_architecture","system spec
 
 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                             -
 ; ----------------------------------------------------------------

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: ??
+
+

build.sh

@@ -1,120 +0,0 @@
-#!/bin/sh
-PN="cdburnerxp"
-VERSION="4.4.0.2905"
-RELEASE="1"
-PRIORITY="0"
-ADVICE=""
-TYPE="public"
-# all downloads should not have any traling parameters like ?downlaodid=1234 .....(should rewrite in python)
-ICON="http://cdn.rizwanashraf.com/wp-content/uploads/2008/10/cdburnerxp.jpg"
-X86="http://download.cdburnerxp.se/minimal/07a5aac53422dc10ba228a291a9d6645/4f1dc941/cdbxp_setup_4.4.0.2905_minimal.exe"
-AMD64="http://download.cdburnerxp.se/minimal/f73b73267cbbe6c82f1f92d8a3bbf0e3/4f1dc941/cdbxp_setup_4.4.0.2905_x64_minimal.exe"
-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 -P /usr/portage/distfiles/ $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
-
-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
-

builder-product.cfg

@@ -0,0 +1,29 @@
+############################
+# Setup product information 
+############################
+VENDOR="cdburnerxp.se"
+PN="cdburnerxp"
+VERSION="4.4.0.2971"
+RELEASE="3"
+PRIORITY="0"
+ADVICE=""
+
+# TYPE - defines, if the install files are public or restricted. 
+# Valid value: restricted | public
+TYPE="public"
+
+DL_FILE[0]="cdburnerxp-icon.png"
+DL_SOURCE[0]="http://2.bp.blogspot.com/-EcI3aRnd1VM/Tcbn_dipuII/AAAAAAAAAGI/lCXyXMjmRYI/s200/cdburnerxp.png"
+
+DL_FILE[1]="cdbxp_setup_${VERSION}_minimal.exe"
+DL_SOURCE[1]="http://download.cdburnerxp.se/minimal/f2916da417d37c37e9c58c1abd0578eb/4f53adaa/cdbxp_setup_${VERSION}_minimal.exe"
+DL_ARCH[1]="X86"
+DL_WINST_NAME[1]=Install32Exe
+
+DL_FILE[2]="cdbxp_setup_${VERSION}_x64_minimal.exe"
+DL_SOURCE[2]="http://download.cdburnerxp.se/minimal/c9339116f2d399ecc9ecb04483341ce0/4f53adaa/cdbxp_setup_${VERSION}_x64_minimal.exe"
+DL_ARCH[2]="X86_64"
+DL_WINST_NAME[2]=Install64Exe
+
+# File array index for the image showing while installing the program
+ICON_DL_INDEX=0

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_<targetname> is possible.
+#
+# Abstract:
+#  target order: config, prepare, retrieve, create, package, publish, commit, cleanup
+#  callbacks: <none>
+#
+##############################################################################
+
+function cleanup() {
+    echo "Cleanup"
+    builder_cleanup
+}

cdburnerxp-icon.png.sha1sum

@@ -0,0 +1 @@
+f656e5a90fa16d77fede2043eb09c0baf02d8028  /home/mario/.opsi-dist-cache/cdburnerxp-4.4.0.2971//cdburnerxp-icon.png

cdburnerxp.jpg.sha1sum

@@ -1 +0,0 @@
-ecb4331bd8cb1631f560b793dfe11c91803fda9a  /usr/portage/distfiles/cdburnerxp.jpg

cdbxp_setup_4.4.0.2905_minimal.exe.sha1sum

@@ -1 +0,0 @@
-db22729d1003d9a954fcf24d04069a95f0aa0c59  /usr/portage/distfiles/cdbxp_setup_4.4.0.2905_minimal.exe

cdbxp_setup_4.4.0.2905_x64_minimal.exe.sha1sum

@@ -1 +0,0 @@
-8299c137127f208b233e73c827044c1df586c653  /usr/portage/distfiles/cdbxp_setup_4.4.0.2905_x64_minimal.exe

cdbxp_setup_4.4.0.2971_minimal.exe.sha1sum

@@ -0,0 +1 @@
+be86e1342a0de98c201bbe8f1ae8e7241bcbe3f4  /home/mario/.opsi-dist-cache/cdburnerxp-4.4.0.2971/X86/cdbxp_setup_4.4.0.2971_minimal.exe

cdbxp_setup_4.4.0.2971_x64_minimal.exe.sha1sum

@@ -0,0 +1 @@
+87482f501349535b26d700f18038c00a12b42422  /home/mario/.opsi-dist-cache/cdburnerxp-4.4.0.2971/X86_64/cdbxp_setup_4.4.0.2971_x64_minimal.exe