From 0fefc09ede8b298930051dbd9109e11229971d5a Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Wed, 16 May 2012 06:40:48 +0200
Subject: [PATCH] bump and move to new name and build scripts
---
CLIENT_DATA/setup.ins | 83 ++++----------------
OPSI/control | 2 +-
Testing.txt | 28 +++++++
build.sh | 133 --------------------------------
builder-product.cfg | 29 +++++++
builder-targets-cb.sh | 25 ++++++
fontreg-2.1.3-redist.7z.sha1sum | 1 -
7 files changed, 99 insertions(+), 202 deletions(-)
create mode 100644 Testing.txt
delete mode 100644 build.sh
create mode 100644 builder-product.cfg
create mode 100644 builder-targets-cb.sh
delete mode 100644 fontreg-2.1.3-redist.7z.sha1sum
diff --git a/CLIENT_DATA/setup.ins b/CLIENT_DATA/setup.ins
index 390e874..bf596f3 100644
--- a/CLIENT_DATA/setup.ins
+++ b/CLIENT_DATA/setup.ins
@@ -6,19 +6,12 @@
[Actions]
requiredWinstVersion >= "4.10.8.6"
-DefVar $MsiId32$
-DefVar $UninstallProgram32$
-DefVar $MsiId64$
-DefVar $UninstallProgram64$
-DefVar $LogDir$
DefVar $ProductId$
DefVar $MinimumSpace$
DefVar $InstallDir32$
DefVar $InstallDir64$
DefVar $ExitCode$
-DefVar $LicenseRequired$
-DefVar $LicenseKey$
-DefVar $LicensePool$
+DefVar $LogDir$
DefVar $INST_SystemType$
DefVar $INST_architecture$
@@ -28,19 +21,27 @@ 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 -
; ----------------------------------------------------------------
;$ProductId$ should be the name of the product in opsi
; therefore please: only lower letters, no umlauts,
; no white space use '-' as a seperator
-Set $ProductId$ = "font-linux-libertine"
+Set $ProductId$ = "font.linuxlibertine"
Set $MinimumSpace$ = "10 MB"
; the path were we find the product after the installation
Set $InstallDir32$ = "%ProgramFiles32Dir%\Libertine"
Set $InstallDir64$ = "%ProgramFiles64Dir%\Libertine"
-Set $LicenseRequired$ = "false"
-Set $LicensePool$ = "p_" + $ProductId$
; ----------------------------------------------------------------
if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
@@ -51,16 +52,6 @@ else
comment "Show product picture"
ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
- if FileExists("%ScriptPath%\delsub.ins")
- comment "Start uninstall sub section"
- Sub "%ScriptPath%\delsub.ins"
- endif
-
- if $LicenseRequired$ = "true"
- comment "Licensing required, reserve license and get license key"
- Sub_get_licensekey
- endif
-
comment "installing"
if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
@@ -92,20 +83,16 @@ else
endif
[Winbatch_install_32]
-"%ScriptPath%\files\FontReg32.exe" /copy
+FontReg
[Files_install_32]
-; Example of recursively copying some files into the installation directory:
-;
-; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
+copy -s "$Fonts$" "%Systemroot%\Fonts"
[Winbatch_install_64]
-"%ScriptPath%\files\FontReg64.exe" /copy
+FontReg
[Files_install_64]
-; Example of recursively copying some files into the installation directory:
-;
-; copy -s "%ScriptPath%\files\*.*" "$InstallDir64$"
+copy -s "$Fonts$" "%Systemroot%\Fonts"
[Registry_install]
; Example of setting some values of an registry key:
@@ -149,44 +136,6 @@ endif
; icon_index: 2
; end_link
-[Sub_get_licensekey]
-if opsiLicenseManagementEnabled
- comment "License management is enabled and will be used"
-
- comment "Trying to get a license key"
- Set $LicenseKey$ = demandLicenseKey ($LicensePool$)
- ; If there is an assignment of exactly one licensepool to the product the following call is possible:
- ; Set $LicenseKey$ = demandLicenseKey ("", $ProductId$)
- ;
- ; If there is an assignment of a license pool to a windows software id, it is possible to use:
- ; DefVar $WindowsSoftwareId$
- ; $WindowsSoftwareId$ = "..."
- ; Set $LicenseKey$ = demandLicenseKey ("", "", $WindowsSoftwareId$)
-
- DefVar $ServiceErrorClass$
- set $ServiceErrorClass$ = getLastServiceErrorClass
- comment "Error class: " + $ServiceErrorClass$
-
- if $ServiceErrorClass$ = "None"
- comment "Everything fine, we got the license key '" + $LicenseKey$ + "'"
- else
- if $ServiceErrorClass$ = "LicenseConfigurationError"
- LogError "Fatal: license configuration must be corrected"
- LogError getLastServiceErrorMessage
- isFatalError
- else
- if $ServiceErrorClass$ = "LicenseMissingError"
- LogError "Fatal: required license is not supplied"
- isFatalError
- endif
- endif
- endif
-else
- LogError "Fatal: license required, but license management not enabled"
- isFatalError
-endif
-
-
[Sub_check_exitcode]
comment "Test for installation success via exit code"
set $ExitCode$ = getLastExitCode
diff --git a/OPSI/control b/OPSI/control
index 339e787..167a948 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -5,7 +5,7 @@ incremental: False
[Product]
type: localboot
-id: font-linux-libertine
+id: font.linuxlibertine
name: Linux Libertine Free Font
description: Linux Libertine Free Font
advice: ADVICE
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 23e892b..0000000
--- a/build.sh
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/sh
-PN="font-linux-libertine"
-VERSION="1.5.3"
-RELEASE="2"
-PRIORITY="0"
-ADVICE=""
-TYPE="public"
-# all downloads should not have any traling parameters like ?downlaodid=1234 .....(should rewrite in python)
-ICON="http://fontaday.com/wp-content/uploads/2010/07/libertine.png"
-X86="http://code.kliu.org/misc/fontreg/fontreg-2.1.3-redist.7z"
-X86_1="http://sourceforge.net/projects/linuxlibertine/files/linuxlibertine/5.1.3-2/LinLibertineOTF_5.1.3_2011_06_21.tgz"
-#AMD64="http://downloads.sourceforge.net/sevenzip/7z920-x64.msi"
-ICONFILE=${ICON##*/}
-X86FILE=${X86##*/}
-X86FILE_1=${X86_1##*/}
-#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
- mkdir -p $OUT/$PN/CLIENT_DATA/files
- #cp /usr/portage/distfiles/$X86FILE $OUT/$PN/CLIENT_DATA/files
- 7z x -o$OUT/$PN/CLIENT_DATA/files /usr/portage/distfiles/$X86FILE
- cp $OUT/$PN/CLIENT_DATA/files/bin.x86-32/FontReg.exe $OUT/$PN/CLIENT_DATA/files/FontReg32.exe
- cp $OUT/$PN/CLIENT_DATA/files/bin.x86-64/FontReg.exe $OUT/$PN/CLIENT_DATA/files/FontReg64.exe
- rm -rf $OUT/$PN/CLIENT_DATA/files/bin.* $OUT/$PN/CLIENT_DATA/files/src
- 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
- #plowdown -o /usr/portage/distfiles $X86
- exit 1
- fi
-
- if [ -e /usr/portage/distfiles/$X86FILE_1 ]
- then
- if [ -e $X86FILE_1.sha1sum ]
- then
- SHA1SUM=`cat $X86FILE_1.sha1sum`
- CHECKSUM=`sha1sum /usr/portage/distfiles/$X86FILE_1`
- if [ "$CHECKSUM" = "$SHA1SUM" ]
- then
- #cp /usr/portage/distfiles/$X86FILE $OUT/$PN/CLIENT_DATA
- #mkdir -p $OUT/$PN/CLIENT_DATA/files
- #7z e -o$OUT/$PN/CLIENT_DATA/files /usr/portage/distfiles/$X86FILE_1
- tar xzvf /usr/portage/distfiles/$X86FILE_1 -C $OUT/$PN/CLIENT_DATA/files
- else
- echo "The checksums do not match."
- exit 1
- fi
- else
- echo "You need to create the checksums with: sha1sum /usr/portage/distfiles/$X86FILE_1 > $X86FILE_1.sha1sum"
- exit 1
- fi
- else
- echo "Downloading file"
- wget -O /usr/portage/distfiles/$X86FILE_1 $X86_1
- #plowdown -o /usr/portage/distfiles $X86
- 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..a7f6179
--- /dev/null
+++ b/builder-product.cfg
@@ -0,0 +1,29 @@
+############################
+# Setup product information
+############################
+VENDOR="fedorahosted.org"
+PN="font.linuxlibertine"
+VERSION="5.1.3"
+RELEASE="3"
+PRIORITY="0"
+ADVICE=""
+
+# TYPE - defines, if the install files are public or restricted.
+# Valid value: restricted | public
+TYPE="public"
+
+#
+
+DL_FILE[0]="libertine.png"
+DL_SOURCE[0]="http://fontaday.com/wp-content/uploads/2010/07/libertine.png"
+
+DL_FILE[1]="LinLibertineOTF_5.1.3_2011_06_21.tgz"
+DL_SOURCE[1]="http://sourceforge.net/projects/linuxlibertine/files/linuxlibertine/5.1.3-2/LinLibertineOTF_5.1.3_2011_06_21.tgz"
+DL_ARCH[1]="X86"
+DL_EXTRACT_FORMAT[1]="targz"
+
+# File array index for the image showing while installing the program
+ICON_DL_INDEX=0
+
+WINST_NAME[0]="Fonts"
+WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1]@\\*.otf"
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/fontreg-2.1.3-redist.7z.sha1sum b/fontreg-2.1.3-redist.7z.sha1sum
deleted file mode 100644
index f18dbe6..0000000
--- a/fontreg-2.1.3-redist.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-a7ded5853f8ea326e944fa111ab15da0fec4c023 /usr/portage/distfiles/fontreg-2.1.3-redist.7z