move to new buildsystem and bump
This commit is contained in:
Mario Fetka
parent
cdb7c61a36
commit
5d0a8019e5
|
|
@ -4,7 +4,6 @@
|
|||
; credits: http://www.opsi.org/credits/
|
||||
|
||||
|
||||
Set $MsiId$ = '{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}'
|
||||
Set $UninstallProgram$ = $InstallDir$ + "\iv_uninstall.exe"
|
||||
|
||||
Message "Uninstalling " + $ProductId$ + " ..."
|
||||
|
|
@ -14,11 +13,6 @@ if FileExists($UninstallProgram$)
|
|||
Winbatch_uninstall
|
||||
sub_check_exitcode
|
||||
endif
|
||||
if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId$ + "] DisplayName") = "")
|
||||
comment "MSI id " + $MsiId$ + " found in registry, starting msiexec to uninstall"
|
||||
Winbatch_uninstall_msi
|
||||
sub_check_exitcode
|
||||
endif
|
||||
|
||||
comment "Delete files"
|
||||
Files_uninstall /32Bit
|
||||
|
|
@ -34,9 +28,6 @@ LinkFolder_uninstall
|
|||
;
|
||||
"$UninstallProgram$" /silent
|
||||
|
||||
[Winbatch_uninstall_msi]
|
||||
msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress
|
||||
|
||||
[Files_uninstall]
|
||||
; Example for recursively deleting the installation directory (don't forget the trailing backslash):
|
||||
;
|
||||
|
|
|
|||
|
|
@ -6,19 +6,25 @@
|
|||
[Actions]
|
||||
requiredWinstVersion >= "4.10.8.6"
|
||||
|
||||
DefVar $MsiId$
|
||||
DefVar $UninstallProgram$
|
||||
DefVar $LogDir$
|
||||
DefVar $ProductId$
|
||||
DefVar $MinimumSpace$
|
||||
DefVar $InstallDir$
|
||||
DefVar $ExitCode$
|
||||
DefVar $LicenseRequired$
|
||||
DefVar $LicenseKey$
|
||||
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 -
|
||||
; ----------------------------------------------------------------
|
||||
|
|
@ -29,8 +35,6 @@ Set $ProductId$ = "irfanview"
|
|||
Set $MinimumSpace$ = "10 MB"
|
||||
; the path were we find the product after the installation
|
||||
Set $InstallDir$ = "%ProgramFiles32Dir%\IrfanView"
|
||||
Set $LicenseRequired$ = "false"
|
||||
Set $LicensePool$ = "p_" + $ProductId$
|
||||
; ----------------------------------------------------------------
|
||||
|
||||
if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
|
||||
|
|
@ -48,11 +52,6 @@ else
|
|||
|
||||
Message "Installing " + $ProductId$ + " ..."
|
||||
|
||||
if $LicenseRequired$ = "true"
|
||||
comment "Licensing required, reserve license and get license key"
|
||||
Sub_get_licensekey
|
||||
endif
|
||||
|
||||
comment "Start setup program"
|
||||
Winbatch_install
|
||||
Sub_check_exitcode
|
||||
|
|
@ -81,8 +80,8 @@ endif
|
|||
; Choose one of the following examples as basis for your installation
|
||||
; You can use $LicenseKey$ var to pass a license key to the installer
|
||||
;
|
||||
"%ScriptPath%\X86FILE" /silent /folder="$InstallDir$" /desktop=1 /thumbs=1 /group=1 /allusers=1 /assoc=1 /assocallusers=1 /ini="%AppdataDir%\irfanview"
|
||||
"%ScriptPath%\X86PLUGINSFILE" /silent
|
||||
"$InstallExe$" /silent /folder="$InstallDir$" /desktop=1 /thumbs=1 /group=1 /allusers=1 /assoc=1 /assocallusers=1 /ini="%AppdataDir%\irfanview"
|
||||
"$InstallPluginsExe$" /silent
|
||||
|
||||
[Files_install]
|
||||
; Example of recursively copying some files into the installation directory:
|
||||
|
|
@ -131,44 +130,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
|
||||
|
|
|
|||
|
|
@ -6,24 +6,29 @@
|
|||
[Actions]
|
||||
requiredWinstVersion >= "4.10.8.6"
|
||||
|
||||
DefVar $MsiId$
|
||||
DefVar $UninstallProgram$
|
||||
DefVar $LogDir$
|
||||
DefVar $ExitCode$
|
||||
DefVar $ProductId$
|
||||
DefVar $InstallDir$
|
||||
DefVar $LicenseRequired$
|
||||
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 -
|
||||
; ----------------------------------------------------------------
|
||||
Set $ProductId$ = "irfanview"
|
||||
Set $InstallDir$ = "%ProgramFiles32Dir%\IrfanView"
|
||||
Set $LicenseRequired$ = "false"
|
||||
Set $LicensePool$ = "p_" + $ProductId$
|
||||
; ----------------------------------------------------------------
|
||||
|
||||
|
||||
|
|
@ -37,29 +42,3 @@ if FileExists("%ScriptPath%\delsub32.ins")
|
|||
Sub "%ScriptPath%\delsub32.ins"
|
||||
endif
|
||||
|
||||
if $LicenseRequired$ = "true"
|
||||
comment "Licensing required, free license used"
|
||||
Sub_free_license
|
||||
endif
|
||||
|
||||
[Sub_free_license]
|
||||
if opsiLicenseManagementEnabled
|
||||
comment "License management is enabled and will be used"
|
||||
|
||||
comment "Trying to free license used for the product"
|
||||
DefVar $result$
|
||||
Set $result$ = FreeLicense($LicensePool$)
|
||||
; If there is an assignment of a license pool to the product, it is possible to use
|
||||
; Set $result$ = FreeLicense("", $ProductId$)
|
||||
;
|
||||
; If there is an assignment of a license pool to a windows software id, it is possible to use
|
||||
; DefVar $WindowsSoftwareId$
|
||||
; $WindowsSoftwareId$ = "..."
|
||||
; set $result$ = FreeLicense("", "", $WindowsSoftwareId$)
|
||||
else
|
||||
LogError "Error: licensing required, but license management not enabled"
|
||||
isFatalError
|
||||
endif
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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: ??
|
||||
|
||||
|
||||
146
build.sh
146
build.sh
|
|
@ -1,146 +0,0 @@
|
|||
#!/bin/sh
|
||||
PN="irfanview"
|
||||
VERSION="4.32"
|
||||
RELEASE="1"
|
||||
PRIORITY="0"
|
||||
ADVICE=""
|
||||
TYPE="public"
|
||||
# all downloads should not have any traling parameters like ?downlaodid=1234 .....(should rewrite in python)
|
||||
ICON="http://www.derby.co.nz/web-development/graphics/logo-irfanview.gif"
|
||||
X86="http://irfanview.tuwien.ac.at/iview432_setup.exe"
|
||||
X86PLUGINS="http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_432_setup.exe"
|
||||
#AMD64="http://downloads.sourceforge.net/sevenzip/7z920-x64.msi"
|
||||
ICONFILE=${ICON##*/}
|
||||
X86FILE="iview432_setup.exe"
|
||||
X86PLUGINSFILE=${X86PLUGINS##*/}
|
||||
#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/$X86PLUGINSFILE ]
|
||||
then
|
||||
if [ -e $X86PLUGINSFILE.sha1sum ]
|
||||
then
|
||||
SHA1SUM=`cat $X86PLUGINSFILE.sha1sum`
|
||||
CHECKSUM=`sha1sum /usr/portage/distfiles/$X86PLUGINSFILE`
|
||||
if [ "$CHECKSUM" = "$SHA1SUM" ]
|
||||
then
|
||||
cp /usr/portage/distfiles/$X86PLUGINSFILE $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/$X86PLUGINSFILE > $X86PLUGINSFILE.sha1sum"
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
echo "Downloading file"
|
||||
wget -O /usr/portage/distfiles/$X86PLUGINSFILE $X86PLUGINS
|
||||
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" -e "s!X86PLUGINSFILE!$X86PLUGINSFILE!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
|
||||
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
############################
|
||||
# Setup product information
|
||||
############################
|
||||
VENDOR="irfanview.tuwien.ac.at"
|
||||
PN="irfanview"
|
||||
VERSION="4.33"
|
||||
RELEASE="3"
|
||||
PRIORITY="0"
|
||||
ADVICE=""
|
||||
|
||||
# TYPE - defines, if the install files are public or restricted.
|
||||
# Valid value: restricted | public
|
||||
TYPE="public"
|
||||
|
||||
|
||||
DL_FILE[0]="preview-29-1353-280.jpg"
|
||||
DL_SOURCE[0]="http://skins13.wincustomize.com/6/89/689332/29/1353/preview-29-1353-280.jpg"
|
||||
|
||||
DL_FILE[1]="iview433_setup.exe"
|
||||
DL_SOURCE[1]="http://irfanview.tuwien.ac.at/iview433_setup.exe"
|
||||
DL_ARCH[1]="X86"
|
||||
DL_WINST_NAME[1]=InstallExe
|
||||
|
||||
DL_FILE[2]="irfanview_plugins_433_setup.exe"
|
||||
DL_SOURCE[2]="http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_433_setup.exe"
|
||||
DL_ARCH[2]="X86"
|
||||
DL_WINST_NAME[2]=InstallPluginsExe
|
||||
|
||||
# File array index for the image showing while installing the program
|
||||
ICON_DL_INDEX=0
|
||||
|
||||
|
|
@ -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
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
fcaad92ad45f352b2f2240a5f412435278d05a2d /usr/portage/distfiles/irfanview_plugins_432_setup.exe
|
||||
|
|
@ -0,0 +1 @@
|
|||
f76828edbcc3f3b98507298bd4fe975863a2833e /home/mario/.opsi-dist-cache/irfanview-4.33/X86/irfanview_plugins_433_setup.exe
|
||||
|
|
@ -1 +0,0 @@
|
|||
de461c736058fb81948dd6b10426b3faea5f6c27 /usr/portage/distfiles/iview432_setup.exe
|
||||
|
|
@ -0,0 +1 @@
|
|||
79a7ebe2325ad204712761aa3c3a072025b07784 /home/mario/.opsi-dist-cache/irfanview-4.33/X86/iview433_setup.exe
|
||||
|
|
@ -1 +0,0 @@
|
|||
7bbbe9d4f18317e44f507dc1b32e2511dda89ad8 /usr/portage/distfiles/logo-irfanview.gif
|
||||
|
|
@ -0,0 +1 @@
|
|||
b9301bcf49d58f97fcfe9d017e88e28393d183ab /home/mario/.opsi-dist-cache/irfanview-4.33//preview-29-1353-280.jpg
|
||||
Loading…
Reference in New Issue