From 9fd2d3b9ee90a77f8959636cc31800f46f647db0 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Wed, 15 Feb 2012 12:18:48 +0100
Subject: [PATCH] move to new buildsystem and bump

---
 CLIENT_DATA/setup32.ins            | 13 ++++++++++++-
 Testing.txt                        | 28 ++++++++++++++++++++++++++++
 builder-product.cfg                | 28 ++++++++++++++++++++++++++++
 builder-targets-cb.sh              | 25 +++++++++++++++++++++++++
 xmlstarlet-1.2.0-win32.zip.sha1sum |  1 -
 xmlstarlet-1.3.1-win32.zip.sha1sum |  1 +
 6 files changed, 94 insertions(+), 2 deletions(-)
 create mode 100644 Testing.txt
 create mode 100644 builder-product.cfg
 create mode 100644 builder-targets-cb.sh
 delete mode 100644 xmlstarlet-1.2.0-win32.zip.sha1sum
 create mode 100644 xmlstarlet-1.3.1-win32.zip.sha1sum

diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 2e0a92d..b590a9b 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,8 @@ endif
 [Files_install]
 ; Example of recursively copying some files into the installation directory:
 ;
-copy -s "%ScriptPath%\X86XMLFILE\*.exe" "$InstallDir$"
+copy -s "$InstallExe$" "$InstallDir$"
+
 
 [Registry_install]
 ; Example of setting some values of an registry key:
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..77fe336
--- /dev/null
+++ b/builder-product.cfg
@@ -0,0 +1,28 @@
+############################
+# Setup product information 
+############################
+VENDOR="xmlstar.sf.net"
+PN="xmlstarlet"
+VERSION="1.3.1"
+RELEASE="1"
+PRIORITY="0"
+ADVICE=""
+
+# TYPE - defines, if the install files are public or restricted. 
+# Valid value: restricted | public
+TYPE="public"
+
+  
+DL_FILE[0]="xmlLogo.png"
+DL_SOURCE[0]="http://increaserss.com/wp-content/uploads/xmlLogo.png"
+
+DL_FILE[1]="xmlstarlet-${VERSION}-win32.zip"
+DL_SOURCE[1]="http://sourceforge.net/projects/xmlstar/files/xmlstarlet/${VERSION}/xmlstarlet-${VERSION}-win32.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]="InstallExe"
+WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1]@\\xmlstarlet-${VERSION}\\*.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_<targetname> is possible.
+#
+# Abstract:
+#  target order: config, prepare, retrieve, create, package, publish, commit, cleanup
+#  callbacks: <none>
+#
+##############################################################################
+
+function cleanup() {
+    echo "Cleanup"
+    builder_cleanup
+}
diff --git a/xmlstarlet-1.2.0-win32.zip.sha1sum b/xmlstarlet-1.2.0-win32.zip.sha1sum
deleted file mode 100644
index 1d35798..0000000
--- a/xmlstarlet-1.2.0-win32.zip.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-f245a48908ad16810c369fd2b8f73b32ab5f5d4c  /usr/portage/distfiles/xmlstarlet-1.2.0-win32.zip
diff --git a/xmlstarlet-1.3.1-win32.zip.sha1sum b/xmlstarlet-1.3.1-win32.zip.sha1sum
new file mode 100644
index 0000000..c86217d
--- /dev/null
+++ b/xmlstarlet-1.3.1-win32.zip.sha1sum
@@ -0,0 +1 @@
+87c5bf237b273725084ec9eeb2eab9353c6079a9  /home/mario/.opsi-dist-cache/xmlstarlet-1.3.1/X86/xmlstarlet-1.3.1-win32.zip