nove to new buildsystem and use upstream package and rename package

This commit is contained in:
Mario Fetka
2012-05-03 20:30:27 +02:00
parent 96b83c59d3
commit 0338c870b5
11 changed files with 130 additions and 173 deletions

View File

@@ -5,15 +5,9 @@
Set $MsiId$ = '{AC76BA86-1033-F400-BA7E-100000000002}'
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,16 +23,6 @@ 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

View File

@@ -7,7 +7,6 @@
requiredWinstVersion >= "4.10.8.6"
DefVar $MsiId$
DefVar $UninstallProgram$
DefVar $LogDir$
DefVar $ProductId$
DefVar $MinimumSpace$
@@ -19,13 +18,23 @@ 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 -
; ----------------------------------------------------------------
;$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$ = "adobeacrobat-7"
Set $ProductId$ = "adobe.acrobat-7"
Set $MinimumSpace$ = "185 MB"
; the path were we find the product after the installation
Set $InstallDir$ = "%ProgramFiles32Dir%\Adobe\Acrobat 7.0"
@@ -53,9 +62,21 @@ else
Sub_get_licensekey
endif
comment "Start setup program"
Winbatch_install
Sub_check_exitcode
comment "Extract Office"
Winbatch_extract
Sub_check_exitcode
;comment "Extract Office Updates"
;Winbatch_update
;Sub_check_exitcode
comment "Start setup program"
Winbatch_install
Sub_check_exitcode
comment "Remove Install Files"
Winbatch_remove
Sub_check_exitcode
comment "Copy files"
Files_install /32Bit
@@ -80,31 +101,19 @@ else
endif
[Winbatch_extract]
$InstallExe$ -nos_ne -nos_o"$LogDir$\AdobeAcrobat7
;[Winbatch_update]
;$InstallSp3Exe$ /quiet /extract:$LogDir$\msoffice2007\Updates
[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
;
; === Nullsoft Scriptable Install System ================================================================
; "%ScriptPath%\Setup.exe" /S
;
; === MSI package =======================================================================================
; You may use the parameter PIDKEY=$Licensekey$
msiexec /i "%ScriptPath%\files\Adobe Acrobat 7.0 Standard\AcroStan.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress USERNAME="%HostID%" COMPANYNAME="%HostID%" ISX_SERIALNUMBER="$LicenseKey$" INSTALLDIR="$InstallDir$"
;
; === InstallShield + MSI=====================================================================================
; Attention: The path to the log file should not contain any whitespaces
; "%ScriptPath%\setup.exe" /s /v" /l* $LogDir$\$ProductId$.install_log.txt /qb! ALLUSERS=2 REBOOT=ReallySuppress"
; "%ScriptPath%\setup.exe" /s /v" /qb! ALLUSERS=2 REBOOT=ReallySuppress"
;
; === InstallShield =====================================================================================
; Create setup.iss answer file by running: setup.exe /r /f1"c:\setup.iss"
; "%ScriptPath%\setup.exe" /s /sms /f1"%ScriptPath%\setup.iss" /f2"$LogDir$\$ProductId$.install_log.txt"
;
; === Inno Setup ========================================================================================
; http://unattended.sourceforge.net/InnoSetup_Switches_ExitCodes.html
; You may create setup answer file by: setup.exe /SAVEINF="filename"
; You may use an answer file by the parameter /LOADINF="filename"
; "%ScriptPath%\setup.exe" /sp- /silent /norestart
[Winbatch_remove]
delete -sf "$LogDir$\AdobeAcrobat7\"
[Files_install]
; Example of recursively copying some files into the installation directory:

View File

@@ -7,7 +7,6 @@
requiredWinstVersion >= "4.10.8.6"
DefVar $MsiId$
DefVar $UninstallProgram$
DefVar $LogDir$
DefVar $ExitCode$
DefVar $ProductId$
@@ -17,10 +16,20 @@ 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$ = "adobeacrobat-7"
Set $ProductId$ = "adobe.acrobat-7"
Set $InstallDir$ = "%ProgramFiles32Dir%\Adobe\Acrobat 7.0"
Set $LicenseRequired$ = "true"
Set $LicensePool$ = "p_" + $ProductId$