Commit 2ff962ee authored by CompileNix's avatar CompileNix
Browse files

Update to Java 8 update 74

parent 2f5844cb
If $ProductProperty_updateBranch$ = "PCU" If $ProductProperty_updateBranch$ = "PCU" Or $ProductProperty_updateBranch$ = "PSU"
Set $UpdateVersion8$ = TakeString ( -1, $StringList_Java8$ ) Set $UpdateVersion8$ = TakeString ( -1, $StringList_Java8$ )
EndIf EndIf
......
Set $UninstallCommand$ = 'msiexec.exe /X ' + $Temp_Msi$ + ' /qb! REBOOT="ReallySuppress"' Set $UninstallCommand$ = 'msiexec.exe /X ' + $Temp_Msi$ + ' /qb! REBOOT="ReallySuppress"'
Message "Killing applications, which could use Java"
KillTask "firefox.exe" KillTask "firefox.exe"
KillTask "iexplore.exe" KillTask "iexplore.exe"
KillTask "jqs.exe" KillTask "jqs.exe"
...@@ -8,6 +10,10 @@ KillTask "java.exe" ...@@ -8,6 +10,10 @@ KillTask "java.exe"
KillTask "javaw.exe" KillTask "javaw.exe"
KillTask "jp2launcher.exe" KillTask "jp2launcher.exe"
SleepSeconds 3
Message "All applications killed, which could use Java"
SetLogLevel = 6 SetLogLevel = 6
Message "Uninstall " + $ProductDisplayName$ Message "Uninstall " + $ProductDisplayName$
; Set Timeout in case of an hangup while deinstalling (5 Minutes) ; Set Timeout in case of an hangup while deinstalling (5 Minutes)
......
...@@ -63,7 +63,7 @@ Set $StringList_Java6$ = CreateStringList ( '10', '11', '12', '13', '14', '15', ...@@ -63,7 +63,7 @@ Set $StringList_Java6$ = CreateStringList ( '10', '11', '12', '13', '14', '15',
Set $StringList_Java7$ = CreateStringList ( '00', '01', '02', '03', '04', '05', '06', '07', '09', '10', '11', '13', '15', '17', '21', '25', '40', '45', '51', '55', '60', '65', '67', '71', '72', '75', '76', '79', '80', '85', '91', '95' ) Set $StringList_Java7$ = CreateStringList ( '00', '01', '02', '03', '04', '05', '06', '07', '09', '10', '11', '13', '15', '17', '21', '25', '40', '45', '51', '55', '60', '65', '67', '71', '72', '75', '76', '79', '80', '85', '91', '95' )
; https://en.wikipedia.org/wiki/Java_version_history#Java_8_updates ; https://en.wikipedia.org/wiki/Java_version_history#Java_8_updates
Set $StringList_Java8$ = CreateStringList ( '00', '05', '11', '20', '25', '31', '40', '45', '51', '60', '65', '66', '71', '72' ) Set $StringList_Java8$ = CreateStringList ( '00', '05', '11', '20', '25', '31', '40', '45', '51', '60', '65', '66', '71', '72', '73', '74' )
; Get last (Critical Patch Update) update version ; Get last (Critical Patch Update) update version
Set $UpdateVersion8$ = TakeString ( -2, $StringList_Java8$ ) Set $UpdateVersion8$ = TakeString ( -2, $StringList_Java8$ )
...@@ -130,10 +130,14 @@ ShowBitMap "%ScriptPath%\java.png" $ProductName$ ...@@ -130,10 +130,14 @@ ShowBitMap "%ScriptPath%\java.png" $ProductName$
SetLogLevel = $DefaultLogLevel$ SetLogLevel = $DefaultLogLevel$
Set $Temp_MicrosoftWindowsVersionRequiredName$ = "Vista" Set $Temp_MicrosoftWindowsVersionRequiredName$ = "Vista"
If $MicrosoftWindowsVersion$ < "6.0" If $MicrosoftWindowsVersion$ = "10.0"
Message "Fatal error: Minimum Windows " + $Temp_MicrosoftWindowsVersionRequiredName$ + " is required for " + $ProductName$ + " " + $ProductProperty_Version$
LogError "Minimum Windows " + $Temp_MicrosoftWindowsVersionRequiredName$ + " is required for " + $ProductName$ + " " + $ProductProperty_Version$ Else
IsFatalError "Minimum Windows " + $Temp_MicrosoftWindowsVersionRequiredName$ + " is required For " + $ProductName$ + " " + $ProductProperty_Version$ If $MicrosoftWindowsVersion$ < "6.0"
Message "Fatal error: Minimum Windows " + $Temp_MicrosoftWindowsVersionRequiredName$ + " is required for " + $ProductName$ + " " + $ProductProperty_Version$ + " Version found: " + $MicrosoftWindowsVersion$
LogError "Minimum Windows " + $Temp_MicrosoftWindowsVersionRequiredName$ + " is required for " + $ProductName$ + " " + $ProductProperty_Version$ + " Version found: " + $MicrosoftWindowsVersion$
IsFatalError "Minimum Windows " + $Temp_MicrosoftWindowsVersionRequiredName$ + " is required For " + $ProductName$ + " " + $ProductProperty_Version$ + " Version found: " + $MicrosoftWindowsVersion$
EndIf
EndIf EndIf
If Not ( HasMinimumSpace ( "%SystemDrive%", $MinimumSpace$ ) ) If Not ( HasMinimumSpace ( "%SystemDrive%", $MinimumSpace$ ) )
...@@ -144,6 +148,8 @@ EndIf ...@@ -144,6 +148,8 @@ EndIf
Sub "%ScriptPath%\check_uninstall.ins" Sub "%ScriptPath%\check_uninstall.ins"
Message "Killing applications, which could use Java"
KillTask "firefox.exe" KillTask "firefox.exe"
KillTask "iexplore.exe" KillTask "iexplore.exe"
KillTask "MicrosoftEdge.exe" KillTask "MicrosoftEdge.exe"
...@@ -152,6 +158,10 @@ KillTask "java.exe" ...@@ -152,6 +158,10 @@ KillTask "java.exe"
KillTask "javaw.exe" KillTask "javaw.exe"
KillTask "jp2launcher.exe" KillTask "jp2launcher.exe"
SleepSeconds 3
Message "All applications killed, which could use Java"
; ############################################################################################################################################# ; #############################################################################################################################################
; ################################################################### Install x64 ################################################################### ; ################################################################### Install x64 ###################################################################
; ############################################################################################################################################# ; #############################################################################################################################################
......
...@@ -63,7 +63,7 @@ Set $StringList_Java6$ = CreateStringList ( '10', '11', '12', '13', '14', '15', ...@@ -63,7 +63,7 @@ Set $StringList_Java6$ = CreateStringList ( '10', '11', '12', '13', '14', '15',
Set $StringList_Java7$ = CreateStringList ( '00', '01', '02', '03', '04', '05', '06', '07', '09', '10', '11', '13', '15', '17', '21', '25', '40', '45', '51', '55', '60', '65', '67', '71', '72', '75', '76', '79', '80', '85', '91', '95' ) Set $StringList_Java7$ = CreateStringList ( '00', '01', '02', '03', '04', '05', '06', '07', '09', '10', '11', '13', '15', '17', '21', '25', '40', '45', '51', '55', '60', '65', '67', '71', '72', '75', '76', '79', '80', '85', '91', '95' )
; https://en.wikipedia.org/wiki/Java_version_history#Java_8_updates ; https://en.wikipedia.org/wiki/Java_version_history#Java_8_updates
Set $StringList_Java8$ = CreateStringList ( '00', '05', '11', '20', '25', '31', '40', '45', '51', '60', '65', '66', '71', '72' ) Set $StringList_Java8$ = CreateStringList ( '00', '05', '11', '20', '25', '31', '40', '45', '51', '60', '65', '66', '71', '72', '73', '74' )
; Get last (Critical Patch Update) update version ; Get last (Critical Patch Update) update version
Set $UpdateVersion8$ = TakeString ( -2, $StringList_Java8$ ) Set $UpdateVersion8$ = TakeString ( -2, $StringList_Java8$ )
......
...@@ -8,8 +8,8 @@ type: localboot ...@@ -8,8 +8,8 @@ type: localboot
id: java id: java
name: Java name: Java
description: description:
advice: Tested with Opsi 4.0.6.11, Winst 4.11.3.6 on Win 8.1 Pro x64 advice:
version: 1.8.0.72.15 version: 1.8.0.74.2
priority: -95 priority: -95
licenseRequired: False licenseRequired: False
productClasses: productClasses:
...@@ -89,15 +89,19 @@ type: unicode ...@@ -89,15 +89,19 @@ type: unicode
name: updatebranch name: updatebranch
multivalue: False multivalue: False
editable: False editable: False
description: Toggle between Critical Patch Update (CPU) and Patch Set Update (PCU) description: Toggle between Critical Patch Update (CPU) and Patch Set Update (PSU)
values: ["CPU", "PCU"] values: ["CPU", "PSU"]
default: ["CPU"] default: ["CPU"]
[Changelog] [Changelog]
java (1.8.0.74.2-4.2.4)
-- Kevin Weis <Compilenix@compilenix.org> 2016-03-14
* update
java (1.8.0.72.15-4.2.4) java (1.8.0.72.15-4.2.4)
-- Kevin Weis <Compilenix@compilenix.org> 2015-10-26 -- Kevin Weis <Compilenix@compilenix.org> 2015-10-26
* update * update
* add Product "updateBranch" choose between 8u71 and 8u72 (more info: ) * add Product "updateBranch" choose between 8u71 and 8u72 (more info: http://www.oracle.com/technetwork/java/javase/cpu-psu-explained-2331472.html)
* add Product Property "64bitonly" (default: False) * add Product Property "64bitonly" (default: False)
java (1.8.0.66.17-4.2.3) java (1.8.0.66.17-4.2.3)
...@@ -211,11 +215,3 @@ java (7.0-7) testing; urgency=low ...@@ -211,11 +215,3 @@ java (7.0-7) testing; urgency=low
java (7.0-4) testing; urgency=low java (7.0-4) testing; urgency=low
-- Kevin Weis <kevinweis@gmx.de> 12:39 05.11.2012 -- Kevin Weis <kevinweis@gmx.de> 12:39 05.11.2012
* Initial package * Initial package
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment