Mve to new buildsystem

This commit is contained in:
Mario Fetka 2012-05-15 22:11:04 +02:00
parent 9aebb62c37
commit f63c1c4ae3
8 changed files with 107 additions and 72 deletions

View File

@ -6,19 +6,12 @@
[Actions] [Actions]
requiredWinstVersion >= "4.10.8.6" requiredWinstVersion >= "4.10.8.6"
DefVar $MsiId32$
DefVar $UninstallProgram32$
DefVar $MsiId64$
DefVar $UninstallProgram64$
DefVar $LogDir$
DefVar $ProductId$ DefVar $ProductId$
DefVar $MinimumSpace$ DefVar $MinimumSpace$
DefVar $InstallDir32$ DefVar $InstallDir32$
DefVar $InstallDir64$ DefVar $InstallDir64$
DefVar $ExitCode$ DefVar $ExitCode$
DefVar $LicenseRequired$ DefVar $LogDir$
DefVar $LicenseKey$
DefVar $LicensePool$
DefVar $INST_SystemType$ DefVar $INST_SystemType$
DefVar $INST_architecture$ DefVar $INST_architecture$
@ -28,19 +21,27 @@ set $INST_architecture$ = GetProductProperty("install_architecture","system spec
Set $LogDir$ = "%SystemDrive%\tmp" 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 - ; - Please edit the following values -
; ---------------------------------------------------------------- ; ----------------------------------------------------------------
;$ProductId$ should be the name of the product in opsi ;$ProductId$ should be the name of the product in opsi
; therefore please: only lower letters, no umlauts, ; therefore please: only lower letters, no umlauts,
; no white space use '-' as a seperator ; no white space use '-' as a seperator
Set $ProductId$ = "font-gentium-plus" Set $ProductId$ = "font.gentiumplus"
Set $MinimumSpace$ = "10 MB" Set $MinimumSpace$ = "10 MB"
; the path were we find the product after the installation ; the path were we find the product after the installation
Set $InstallDir32$ = "%ProgramFiles32Dir%\GentiumPlus" Set $InstallDir32$ = "%ProgramFiles32Dir%\Gentium"
Set $InstallDir64$ = "%ProgramFiles64Dir%\GentiumPlus" Set $InstallDir64$ = "%ProgramFiles64Dir%\Gentium"
Set $LicenseRequired$ = "false"
Set $LicensePool$ = "p_" + $ProductId$
; ---------------------------------------------------------------- ; ----------------------------------------------------------------
if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$)) if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
@ -51,16 +52,6 @@ else
comment "Show product picture" comment "Show product picture"
ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$ 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" comment "installing"
if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only") 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 endif
[Winbatch_install_32] [Winbatch_install_32]
"%ScriptPath%\files\FontReg32.exe" /copy FontReg
[Files_install_32] [Files_install_32]
; Example of recursively copying some files into the installation directory: copy -s "$Fonts$" "%Systemroot%\Fonts"
;
; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
[Winbatch_install_64] [Winbatch_install_64]
"%ScriptPath%\files\FontReg64.exe" /copy FontReg
[Files_install_64] [Files_install_64]
; Example of recursively copying some files into the installation directory: copy -s "$Fonts$" "%Systemroot%\Fonts"
;
; copy -s "%ScriptPath%\files\*.*" "$InstallDir64$"
[Registry_install] [Registry_install]
; Example of setting some values of an registry key: ; Example of setting some values of an registry key:
@ -149,44 +136,6 @@ endif
; icon_index: 2 ; icon_index: 2
; end_link ; 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] [Sub_check_exitcode]
comment "Test for installation success via exit code" comment "Test for installation success via exit code"
set $ExitCode$ = getLastExitCode set $ExitCode$ = getLastExitCode

View File

@ -1 +0,0 @@
0d331ff59ea21bd657a9bd1bbe6e5a9f862fdc17 /usr/portage/distfiles/GentiumPlus-1.504.zip

View File

@ -0,0 +1 @@
1e4e9353da9a032bae7fa1533221aa81a4d09e14 /home/mario/.opsi-dist-cache/font.gentiumplus-1.508/X86/GentiumPlus-1.508.zip

View File

@ -5,7 +5,7 @@ incremental: False
[Product] [Product]
type: localboot type: localboot
id: font-gentium-plus id: font.gentiumplus
name: Gentium Plus Free Font name: Gentium Plus Free Font
description: Gentium Plus Free Font description: Gentium Plus Free Font
advice: ADVICE advice: ADVICE
@ -31,3 +31,8 @@ description: which architecture (32/64 bit) has to be installed
values: ["32 only", "64 only", "both", "system specific"] values: ["32 only", "64 only", "both", "system specific"]
default: ["system specific"] default: ["system specific"]
[ProductDependency]
action: setup
requiredProduct: kliu.fontreg
requiredStatus: installed
requirementType: before

28
Testing.txt Normal file
View File

@ -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: ??

29
builder-product.cfg Normal file
View File

@ -0,0 +1,29 @@
############################
# Setup product information
############################
VENDOR="scripts.sil.org"
PN="font.gentiumplus"
VERSION="1.508"
RELEASE="3"
PRIORITY="0"
ADVICE=""
# TYPE - defines, if the install files are public or restricted.
# Valid value: restricted | public
TYPE="public"
#
DL_FILE[0]="SIL-Logo-No-Tag-Color.jpg"
DL_SOURCE[0]="http://www.wycliffe.org/images/ABOUT/Logos/SIL-Logo-No-Tag-Color.jpg"
DL_FILE[1]="GentiumPlus-1.508.zip"
DL_SOURCE[1]="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=GentiumPlus-1.508.zip&filename=GentiumPlus-1.508.zip"
DL_ARCH[1]="X86"
DL_EXTRACT_FORMAT[1]="unzip"
# 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]@\\GentiumPlus-1.508\\*.ttf"

25
builder-targets-cb.sh Normal file
View 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
}

View File

@ -1 +0,0 @@
a7ded5853f8ea326e944fa111ab15da0fec4c023 /usr/portage/distfiles/fontreg-2.1.3-redist.7z