new build system
This commit is contained in:
Mario Fetka
parent
214b999c25
commit
5b50aa63b1
Binary file not shown.
|
|
@ -1,19 +1,25 @@
|
|||
; Copyright (c) uib gmbh (www.uib.de)
|
||||
; This sourcecode is owned by uib gmbh
|
||||
; and published under the Terms of the General Public License.
|
||||
; credits: http://www.opsi.org/credits/
|
||||
; credits: http://www.opsi.org/en/credits/
|
||||
|
||||
|
||||
Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$
|
||||
Set $UninstallProgram$ = $InstallDir$ + "\unins000.exe"
|
||||
Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
|
||||
|
||||
Message "Uninstalling " + $ProductId$ + " ..."
|
||||
if FileExists($IniFile$)
|
||||
Set $OLD_VERSION$ = GetValueFromInifile($IniFile$,"COMMON","VERSION","")
|
||||
Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile$,"COMMON","CREATOR_TAG","")
|
||||
Set $OLD_RELEASE$ = GetValueFromInifile($IniFile$,"COMMON","RELEASE","")
|
||||
endif
|
||||
Message "Uninstalling " + $ProductId$ + " " + $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..."
|
||||
|
||||
if FileExists($IniFile$)
|
||||
Set $MsiIdOld$ = GetValueFromInifile($IniFile$,"X86","MsiId","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}")
|
||||
if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld$ + "] DisplayName") = "")
|
||||
comment "Old MSI id " + $MsiIdOld$ + " found in registry, starting msiexec to uninstall old version"
|
||||
Winbatch_uninstall_msi_old
|
||||
Set $UninstallProgramOld$ = GetValueFromInifile($IniFile$,"X86","UninstallProg","XXXXXXXX.exe")
|
||||
if FileExists($UninstallProgramOld$)
|
||||
comment "Uninstall program found, starting uninstall"
|
||||
Winbatch_uninstall_old
|
||||
sub_check_exitcode
|
||||
endif
|
||||
endif
|
||||
|
|
@ -22,11 +28,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
|
||||
|
|
@ -37,23 +38,28 @@ Registry_uninstall /32Bit
|
|||
comment "Delete program shortcuts"
|
||||
LinkFolder_uninstall
|
||||
|
||||
[Winbatch_uninstall_old]
|
||||
"$UninstallProgramOld$" /SILENT /NORESTART /SUPPRESSMSGBOXES
|
||||
taskkill /F /IM iexplore.exe
|
||||
taskkill /F /IM iron.exe
|
||||
taskkill /F /IM firefox.exe
|
||||
taskkill /F /IM chrome.exe
|
||||
taskkill /F /IM opera.exe
|
||||
|
||||
|
||||
[Winbatch_uninstall]
|
||||
; === Inno Setup ========================================================================================
|
||||
"$UninstallProgram$" /SILENT /NORESTART /SUPPRESSMSGBOXES
|
||||
%ScriptPath%\X86\closewindow.exe "Uninstall Feedback" ""
|
||||
taskkill /F /IM iexplore.exe
|
||||
taskkill /F /IM iron.exe
|
||||
taskkill /F /IM firefox.exe
|
||||
taskkill /F /IM chrome.exe
|
||||
taskkill /F /IM opera.exe
|
||||
|
||||
|
||||
|
||||
[Winbatch_uninstall_msi_old]
|
||||
msiexec /x $MsiIdOld$ /qb! REBOOT=ReallySuppress
|
||||
|
||||
[Winbatch_uninstall_msi]
|
||||
msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress
|
||||
|
||||
[Files_uninstall]
|
||||
; Example for recursively deleting the installation directory (don't forget the trailing backslash):
|
||||
; Example for recursively deleting the installation directory:
|
||||
;
|
||||
; delete -sf "$InstallDir$\"
|
||||
del -sf "$InstallDir$\"
|
||||
|
||||
[Registry_uninstall]
|
||||
; Example of deleting a registry key:
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
; Copyright (c) uib gmbh (www.uib.de)
|
||||
; This sourcecode is owned by uib gmbh
|
||||
; and published under the Terms of the General Public License.
|
||||
; credits: http://www.opsi.org/en/credits/
|
||||
|
||||
[Actions]
|
||||
Message "Profile Patch for VLC ...."
|
||||
|
||||
comment "Did we run this script before ? - and set version stamp in profile"
|
||||
if getValue("installationstate", getProductMap) = "installed"
|
||||
comment "Product is installed"
|
||||
if not (scriptWasExecutedBefore)
|
||||
comment "loginscript was not run yet "
|
||||
Files_profile_copy
|
||||
Registry_currentuser_set
|
||||
endif
|
||||
endif
|
||||
|
||||
[Files_profile_copy]
|
||||
copy "%Scriptpath%\profiles\*.*" "%CurrentAppdataDir%\ACME"
|
||||
|
||||
[Registry_currentuser_set]
|
||||
openkey [HKCU\Software\ACME]
|
||||
set "show_greeting_window" = "no"
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
[X86]
|
||||
MsiId={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}
|
||||
|
||||
[COMMON]
|
||||
PN=arcticline.jetscreeshot
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
; Copyright (c) uib gmbh (www.uib.de)
|
||||
; This sourcecode is owned by uib
|
||||
; and published under the Terms of the General Public License.
|
||||
; credits: http://www.opsi.org/credits/
|
||||
; credits: http://www.opsi.org/en/credits/
|
||||
|
||||
[Actions]
|
||||
requiredWinstVersion >= "4.10.8.6"
|
||||
requiredWinstVersion >= "4.11.2.6"
|
||||
|
||||
; DefVar $MsiId$
|
||||
DefVar $MsiIdOld$
|
||||
DefVar $UninstallProgram$
|
||||
DefVar $UninstallProgramOld$
|
||||
DefVar $IniFile$
|
||||
DefVar $IniCfgFile$
|
||||
DefVar $LogDir$
|
||||
|
|
@ -16,9 +15,9 @@ DefVar $ProductId$
|
|||
DefVar $MinimumSpace$
|
||||
DefVar $InstallDir$
|
||||
DefVar $ExitCode$
|
||||
DefVar $LicenseRequired$
|
||||
DefVar $LicenseKey$
|
||||
DefVar $LicensePool$
|
||||
DefVar $OLD_VERSION$
|
||||
DefVar $OLD_CREATOR_TAG$
|
||||
DefVar $OLD_RELEASE$
|
||||
|
||||
Set $LogDir$ = "%SystemDrive%\tmp"
|
||||
|
||||
|
|
@ -38,36 +37,30 @@ 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$ = "arcticline.jetscreenshot"
|
||||
Set $MinimumSpace$ = "10 MB"
|
||||
Set $MinimumSpace$ = "20 MB"
|
||||
; the path were we find the product after the installation
|
||||
Set $InstallDir$ = "%ProgramFiles32Dir%\Jet Screenshot"
|
||||
Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
|
||||
Set $LicenseRequired$ = "false"
|
||||
Set $LicensePool$ = "p_" + $ProductId$
|
||||
; ----------------------------------------------------------------
|
||||
|
||||
Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
|
||||
|
||||
if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
|
||||
LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$
|
||||
isFatalError
|
||||
isFatalError "No Space"
|
||||
; Stop process and set installation status to failed
|
||||
else
|
||||
comment "Show product picture"
|
||||
ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
|
||||
ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
|
||||
|
||||
if FileExists("%ScriptPath%\delsub32.ins")
|
||||
comment "Start uninstall sub section"
|
||||
Sub "%ScriptPath%\delsub32.ins"
|
||||
endif
|
||||
|
||||
Message "Installing " + $ProductId$ + " ..."
|
||||
|
||||
if $LicenseRequired$ = "true"
|
||||
comment "Licensing required, reserve license and get license key"
|
||||
Sub_get_licensekey
|
||||
endif
|
||||
Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..."
|
||||
|
||||
comment "Start setup program"
|
||||
ChangeDirectory "%SCRIPTPATH%"
|
||||
Winbatch_install
|
||||
Sub_check_exitcode
|
||||
|
||||
|
|
@ -80,24 +73,15 @@ else
|
|||
comment "Create shortcuts"
|
||||
LinkFolder_install
|
||||
|
||||
comment "Test for installation success"
|
||||
; Test if software marked as installed in registry
|
||||
; if (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}] DisplayName") = "")
|
||||
; logError "Fatal: After Installation 32 bit [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}] not found"
|
||||
; isFatalError
|
||||
; else
|
||||
; comment "Successful Installation"
|
||||
; endif
|
||||
|
||||
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
|
||||
;
|
||||
; === Nullsoft Scriptable Install System ================================================================
|
||||
"$InstallExe$" /SILENT /NORESTART
|
||||
%ScriptPath%\X86\closewindow.exe "Jet Screenshot Install" ""
|
||||
taskkill /F /IM iexplore.exe
|
||||
taskkill /F /IM iron.exe
|
||||
taskkill /F /IM firefox.exe
|
||||
taskkill /F /IM chrome.exe
|
||||
taskkill /F /IM opera.exe
|
||||
|
||||
[Files_install]
|
||||
; copy the ini file to the InstallDir
|
||||
|
|
@ -149,44 +133,6 @@ copy "$IniCfgFile$" "$InstallDir$"
|
|||
; 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
|
||||
|
|
|
|||
|
|
@ -1,22 +1,22 @@
|
|||
; Copyright (c) uib gmbh (www.uib.de)
|
||||
; This sourcecode is owned by uib gmbh
|
||||
; and published under the Terms of the General Public License.
|
||||
; credits: http://www.opsi.org/credits/
|
||||
; credits: http://www.opsi.org/en/credits/
|
||||
|
||||
[Actions]
|
||||
requiredWinstVersion >= "4.10.8.6"
|
||||
requiredWinstVersion >= "4.11.2.6"
|
||||
|
||||
; DefVar $MsiId$
|
||||
DefVar $MsiIdOld$
|
||||
DefVar $UninstallProgram$
|
||||
DefVar $LogDir$
|
||||
DefVar $UninstallProgramOld$
|
||||
DefVar $IniFile$
|
||||
DefVar $IniCfgFile$
|
||||
DefVar $LogDir$
|
||||
DefVar $ExitCode$
|
||||
DefVar $ProductId$
|
||||
DefVar $InstallDir$
|
||||
DefVar $LicenseRequired$
|
||||
DefVar $LicensePool$
|
||||
DefVar $OLD_VERSION$
|
||||
DefVar $OLD_CREATOR_TAG$
|
||||
DefVar $OLD_RELEASE$
|
||||
|
||||
Set $LogDir$ = "%SystemDrive%\tmp"
|
||||
|
||||
|
|
@ -33,15 +33,13 @@ Set $LogDir$ = "%SystemDrive%\tmp"
|
|||
; ----------------------------------------------------------------
|
||||
; - Please edit the following values -
|
||||
; ----------------------------------------------------------------
|
||||
Set $ProductId$ = "arcticline.jetscreenshot"
|
||||
Set $InstallDir$ = "%ProgramFiles32Dir%\Jet Screenshot"
|
||||
Set $LicenseRequired$ = "false"
|
||||
Set $LicensePool$ = "p_" + $ProductId$
|
||||
; ----------------------------------------------------------------
|
||||
|
||||
Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
|
||||
|
||||
comment "Show product picture"
|
||||
ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
|
||||
ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
|
||||
|
||||
Message "Uninstalling " + $ProductId$ + " ..."
|
||||
|
||||
|
|
@ -50,22 +48,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]
|
||||
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$)
|
||||
|
||||
|
|
|
|||
|
|
@ -21,15 +21,6 @@ onceScript:
|
|||
customScript:
|
||||
userLoginScript:
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: install_architecture
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: which architecture (32/64 bit) has to be installed
|
||||
values: ["32 only", "64 only", "both", "system specific"]
|
||||
default: ["system specific"]
|
||||
|
||||
[ProductDependency]
|
||||
action: setup
|
||||
requiredProduct: aio
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
############################
|
||||
VENDOR="jetscreeshot.com"
|
||||
PN="arcticline.jetscreeshot"
|
||||
NAME="Jet Screenshot"
|
||||
DESCRIPTION="Jet Screenshot helps its users to communicate ideas faster clearly, explain concepts, and archive electronic information with point-and-click convenience."
|
||||
VERSION="3.1"
|
||||
RELEASE="3"
|
||||
PRIORITY="0"
|
||||
|
|
@ -24,18 +26,7 @@ DL_WINST_NAME[1]=InstallExe
|
|||
# File array index for the image showing while installing the program
|
||||
ICON_DL_INDEX=0
|
||||
|
||||
#########################
|
||||
# Setup required WINST variables
|
||||
# which will be injected to the *.ins files (replaces token @@BUILDER_VARIABLES@@ )
|
||||
#
|
||||
# The following tokens inside the WINST_VALUE will be replaced dynamically
|
||||
#
|
||||
# if your package is not msi based then you can remove the msi part from *.ins files and drop this variables compleatly
|
||||
# !!! These Variables are requred if you remove them in this cfg file you will get error's about not defined Variables !!!
|
||||
#
|
||||
#########################
|
||||
# if the packaga just supports X86 OR X86_64 (setupXX.ins delsubXX.ins uninstallXX.ins) then you have to just specify one MsiId
|
||||
|
||||
WINST_NAME[0]="MsiId"
|
||||
WINST_VALUE[0]="{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}"
|
||||
OPSI_INI_SECTION[0]="X86"
|
||||
OPSI_INI_OPTION[0]="UninstallProg"
|
||||
OPSI_INI_VALUE[0]="unins000.exe"
|
||||
|
||||
|
|
|
|||
BIN
closewindow.au3
BIN
closewindow.au3
Binary file not shown.
|
|
@ -1,10 +0,0 @@
|
|||
closewindow.exe erwartet 2 übergabe parameter in anführungszeichen
|
||||
|
||||
1. Paramater Text der in der Titelzeile des zu schließenden Fensters ist
|
||||
2. Paramater Text der in der im Fenster des zu schließenden Fensters ist
|
||||
|
||||
1. muss angeben sein 2 kann leer sein
|
||||
|
||||
z.b.
|
||||
|
||||
closewindow.exe "Uninstall Feedback" ""
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
Install browser window Text:
|
||||
|
||||
Jet Screeshot Install
|
||||
|
||||
------------------------------
|
||||
|
||||
Uninstall Browser Window Text:
|
||||
|
||||
Uninstall Feedback
|
||||
Loading…
Reference in New Issue