Move to new buildsystem and rename
This commit is contained in:
Mario Fetka
parent
2172b8a618
commit
ddd9e55bc2
|
|
@ -4,10 +4,8 @@
|
|||
; credits: http://www.opsi.org/credits/
|
||||
|
||||
|
||||
Set $MsiId32$ = '{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}'
|
||||
Set $UninstallProgram32$ = $InstallDir32$ + "\unins000.exe"
|
||||
|
||||
Set $MsiId64$ = '{23170F69-40C1-2702-0920-000001000000}'
|
||||
Set $UninstallProgram32$ = $InstallDir64$ + "\unins000.exe"
|
||||
|
||||
if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
|
||||
|
|
@ -19,12 +17,6 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
|
|||
sub_check_exitcode
|
||||
endif
|
||||
|
||||
if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId32$ + "] DisplayName") = "")
|
||||
comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
|
||||
Winbatch_uninstall_msi_32
|
||||
sub_check_exitcode
|
||||
endif
|
||||
|
||||
comment "Delete files"
|
||||
Files_uninstall_32 /32Bit
|
||||
comment "Cleanup registry"
|
||||
|
|
@ -40,12 +32,6 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
|
|||
sub_check_exitcode
|
||||
endif
|
||||
|
||||
if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId64$ + "] DisplayName") = "")
|
||||
comment "MSI id " + $MsiId64$ + " found in registry, starting msiexec to uninstall"
|
||||
Winbatch_uninstall_msi_64
|
||||
sub_check_exitcode
|
||||
endif
|
||||
|
||||
comment "Delete files"
|
||||
Files_uninstall_64 /64Bit
|
||||
comment "Cleanup registry"
|
||||
|
|
@ -56,30 +42,16 @@ comment "Delete program shortcuts"
|
|||
LinkFolder_uninstall
|
||||
|
||||
[Winbatch_uninstall_32]
|
||||
; Choose one of the following examples as basis for program uninstall
|
||||
;
|
||||
; === Nullsoft Scriptable Install System ================================================================
|
||||
"$UninstallProgram32$" /VERYSILENT
|
||||
|
||||
|
||||
[Winbatch_uninstall_msi_32]
|
||||
msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
|
||||
|
||||
[Files_uninstall_32]
|
||||
; Example for recursively deleting the installation directory (don't forget the trailing backslash):
|
||||
;
|
||||
; delete -sf "$InstallDir32$\"
|
||||
|
||||
[Winbatch_uninstall_64]
|
||||
; Choose one of the following examples as basis for program uninstall
|
||||
;
|
||||
; === Nullsoft Scriptable Install System ================================================================
|
||||
"$UninstallProgram64$" /VERYSILENT
|
||||
|
||||
|
||||
[Winbatch_uninstall_msi_64]
|
||||
msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress
|
||||
|
||||
[Files_uninstall_64]
|
||||
; Example for recursively deleting the installation directory (don't forget the trailing backslash):
|
||||
;
|
||||
|
|
|
|||
|
|
@ -6,9 +6,7 @@
|
|||
[Actions]
|
||||
requiredWinstVersion >= "4.10.8.6"
|
||||
|
||||
DefVar $MsiId32$
|
||||
DefVar $UninstallProgram32$
|
||||
DefVar $MsiId64$
|
||||
DefVar $UninstallProgram64$
|
||||
DefVar $LogDir$
|
||||
DefVar $ProductId$
|
||||
|
|
@ -16,9 +14,6 @@ DefVar $MinimumSpace$
|
|||
DefVar $InstallDir32$
|
||||
DefVar $InstallDir64$
|
||||
DefVar $ExitCode$
|
||||
DefVar $LicenseRequired$
|
||||
DefVar $LicenseKey$
|
||||
DefVar $LicensePool$
|
||||
DefVar $INST_SystemType$
|
||||
DefVar $INST_architecture$
|
||||
|
||||
|
|
@ -34,13 +29,11 @@ Set $LogDir$ = "%SystemDrive%\tmp"
|
|||
;$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$ = "taskbarshuffle"
|
||||
Set $ProductId$ = "nerdcave.taskbarshuffle"
|
||||
Set $MinimumSpace$ = "3 MB"
|
||||
; the path were we find the product after the installation
|
||||
Set $InstallDir32$ = "%ProgramFiles32Dir%\Taskbar Shuffle"
|
||||
Set $InstallDir64$ = "%ProgramFiles64Dir%\Taskbar Shuffle"
|
||||
Set $LicenseRequired$ = "false"
|
||||
Set $LicensePool$ = "p_" + $ProductId$
|
||||
; ----------------------------------------------------------------
|
||||
|
||||
if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
|
||||
|
|
@ -56,13 +49,6 @@ else
|
|||
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")
|
||||
Message "Installing " + $ProductId$ + " 32 Bit..."
|
||||
comment "Start setup program"
|
||||
|
|
@ -92,11 +78,7 @@ else
|
|||
endif
|
||||
|
||||
[Winbatch_install_32]
|
||||
; Choose one of the following examples as basis for your installation
|
||||
; You can use $LicenseKey$ var to pass a license key to the installer
|
||||
;
|
||||
; === Nullsoft Scriptable Install System ================================================================
|
||||
"%ScriptPath%\X86FILE" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
|
||||
"$Install32Exe$" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
|
||||
|
||||
[Files_install_32]
|
||||
; Example of recursively copying some files into the installation directory:
|
||||
|
|
@ -104,12 +86,7 @@ endif
|
|||
; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
|
||||
|
||||
[Winbatch_install_64]
|
||||
; Choose one of the following examples as basis for your installation
|
||||
; You can use $LicenseKey$ var to pass a license key to the installer
|
||||
;
|
||||
; === MSI package =======================================================================================
|
||||
; You may use the parameter PIDKEY=$Licensekey$
|
||||
"%ScriptPath%\AMD64FILE" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
|
||||
"$Install64Exe$" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
|
||||
|
||||
[Files_install_64]
|
||||
; Example of recursively copying some files into the installation directory:
|
||||
|
|
@ -158,44 +135,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,17 +6,13 @@
|
|||
[Actions]
|
||||
requiredWinstVersion >= "4.10.8.6"
|
||||
|
||||
DefVar $MsiId32$
|
||||
DefVar $UninstallProgram32$
|
||||
DefVar $MsiId64$
|
||||
DefVar $UninstallProgram64$
|
||||
DefVar $LogDir$
|
||||
DefVar $ExitCode$
|
||||
DefVar $ProductId$
|
||||
DefVar $InstallDir32$
|
||||
DefVar $InstallDir64$
|
||||
DefVar $LicenseRequired$
|
||||
DefVar $LicensePool$
|
||||
DefVar $INST_SystemType$
|
||||
DefVar $INST_architecture$
|
||||
|
||||
|
|
@ -29,7 +25,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
|
|||
; ----------------------------------------------------------------
|
||||
; - Please edit the following values -
|
||||
; ----------------------------------------------------------------
|
||||
Set $ProductId$ = "taskbarshuffle"
|
||||
Set $ProductId$ = "nerdcave.taskbarshuffle"
|
||||
Set $InstallDir32$ = "%ProgramFiles32Dir%\Taskbar Shuffle"
|
||||
Set $InstallDir64$ = "%ProgramFiles64Dir%\Taskbar Shuffle"
|
||||
Set $LicenseRequired$ = "false"
|
||||
|
|
@ -47,29 +43,3 @@ if FileExists("%ScriptPath%\delsub.ins")
|
|||
Sub "%ScriptPath%\delsub.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
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ incremental: False
|
|||
|
||||
[Product]
|
||||
type: localboot
|
||||
id: taskbarshuffle
|
||||
id: nerdcave.taskbarshuffle
|
||||
name: Taskbar Shuffle
|
||||
description: Taskbar Shuffle is a simple, small, free utility that lets you drag and drop your Windows taskbar buttons to rearrange them.
|
||||
advice: ADVICE
|
||||
|
|
|
|||
|
|
@ -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: ??
|
||||
|
||||
|
||||
120
build.sh
120
build.sh
|
|
@ -1,120 +0,0 @@
|
|||
#!/bin/sh
|
||||
PN="taskbarshuffle"
|
||||
VERSION="2.5"
|
||||
RELEASE="2"
|
||||
PRIORITY="0"
|
||||
ADVICE=""
|
||||
TYPE="public"
|
||||
# all downloads should not have any traling parameters like ?downlaodid=1234 .....(should rewrite in python)
|
||||
ICON="http://www.freewebs.com/nerdcave/images/ts2.5-small.gif"
|
||||
X86="http://nerdcave.webs.com/downloads/ts2.5_setup.exe"
|
||||
AMD64="http://nerdcave.webs.com/downloads/ts2.5_setup64.exe"
|
||||
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 -P /usr/portage/distfiles/ $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
|
||||
|
||||
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="nerdcave.webs.com"
|
||||
PN="nerdcave.taskbarshuffle"
|
||||
VERSION="2.5"
|
||||
RELEASE="3"
|
||||
PRIORITY="0"
|
||||
ADVICE=""
|
||||
|
||||
# TYPE - defines, if the install files are public or restricted.
|
||||
# Valid value: restricted | public
|
||||
TYPE="public"
|
||||
|
||||
|
||||
DL_FILE[0]="taskbar-shuffle-portable-6.jpg"
|
||||
DL_SOURCE[0]="http://screenshots.de.sftcdn.net/de/scrn/83000/83890/taskbar-shuffle-portable-6.jpg"
|
||||
|
||||
DL_FILE[1]="ts2.5_setup.exe"
|
||||
DL_SOURCE[1]="http://dl.dropbox.com/u/1644845/TS/ts2.5_setup.exe"
|
||||
DL_ARCH[1]="X86"
|
||||
DL_WINST_NAME[1]=Install32Exe
|
||||
|
||||
DL_FILE[2]="ts2.5_setup64.exe"
|
||||
DL_SOURCE[2]="http://dl.dropbox.com/u/1644845/TS/ts2.5_setup64.exe"
|
||||
DL_ARCH[2]="X86_64"
|
||||
DL_WINST_NAME[2]=Install64Exe
|
||||
|
||||
# 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
|
||||
}
|
||||
|
|
@ -0,0 +1 @@
|
|||
44944ce992c4169c5612d43191af2aa5e52532b3 /home/mario/.opsi-dist-cache/nerdcave.taskbarshuffle-2.5//taskbar-shuffle-portable-6.jpg
|
||||
|
|
@ -1 +0,0 @@
|
|||
2335216de7fd2830bc704d3d432341e2288c3431 /usr/portage/distfiles/ts2.5-small.gif
|
||||
Loading…
Reference in New Issue