From 42f4fb868e0cda07c21e613155479de33ef0a5f9 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sat, 28 Jan 2012 22:23:08 +0100 Subject: [PATCH] move to new build system --- CLIENT_DATA/setup32.ins | 5 +- ReadMe.txt | 20 +++ build.sh | 121 ------------------ builder-product.cfg | 27 ++++ builder-targets-cb.sh | 33 +++++ ...er-uninstall.au3 => ppviewer-uninstall.au3 | Bin 6 files changed, 84 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 rename CLIENT_DATA/ppviewer-uninstall.au3 => ppviewer-uninstall.au3 (100%) diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index 13ef557..ce6ea85 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 - ; ---------------------------------------------------------------- @@ -83,7 +86,7 @@ endif ; ; === MSI package ======================================================================================= ; You may use the parameter PIDKEY=$Licensekey$ -"%ScriptPath%\X86FILE" /quiet /passive /norestart +"$InstallerExe$" /quiet /passive /norestart ; [Files_install] diff --git a/ReadMe.txt b/ReadMe.txt new file mode 100644 index 0000000..afbfc52 --- /dev/null +++ b/ReadMe.txt @@ -0,0 +1,20 @@ +############################################################ +# Uninstall Problems +############################################################ + +To work around the silent uinstall problems of PowerPoint + Viewer 2010 a AutoIT Script was created that waits for + the Process Running Window and then automatically + ignores the Running Processes. + +############################################################ +# Creating the ppviewer-uninstall.exe +############################################################ + +1. Downlad AutoIT v3 from + http://www.autoitscript.com/site/autoit/ and install it. +2. right click on the ppviewer-uninstall.au3 and + select compile +3. now you have ppviewer-uninstall.exe that will do a + silent uninstall +4. copy ppveiwer-uninstall.exe to CLIENT_DATA \ No newline at end of file diff --git a/build.sh b/build.sh deleted file mode 100644 index 4885d6e..0000000 --- a/build.sh +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/sh -PN="ppviewer" -VERSION="2010" -RELEASE="5" -PRIORITY="0" -ADVICE="" -TYPE="restrict" -# all downloads should not have any traling parameters like ?downlaodid=1234 .....(should rewrite in python) -ICON="http://microsoftfeed.com/wp-content/uploads/2010/05/PowerPoint.png" -X86="http://download.microsoft.com/download/9/F/7/9F742C8F-8C70-4498-B4D1-539BE36A1077/PowerPointViewer.exe" -#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/*.ins - - 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..ad7afe3 --- /dev/null +++ b/builder-product.cfg @@ -0,0 +1,27 @@ +############################ +# Setup product information +############################ +VENDOR="microsoft.com" +PN="ppviewer" +VERSION="2010" +RELEASE="5" +PRIORITY="0" +ADVICE="" + +TYPE="restrict" + +##################### +# File object array +##################### + +FILE[0]="PowerPoint.png" +SOURCE[0]="http://microsoftfeed.com/wp-content/uploads/2010/05/PowerPoint.png" + +FILE[1]="PowerPointViewer.exe" +SOURCE[1]="http://download.microsoft.com/download/9/F/7/9F742C8F-8C70-4498-B4D1-539BE36A1077/PowerPointViewer.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..11e068e --- /dev/null +++ b/builder-targets-cb.sh @@ -0,0 +1,33 @@ +############################ +# Setup product information +############################ +VENDOR="softmaker.de" +PN="tmviewer" +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]="TextMakerViewer2010.msi" +SOURCE[1]="http://internal.graz.disconnected-by-peer.at/Orig/SoftMaker/Viewer/HB/2010/TextMakerViewer2010.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/CLIENT_DATA/ppviewer-uninstall.au3 b/ppviewer-uninstall.au3 similarity index 100% rename from CLIENT_DATA/ppviewer-uninstall.au3 rename to ppviewer-uninstall.au3