Bump to new buildsystem
This commit is contained in:
Mario Fetka
parent
5a34279a56
commit
29bb5c3689
@ -9,11 +9,6 @@ Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe"
|
||||
|
||||
Message "Uninstalling " + $ProductId$ + " ..."
|
||||
|
||||
if FileExists($UninstallProgram$)
|
||||
comment "Uninstall program found, starting uninstall"
|
||||
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
|
||||
@ -29,23 +24,13 @@ Registry_uninstall /32Bit
|
||||
comment "Delete program shortcuts"
|
||||
LinkFolder_uninstall
|
||||
|
||||
[Winbatch_uninstall]
|
||||
; Choose one of the following examples as basis for program uninstall
|
||||
;
|
||||
; === Nullsoft Scriptable Install System ================================================================
|
||||
; "$UninstallProgram$" /S
|
||||
;
|
||||
; === Inno Setup ========================================================================================
|
||||
; "$UninstallProgram$" /silent /norestart
|
||||
|
||||
|
||||
[Winbatch_uninstall_msi]
|
||||
msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress
|
||||
|
||||
[Files_uninstall]
|
||||
; Example for recursively deleting the installation directory (don't forget the trailing backslash):
|
||||
;
|
||||
; delete -sf "$InstallDir$\"
|
||||
delete -sf "$InstallDir$\"
|
||||
|
||||
[Registry_uninstall]
|
||||
; Example of deleting a registry key:
|
||||
|
||||
@ -7,18 +7,24 @@
|
||||
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$ = "skype"
|
||||
Set $MinimumSpace$ = "30 MB"
|
||||
; the path were we find the product after the installation
|
||||
Set $InstallDir$ = "%ProgramFiles32Dir%\Skype"
|
||||
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
|
||||
@ -78,24 +77,18 @@ else
|
||||
endif
|
||||
|
||||
[Winbatch_install]
|
||||
; 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$
|
||||
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]
|
||||
; Example of recursively copying some files into the installation directory:
|
||||
;
|
||||
; copy -s "%ScriptPath%\files\*.*" "$InstallDir$"
|
||||
copy -s "$InstallExe$" "$InstallDir$"
|
||||
|
||||
[Registry_install]
|
||||
; Example of setting some values of an registry key:
|
||||
;
|
||||
; openkey [HKEY_LOCAL_MACHINE\Software\$ProductId$]
|
||||
; set "name1" = "some string value"
|
||||
openkey [HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Run]
|
||||
set "KillSkypeHome" = "$InstallDir$\KillSkypeHome.exe"
|
||||
; set "name2" = REG_DWORD:0001
|
||||
; set "name3" = REG_BINARY:00 af 99 cd
|
||||
|
||||
@ -133,44 +126,6 @@ msiexec /i "%ScriptPath%\X86FILE" /l* "$LogDir$\$ProductId$.install_log.txt" /qb
|
||||
; 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
|
||||
|
||||
@ -7,23 +7,28 @@
|
||||
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$ = "skype"
|
||||
Set $InstallDir$ = "%ProgramFiles32Dir%\Skype"
|
||||
Set $LicenseRequired$ = "false"
|
||||
Set $LicensePool$ = "p_" + $ProductId$
|
||||
; ----------------------------------------------------------------
|
||||
|
||||
|
||||
@ -36,30 +41,3 @@ if FileExists("%ScriptPath%\delsub32.ins")
|
||||
comment "Start uninstall sub section"
|
||||
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
|
||||
|
||||
|
||||
|
||||
|
||||
1
KillSkypeHome.exe.sha1sum
Normal file
1
KillSkypeHome.exe.sha1sum
Normal file
@ -0,0 +1 @@
|
||||
0c22c2f3ba6bce7e6501f84260ca254667b244af /home/mario/.opsi-dist-cache/skype-5.8.32.156/X86_64/KillSkypeHome.exe
|
||||
1
SkypeSetup-5.8.32.156.msi.sha1sum
Normal file
1
SkypeSetup-5.8.32.156.msi.sha1sum
Normal file
@ -0,0 +1 @@
|
||||
e41c5fb8228ed6b730f26ddaf8669f89e44b86cf /home/mario/.opsi-dist-cache/skype-5.8.32.156/X86/SkypeSetup-5.8.32.156.msi
|
||||
@ -1 +0,0 @@
|
||||
834835ff1cc427946e4b6c15f9bea8fad565e8c4 /usr/portage/distfiles/SkypeSetup.msi
|
||||
@ -1 +0,0 @@
|
||||
fca147f59a62408e12bfa70c8abb9b58cbe3a80b /usr/portage/distfiles/Skype_logo.png
|
||||
121
build.sh
121
build.sh
@ -1,121 +0,0 @@
|
||||
#!/bin/sh
|
||||
PN="skype"
|
||||
VERSION="5.3.32.120"
|
||||
RELEASE="2"
|
||||
PRIORITY="0"
|
||||
ADVICE=""
|
||||
TYPE="public"
|
||||
# all downloads should not have any traling parameters like ?downlaodid=1234 .....(should rewrite in python)
|
||||
ICON="http://edutechdatabase.wikispaces.com/file/view/Skype_logo.png/190117730/Skype_logo.png"
|
||||
X86="http://download.skype.com/SkypeSetup.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
|
||||
|
||||
31
builder-product.cfg
Normal file
31
builder-product.cfg
Normal file
@ -0,0 +1,31 @@
|
||||
############################
|
||||
# Setup product information
|
||||
############################
|
||||
VENDOR="microsoft.com"
|
||||
PN="skype"
|
||||
VERSION="5.8.32.156"
|
||||
RELEASE="1"
|
||||
PRIORITY="0"
|
||||
ADVICE=""
|
||||
|
||||
# TYPE - defines, if the install files are public or restricted.
|
||||
# Valid value: restricted | public
|
||||
TYPE="public"
|
||||
|
||||
|
||||
DL_FILE[0]="microsoft-kauft-skype.jpg"
|
||||
DL_SOURCE[0]="http://www.iphone-news.org/wp-content/uploads/2011/05/microsoft-kauft-skype.jpg"
|
||||
|
||||
DL_FILE[1]="SkypeSetup-${VERSION}.msi"
|
||||
DL_SOURCE[1]="http://download.skype.com/SkypeSetup.msi"
|
||||
DL_ARCH[1]="X86"
|
||||
DL_WINST_NAME[1]=InstallMsi
|
||||
|
||||
DL_FILE[2]="KillSkypeHome.exe"
|
||||
DL_SOURCE[2]="http://sourceforge.net/projects/killskypehome/files/KillSkypeHome/Version%201.0/KillSkypeHome.exe"
|
||||
DL_ARCH[2]="X86"
|
||||
DL_WINST_NAME[2]=InstallExe
|
||||
|
||||
# File array index for the image showing while installing the program
|
||||
ICON_DL_INDEX=0
|
||||
|
||||
25
builder-targets-cb.sh
Normal file
25
builder-targets-cb.sh
Normal file
@ -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
microsoft-kauft-skype.jpg.sha1sum
Normal file
1
microsoft-kauft-skype.jpg.sha1sum
Normal file
@ -0,0 +1 @@
|
||||
fc73707a95a70d255c72a88429371762937bc59f /home/mario/.opsi-dist-cache/skype-5.8.32.156//microsoft-kauft-skype.jpg
|
||||
Loading…
Reference in New Issue
Block a user