From d83c66c74b8059451e48cd958ec6792f7e359668 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Sat, 28 Jan 2012 21:57:06 +0100
Subject: [PATCH 1/7] Move to new Build system

---
 PlanMakerViewer2010.msi.sha1sum |   2 +-
 ReadMe.txt                      |  14 ++++
 build.sh                        | 121 --------------------------------
 builder-product.cfg             |  33 +++++++++
 builder-targets-cb.sh           |  21 ++++++
 5 files changed, 69 insertions(+), 122 deletions(-)
 create mode 100644 ReadMe.txt
 delete mode 100644 build.sh
 create mode 100644 builder-product.cfg
 create mode 100644 builder-targets-cb.sh

diff --git a/PlanMakerViewer2010.msi.sha1sum b/PlanMakerViewer2010.msi.sha1sum
index 0d00445..4de018e 100644
--- a/PlanMakerViewer2010.msi.sha1sum
+++ b/PlanMakerViewer2010.msi.sha1sum
@@ -1 +1 @@
-1bc855fdf28c3ab185d7e848e7a227e2ea20042b  /usr/portage/distfiles/PlanMakerViewer2010.msi
+1bc855fdf28c3ab185d7e848e7a227e2ea20042b  /home/mario/opsi-dist.private/softmaker.de/pmviewer/2010/PlanMakerViewer2010.msi
diff --git a/ReadMe.txt b/ReadMe.txt
new file mode 100644
index 0000000..01badc1
--- /dev/null
+++ b/ReadMe.txt
@@ -0,0 +1,14 @@
+############################################################
+# Create msi packages:
+############################################################
+
+Requirements:
+
+1. Download WixEdit from http://wixedit.sourceforge.net/ and install it
+2. Download Softmaker Planmaker Viewer 2010 from http://www.officeviewers.de/
+3. Extract PMViewerSetup.exe into a temporary folder
+4. Copy TextMakerViewer2010.wxs to this folder
+5. Start WixEdit and open the wxs file
+6. Then select "Build" "Create MSI"
+7. When the creation is finisched you will find PlanMakerViewer2010.msi
+    in the temporary folder
\ No newline at end of file
diff --git a/build.sh b/build.sh
deleted file mode 100644
index cc7a3ec..0000000
--- a/build.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-PN="pmviewer"
-VERSION="2010"
-RELEASE="10"
-PRIORITY="0"
-ADVICE=""
-TYPE="restrict"
-# all downloads should not have any traling parameters like ?downlaodid=1234 .....(should rewrite in python)
-ICON="http://www.android-user.de/var/ezflow_site/storage/images/artikel/exklusiv-vorschau-auf-softmaker-office-fuer-android/softmaker-logo.png/25888-1-ger-DE/SoftMaker-Logo.png_medium.png"
-X86="http://internal.graz.disconnected-by-peer.at/Orig/SoftMaker/Viewer/HB/2010/PlanMakerViewer2010.msi"
-#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..2476fa4
--- /dev/null
+++ b/builder-product.cfg
@@ -0,0 +1,33 @@
+############################
+# Setup product information 
+############################
+VENDOR="softmaker.de"
+PN="pmviewer"
+VERSION="2010"
+RELEASE="10"
+PRIORITY="0"
+ADVICE=""
+
+TYPE="restrict"
+
+#####################
+# File object array
+#####################
+
+FILE[0]="SoftMaker-Logo.png_medium.png"
+SOURCE[0]="http://www.android-user.de/var/ezflow_site/storage/images/artikel/exklusiv-vorschau-auf-softmaker-office-fuer-android/softmaker-logo.png/25888-1-ger-DE/SoftMaker-Logo.png_medium.png"
+
+FILE[1]="PlanMakerViewer2010.msi"
+SOURCE[1]="http://internal.graz.disconnected-by-peer.at/Orig/SoftMaker/Viewer/HB/2010/PlanMakerViewer2010.msi"
+ARCH[1]="X86"
+WINST[1]="InstallMsi"
+
+# Download direct the executable
+#FILE[1]="TMViewerSetup.exe"
+#SOURCE[1]="http://www.softmaker.net/down/TMViewerSetup.exe"
+#ARCH[1]="X86"
+#WINST[1]="InstallExe"
+
+# File array index for the image showing while installing the program
+ICON_FILE_INDEX=0
+
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
new file mode 100644
index 0000000..224b29c
--- /dev/null
+++ b/builder-targets-cb.sh
@@ -0,0 +1,21 @@
+##############################################################################
+# This optional file "builder-targets-cb.sh" will be called by builder.sh 
+#
+#  target order: config, prepare, retrieve, create, package, publish, commit, cleanup
+#  callbacks: cb_package_makeproductfile
+#
+##############################################################################
+
+
+function create() { 
+    echo  "Create"
+    builder_create
+}
+
+function cleanup() {
+    echo "Cleanup:"
+    
+    local opsi_file=${OPSI_REPOS_PRODUCT_DIR}/${OPSI_REPOS_FILE_PATTERN}.opsi
+    cp -av ${OPSI_REPOS_PRODUCT_DIR}/${OPSI_REPOS_FILE_PATTERN}.opsi  /tmp
+    chmod 666 /tmp/${OPSI_REPOS_FILE_PATTERN}.opsi
+}

From 02952f9b782948e6a4b20f348192570dc05c427a Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Sat, 28 Jan 2012 22:14:52 +0100
Subject: [PATCH 2/7] correct missing variable entry

---
 CLIENT_DATA/setup32.ins |  5 ++++-
 builder-targets-cb.sh   | 48 +++++++++++++++++++++++++----------------
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 32875f5..c88c25d 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -19,6 +19,9 @@ DefVar $LicensePool$
 
 Set $LogDir$ = "%SystemDrive%\tmp"
 
+; Token BUILDER_VARIABLES will be replaced by opsi-builder.sh
+@@BUILDER_VARIABLES@@
+
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
@@ -87,7 +90,7 @@ endif
 ;
 ; === MSI package =======================================================================================
 ; You may use the parameter PIDKEY=$Licensekey$
-msiexec /i "%ScriptPath%\X86FILE" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress
+msiexec /i "$InstallMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress
 ;
 
 [Files_install]
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 224b29c..2476fa4 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -1,21 +1,33 @@
-##############################################################################
-# This optional file "builder-targets-cb.sh" will be called by builder.sh 
-#
-#  target order: config, prepare, retrieve, create, package, publish, commit, cleanup
-#  callbacks: cb_package_makeproductfile
-#
-##############################################################################
+############################
+# Setup product information 
+############################
+VENDOR="softmaker.de"
+PN="pmviewer"
+VERSION="2010"
+RELEASE="10"
+PRIORITY="0"
+ADVICE=""
 
+TYPE="restrict"
 
-function create() { 
-    echo  "Create"
-    builder_create
-}
+#####################
+# File object array
+#####################
+
+FILE[0]="SoftMaker-Logo.png_medium.png"
+SOURCE[0]="http://www.android-user.de/var/ezflow_site/storage/images/artikel/exklusiv-vorschau-auf-softmaker-office-fuer-android/softmaker-logo.png/25888-1-ger-DE/SoftMaker-Logo.png_medium.png"
+
+FILE[1]="PlanMakerViewer2010.msi"
+SOURCE[1]="http://internal.graz.disconnected-by-peer.at/Orig/SoftMaker/Viewer/HB/2010/PlanMakerViewer2010.msi"
+ARCH[1]="X86"
+WINST[1]="InstallMsi"
+
+# Download direct the executable
+#FILE[1]="TMViewerSetup.exe"
+#SOURCE[1]="http://www.softmaker.net/down/TMViewerSetup.exe"
+#ARCH[1]="X86"
+#WINST[1]="InstallExe"
+
+# File array index for the image showing while installing the program
+ICON_FILE_INDEX=0
 
-function cleanup() {
-    echo "Cleanup:"
-    
-    local opsi_file=${OPSI_REPOS_PRODUCT_DIR}/${OPSI_REPOS_FILE_PATTERN}.opsi
-    cp -av ${OPSI_REPOS_PRODUCT_DIR}/${OPSI_REPOS_FILE_PATTERN}.opsi  /tmp
-    chmod 666 /tmp/${OPSI_REPOS_FILE_PATTERN}.opsi
-}

From 283a9bb835cce504f74123e4278578d2a33fa180 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Sat, 28 Jan 2012 22:34:55 +0100
Subject: [PATCH 3/7] correct copy failure

---
 builder-targets-cb.sh | 79 +++++++++++++++++++++++++++++--------------
 1 file changed, 53 insertions(+), 26 deletions(-)

diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 2476fa4..639eff1 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -1,33 +1,60 @@
-############################
-# Setup product information 
-############################
-VENDOR="softmaker.de"
-PN="pmviewer"
-VERSION="2010"
-RELEASE="10"
-PRIORITY="0"
-ADVICE=""
+##############################################################################
+# 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>
+#
+##############################################################################
 
-TYPE="restrict"
+#function config() {
+#    echo "Config - doing some commands before calling the builder_config" 
+#    builder_config
+#    echo "Config - doing some commands after calling the builder_config" 
+#}
 
-#####################
-# File object array
-#####################
+#function prepare() { 
+#    echo "Prepare" 
+#    builder_prepare
+#}
 
-FILE[0]="SoftMaker-Logo.png_medium.png"
-SOURCE[0]="http://www.android-user.de/var/ezflow_site/storage/images/artikel/exklusiv-vorschau-auf-softmaker-office-fuer-android/softmaker-logo.png/25888-1-ger-DE/SoftMaker-Logo.png_medium.png"
+function retrieve() { 
+    echo "Retrieve" 
+    builder_retrieve
+}
 
-FILE[1]="PlanMakerViewer2010.msi"
-SOURCE[1]="http://internal.graz.disconnected-by-peer.at/Orig/SoftMaker/Viewer/HB/2010/PlanMakerViewer2010.msi"
-ARCH[1]="X86"
-WINST[1]="InstallMsi"
+function create() { 
+    echo  "Create"
+    builder_create
+}
 
-# Download direct the executable
-#FILE[1]="TMViewerSetup.exe"
-#SOURCE[1]="http://www.softmaker.net/down/TMViewerSetup.exe"
-#ARCH[1]="X86"
-#WINST[1]="InstallExe"
+function package() { 
+    echo "Package" 
+    builder_package
+}
 
-# File array index for the image showing while installing the program
-ICON_FILE_INDEX=0
+function publish() {
+    echo "Publish"
+    builder_publish
+}
 
+function commit() {
+    echo "Commit"
+    # builder_commit
+}
+function cleanup() {
+    echo "Cleanup: output_dir: $output_dir"
+    # builder_cleanup
+}

From 85fa9cd46f8bb8ef54c8c979d6a36484de87b1ae Mon Sep 17 00:00:00 2001
From: Daniel Schwager <daniel.schwager@dtnet.de>
Date: Mon, 30 Jan 2012 23:11:06 +0100
Subject: [PATCH 4/7] Convert builder-product.cfg to new devtools API

---
 builder-product.cfg | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/builder-product.cfg b/builder-product.cfg
index 2476fa4..12a3842 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -3,7 +3,7 @@
 ############################
 VENDOR="softmaker.de"
 PN="pmviewer"
-VERSION="2010"
+VERSION="2010-rev633"
 RELEASE="10"
 PRIORITY="0"
 ADVICE=""
@@ -14,20 +14,14 @@ TYPE="restrict"
 # File object array
 #####################
 
-FILE[0]="SoftMaker-Logo.png_medium.png"
-SOURCE[0]="http://www.android-user.de/var/ezflow_site/storage/images/artikel/exklusiv-vorschau-auf-softmaker-office-fuer-android/softmaker-logo.png/25888-1-ger-DE/SoftMaker-Logo.png_medium.png"
+DL_FILE[0]="SoftMaker-Logo.png_medium.png"
+DL_SOURCE[0]="http://www.android-user.de/var/ezflow_site/storage/images/artikel/exklusiv-vorschau-auf-softmaker-office-fuer-android/softmaker-logo.png/25888-1-ger-DE/SoftMaker-Logo.png_medium.png"
 
-FILE[1]="PlanMakerViewer2010.msi"
-SOURCE[1]="http://internal.graz.disconnected-by-peer.at/Orig/SoftMaker/Viewer/HB/2010/PlanMakerViewer2010.msi"
-ARCH[1]="X86"
-WINST[1]="InstallMsi"
-
-# Download direct the executable
-#FILE[1]="TMViewerSetup.exe"
-#SOURCE[1]="http://www.softmaker.net/down/TMViewerSetup.exe"
-#ARCH[1]="X86"
-#WINST[1]="InstallExe"
+DL_FILE[1]="PlanMakerViewer2010.msi"
+DL_SOURCE[1]="http://internal.graz.disconnected-by-peer.at/Orig/SoftMaker/Viewer/HB/2010/PlanMakerViewer2010.msi"
+DL_ARCH[1]="X86"
+DL_WINST[1]="InstallMsi"
 
 # File array index for the image showing while installing the program
-ICON_FILE_INDEX=0
+ICON_DL_INDEX=0
 

From 46a828d48a825b71f5a824899c8264c022864271 Mon Sep 17 00:00:00 2001
From: Daniel Schwager <daniel.schwager@dtnet.de>
Date: Mon, 30 Jan 2012 23:14:35 +0100
Subject: [PATCH 5/7] changed to rev633

---
 builder-product.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder-product.cfg b/builder-product.cfg
index 12a3842..65bbc8a 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -3,7 +3,7 @@
 ############################
 VENDOR="softmaker.de"
 PN="pmviewer"
-VERSION="2010-rev633"
+VERSION="2010.rev633"
 RELEASE="10"
 PRIORITY="0"
 ADVICE=""

From 9329c468c8be90f4cc0c9bed152a1a4c146bb81b Mon Sep 17 00:00:00 2001
From: Daniel Schwager <daniel.schwager@dtnet.de>
Date: Tue, 31 Jan 2012 00:08:52 +0100
Subject: [PATCH 6/7] typo

---
 builder-product.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder-product.cfg b/builder-product.cfg
index 65bbc8a..1ac40b9 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -20,7 +20,7 @@ DL_SOURCE[0]="http://www.android-user.de/var/ezflow_site/storage/images/artikel/
 DL_FILE[1]="PlanMakerViewer2010.msi"
 DL_SOURCE[1]="http://internal.graz.disconnected-by-peer.at/Orig/SoftMaker/Viewer/HB/2010/PlanMakerViewer2010.msi"
 DL_ARCH[1]="X86"
-DL_WINST[1]="InstallMsi"
+DL_WINST_NAME[1]="InstallMsi"
 
 # File array index for the image showing while installing the program
 ICON_DL_INDEX=0

From def7d69d5d606a878f1534b12c58a27a23e76ee5 Mon Sep 17 00:00:00 2001
From: Daniel Schwager <daniel.schwager@dtnet.de>
Date: Thu, 2 Feb 2012 17:27:01 +0100
Subject: [PATCH 7/7] renamed restric -> restricted

---
 builder-product.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder-product.cfg b/builder-product.cfg
index 1ac40b9..40b4a30 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -8,7 +8,7 @@ RELEASE="10"
 PRIORITY="0"
 ADVICE=""
 
-TYPE="restrict"
+TYPE="restricted"
 
 #####################
 # File object array