Commit d81c1c5b authored by CompileNix's avatar CompileNix
Browse files

Update to Java 8 update 102

parent 5969475d
......@@ -5,10 +5,13 @@ Else
EndIf
Set $ProductDisplayVersion$ = $ProductProperty_Version$ + "u" + $UpdateVersion8$
Set $ProductDisplayName$ = $ProductName$ + " " + $ProductDisplayVersion$
Set $ProductVersion$ = "1." + $ProductProperty_Version$ + ".0_" + $UpdateVersion8$
Set $PathSetup_Msi32$ = "msi\" + $ProductProperty_VM-Type$ + $ProductVersion$ + "\" + $ProductProperty_VM-Type$ + $ProductVersion$ + ".msi"
Set $PathSetup_Exe32$ = $ProductProperty_VM-Type$ + "-" + $ProductDisplayVersion$ + "-windows-i586.exe"
Set $PathSetup_Exe64$ = $ProductProperty_VM-Type$ + "-" + $ProductDisplayVersion$ + "-windows-x64.exe"
Set $ProductDisplayName$ = $ProductName$ + " " + $ProductDisplayVersion$
Set $ProductDisplayVersion_x32$ = $ProductDisplayName$ + " " + $ProductProperty_VM-Type$ + " x32"
Set $ProductDisplayVersion_x64$ = $ProductDisplayName$ + " " + $ProductProperty_VM-Type$ + " x64"
......@@ -12,7 +12,7 @@ Sub "%ScriptPath%\Sub_UpdateVariables.ins"
[Sub_Uninstall_6]
Message "Search Java 6.0.$x$ x32"
If $ProcessorArchitecture$ = "x86 System"
If ( "$x$" > "24" )
If CompareDotSeparatedNumbers ( "$x$", ">", "24" )
Set $Temp_MsiSuffix$ = "FF"
Else
Set $Temp_MsiSuffix$ = "F0"
......@@ -27,7 +27,7 @@ If $ProcessorArchitecture$ = "x86 System"
EndIf
If $ProcessorArchitecture$ = "64 Bit System"
If ( "$x$" > "23" )
If CompareDotSeparatedNumbers ( "$x$", ">", "23" )
Set $Temp_MsiSuffix$ = "FF"
Else
Set $Temp_MsiSuffix$ = "F0"
......@@ -40,7 +40,7 @@ If $ProcessorArchitecture$ = "64 Bit System"
Sub "%ScriptPath%\delsub.ins"
EndIf
If ( "$x$" > "24" )
If CompareDotSeparatedNumbers ( "$x$", ">", "24" )
Set $Temp_MsiSuffix$ = "FF"
Else
Set $Temp_MsiSuffix$ = "F0"
......@@ -60,14 +60,14 @@ EndIf
[Sub_Uninstall_7]
If ( "$x$" > "23" )
If CompareDotSeparatedNumbers ( "$x$", ">", "23" )
Set $Temp_MsiSuffix$ = "FF"
Else
Set $Temp_MsiSuffix$ = "F0"
EndIf
; It Seems this one does only affect Java 7 JRE x64 and x86
If ( "$x$" >= "60" )
If CompareDotSeparatedNumbers ("$x$", ">=", "60" )
Set $Temp_MsiDiff01$ = "0"
Else
Set $Temp_MsiDiff01$ = "8"
......@@ -135,69 +135,78 @@ EndIf
[Sub_Uninstall_8]
; TODO check on every update
If ( "$x$" >= "00" )
Set $Temp_MsiSuffix$ = "FF"
If CompareDotSeparatedNumbers ( "$x$", "<", "100" )
Set $Temp_MsiSuffix$ = "$x$0"
Else
Set $Temp_MsiSuffix$ = "F0"
Set $Temp_MsiSuffix$ = "$x$"
EndIf
Message "Search Java JDK 8.0.$x$ x32"
If $ProcessorArchitecture$ = "x86 System"
Set $ProductDisplayName$ = GetRegistryStringValue ( "[" + $RegistryPath$ + "{32A3A4F4-B792-11D6-A78A-00B0D0180$x$0}] DisplayName" )
Set $ProductDisplayName$ = GetRegistryStringValue ( "[" + $RegistryPath$ + "{32A3A4F4-B792-11D6-A78A-00B0D0180" + $Temp_MsiSuffix$ + "}] DisplayName" )
If Not ( $ProductDisplayName$ = "" )
Message "Uninstall " + $ProductDisplayName$ + "..."
Set $Temp_Msi$ = "{32A3A4F4-B792-11D6-A78A-00B0D0180$x$0}"
Set $Temp_Msi$ = "{32A3A4F4-B792-11D6-A78A-00B0D0180" + $Temp_MsiSuffix$ + "}"
Sub "%ScriptPath%\delsub.ins"
EndIf
EndIf
If $ProcessorArchitecture$ = "64 Bit System"
Set $ProductDisplayName$ = GetRegistryStringValue32 ( "[" + $RegistryPath_x64$ + "{32A3A4F4-B792-11D6-A78A-00B0D0180$x$0}] DisplayName" )
Set $ProductDisplayName$ = GetRegistryStringValue32 ( "[" + $RegistryPath_x64$ + "{32A3A4F4-B792-11D6-A78A-00B0D0180" + $Temp_MsiSuffix$ + "}] DisplayName" )
If Not ( $ProductDisplayName$ = "" )
Message "Uninstall " + $ProductDisplayName$ + "..."
Set $Temp_Msi$ = "{32A3A4F4-B792-11D6-A78A-00B0D0180$x$0}"
Set $Temp_Msi$ = "{32A3A4F4-B792-11D6-A78A-00B0D0180" + $Temp_MsiSuffix$ + "}"
Sub "%ScriptPath%\delsub.ins"
EndIf
Message "Search Java JDK 8.0.$x$ x64"
Set $ProductDisplayName$ = GetRegistryStringValue64 ( "[" + $RegistryPath$ + "{64A3A4F4-B792-11D6-A78A-00B0D0180$x$0}] DisplayName" )
Set $ProductDisplayName$ = GetRegistryStringValue64 ( "[" + $RegistryPath$ + "{64A3A4F4-B792-11D6-A78A-00B0D0180" + $Temp_MsiSuffix$ + "}] DisplayName" )
If Not ( $ProductDisplayName$ = "" )
Message "Uninstall " + $ProductDisplayName$ + "..."
Set $Temp_Msi$ = "{64A3A4F4-B792-11D6-A78A-00B0D0180$x$0}"
Set $Temp_Msi$ = "{64A3A4F4-B792-11D6-A78A-00B0D0180" + $Temp_MsiSuffix$ + "}"
Sub "%ScriptPath%\delsub.ins"
EndIf
EndIf
If CompareDotSeparatedNumbers ( "$x$", ">", "100" )
Set $Temp_MsiPrefix_64$ = "2F64180"
Set $Temp_MsiPrefix_86$ = "2F32180"
Else
Set $Temp_MsiPrefix_64$ = "2F864180"
Set $Temp_MsiPrefix_86$ = "2F832180"
EndIf
; TODO check on every update
If ( "$x$" < "25" )
Set $Temp_MsiSuffix$ = "FF"
If CompareDotSeparatedNumbers ( "$x$", "<", "25" )
Set $Temp_MsiSuffix$ = "$x$FF"
Else
Set $Temp_MsiSuffix$ = "F0"
Set $Temp_MsiSuffix$ = "$x$F0"
EndIf
Message "Search Java JRE 8.0.$x$ x32"
If $ProcessorArchitecture$ = "x86 System"
Set $ProductDisplayName$ = GetRegistryStringValue ( "[" + $RegistryPath$ + "{26A24AE4-039D-4CA4-87B4-2F832180" + "$x$" + $Temp_MsiSuffix$ + "}] DisplayName" )
Set $ProductDisplayName$ = GetRegistryStringValue ( "[" + $RegistryPath$ + "{26A24AE4-039D-4CA4-87B4-" + $Temp_MsiPrefix_86$ + $Temp_MsiSuffix$ + "}] DisplayName" )
If Not ( $ProductDisplayName$ = "" )
Message "Uninstall " + $ProductDisplayName$ + "..."
Set $Temp_Msi$ = "{26A24AE4-039D-4CA4-87B4-2F832180" + "$x$" + $Temp_MsiSuffix$ + "}"
Set $Temp_Msi$ = "{26A24AE4-039D-4CA4-87B4-" + $Temp_MsiPrefix_86$ + $Temp_MsiSuffix$ + "}"
Sub "%ScriptPath%\delsub.ins"
EndIf
EndIf
If $ProcessorArchitecture$ = "64 Bit System"
Set $ProductDisplayName$ = GetRegistryStringValue32 ( "[" + $RegistryPath_x64$ + "{26A24AE4-039D-4CA4-87B4-2F832180" + "$x$" + $Temp_MsiSuffix$ + "}] DisplayName" )
Set $ProductDisplayName$ = GetRegistryStringValue32 ( "[" + $RegistryPath_x64$ + "{26A24AE4-039D-4CA4-87B4-" + $Temp_MsiPrefix_86$ + $Temp_MsiSuffix$ + "}] DisplayName" )
If Not ( $ProductDisplayName$ = "" )
Message "Uninstall " + $ProductDisplayName$ + "..."
Set $Temp_Msi$ = "{26A24AE4-039D-4CA4-87B4-2F832180" + "$x$" + $Temp_MsiSuffix$ + "}"
Set $Temp_Msi$ = "{26A24AE4-039D-4CA4-87B4-" + $Temp_MsiPrefix_86$ + $Temp_MsiSuffix$ + "}"
Sub "%ScriptPath%\delsub.ins"
EndIf
Message "Search Java JRE 8.0.$x$ x64"
Set $ProductDisplayName$ = GetRegistryStringValue64 ( "[" + $RegistryPath$ + "{26A24AE4-039D-4CA4-87B4-2F864180" + "$x$" + $Temp_MsiSuffix$ + "}] DisplayName" )
Set $ProductDisplayName$ = GetRegistryStringValue64 ( "[" + $RegistryPath$ + "{26A24AE4-039D-4CA4-87B4-" + $Temp_MsiPrefix_64$ + $Temp_MsiSuffix$ + "}] DisplayName" )
If Not ( $ProductDisplayName$ = "" )
Message "Uninstall " + $ProductDisplayName$ + "..."
Set $Temp_Msi$ = "{26A24AE4-039D-4CA4-87B4-2F864180" + "$x$" + $Temp_MsiSuffix$ + "}"
Set $Temp_Msi$ = "{26A24AE4-039D-4CA4-87B4-" + $Temp_MsiPrefix_64$ + $Temp_MsiSuffix$ + "}"
Sub "%ScriptPath%\delsub.ins"
EndIf
EndIf
Set $UninstallCommand$ = 'msiexec.exe /X ' + $Temp_Msi$ + ' /qb! REBOOT="ReallySuppress"'
Message "Killing applications, which could use Java"
Message "Terminate applications, which could use Java"
KillTask "firefox.exe"
KillTask "iexplore.exe"
......
......@@ -6,7 +6,7 @@ TraceMode = Off
StayOnTop = False
[Actions]
RequiredWinstVersion >= "4.11.3"
RequiredWinstVersion >= "4.11.5"
Message "Prepare..."
DefStringList $StringList_Java6$
DefStringList $StringList_Java7$
......@@ -44,12 +44,15 @@ DefVar $ProductProperty_PatchJCE$
DefVar $ProductVersion$
DefVar $RegistryPath$
DefVar $RegistryPath_x64$
DefVar $Updated_javapath$
DefVar $Temp_ExitCode$
DefVar $Temp_Message$
DefVar $Temp_MicrosoftWindowsVersionRequired$
DefVar $Temp_MicrosoftWindowsVersionRequiredName$
DefVar $Temp_Msi$
DefVar $Temp_MsiSuffix$
DefVar $Temp_MsiPrefix_64$
DefVar $Temp_MsiPrefix_86$
DefVar $Temp_MsiDiff01$
DefVar $UninstallCommand$
DefVar $UpdateVersion8$
......@@ -63,10 +66,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', '99', '101' )
; 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', '73', '74', '77', '91', '92' )
; Get last (Critical Patch Update) update version
Set $UpdateVersion8$ = TakeString ( -2, $StringList_Java8$ )
Set $StringList_Java8$ = CreateStringList ( '00', '05', '11', '20', '25', '31', '40', '45', '51', '60', '65', '66', '71', '72', '73', '74', '77', '91', '92', '101', '102' )
Set $DefaultLogLevel$ = "6"
Set $IsUninstall$ = "False"
......@@ -86,6 +86,7 @@ Set $ProductProperty_updateBranch$ = GetProductProperty ( "updateBranch" , "CPU"
Set $RegistryPath$ = "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\"
Set $RegistryPath_x64$ = "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\"
Set $Temp_MsiSuffix$ = ""
Set $Updated_javapath$ = "False"
; Reset changed variables
Sub "%ScriptPath%\Sub_UpdateVariables.ins"
......@@ -130,15 +131,10 @@ ShowBitMap "%ScriptPath%\java.png" $ProductName$
SetLogLevel = $DefaultLogLevel$
Set $Temp_MicrosoftWindowsVersionRequiredName$ = "Vista"
; On Windows 10 the expression $MicrosoftWindowsVersion$ < "6.0" equals true
If $MicrosoftWindowsVersion$ = "10.0"
Else
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
If CompareDotSeparatedNumbers ( $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
If Not ( HasMinimumSpace ( "%SystemDrive%", $MinimumSpace$ ) )
......@@ -149,7 +145,7 @@ EndIf
Sub "%ScriptPath%\check_uninstall.ins"
Message "Killing applications, which could use Java"
Message "Terminate applications, which could use Java"
KillTask "firefox.exe"
KillTask "iexplore.exe"
......@@ -164,7 +160,7 @@ SleepSeconds 3
Message "All applications killed, which could use Java"
; #############################################################################################################################################
; ################################################################### Install x64 ###################################################################
; ################################################################### Install x64 #############################################################
; #############################################################################################################################################
If $ProcessorArchitecture$ = "64 Bit System"
......@@ -175,12 +171,16 @@ If $ProcessorArchitecture$ = "64 Bit System"
WinBatch_install_x64 /WaitOnClose
SetLogLevel = 1
Sub "%ScriptPath%\check_msi-exitcode.ins"
SetLogLevel = 6
Files_add_symlinks_in_javapath_x64
Set $Updated_javapath$ = "True"
SetLogLevel = 1
Else
Message "Fatal error: File not found: " + $PathSetup_Data$ + $PathSetup_Exe64$
LogError "File not found: " + $PathSetup_Data$ + $PathSetup_Exe64$
IsFatalError "File not found: " + $exePath$ + $exe_64$
EndIf
If $ProductProperty_Java-Updater$ = "JAVAUPDATE=0"
Registry_disable_update /SysNative
EndIf
......@@ -191,12 +191,18 @@ If $ProcessorArchitecture$ = "64 Bit System"
If FileExists ( $PathSetup_Data$ + $PathSetup_Exe32$ )
SetLogLevel = 6
WinBatch_install_x86 /WaitOnClose
SetLogLevel = $DefaultLogLevel$
SetLogLevel = 1
If $Updated_javapath$ = "False"
SetLogLevel = 6
Files_add_symlinks_in_javapath_x86
Set $Updated_javapath$ = "True"
SetLogLevel = 1
EndIf
Else
LogWarning "File not found: " + $exePath$ + $exe_32$
EndIf
EndIf
If $ProductProperty_64bitOnly$ = "False"
; Installation of Java x86 at a x64 system envirement does "fail", because the java x86 installer seems NOT to be designed to be executed In a SYSTEM "user" conetxt.
Set $Temp_ExitCode$ = GetLastExitCode
......@@ -206,11 +212,11 @@ If $ProcessorArchitecture$ = "64 Bit System"
Else
Comment "ExitCode = " + $Temp_ExitCode$ + ' ERROR_INSTALL_PACKAGE_OPEN_FAILED; This is what we expected, so its a "good" sign.'
EndIf
SetLogLevel = 5
Files_delete_broken_x86_x64 /32Bit
SetLogLevel = 1
Message "Install " + $ProductDisplayVersion_x32$ + " second try"
If $ProductProperty_VM-Type$ = "jdk"
If FileExists ( $PathSetup_Data$ + $PathSetup_Msi32$ )
......@@ -218,13 +224,19 @@ If $ProcessorArchitecture$ = "64 Bit System"
WinBatch_install_x86_MSI /WaitOnClose
SetLogLevel = 1
Sub "%ScriptPath%\check_msi-exitcode.ins"
If $Updated_javapath$ = "False"
SetLogLevel = 6
Files_add_symlinks_in_javapath_x86
Set $Updated_javapath$ = "True"
SetLogLevel = 1
EndIf
Else
Message "Fatal error: File not found: " + $PathSetup_Data$ + $PathSetup_Msi32$
LogError "File not found: " + $PathSetup_Data$ + $PathSetup_Msi32$
IsFatalError "File not found: " + $exePath$ + $msi32$
EndIf
EndIf
; Explicit install Java x86, because in this situation the Java Installer (MSI) only install the jdk And for some reason it does NOT install the jre :(
Set $PathSetup_Msi32$ = "msi\jre" + $ProductVersion$ + "\jre" + $ProductVersion$ + ".msi"
If FileExists ( $PathSetup_Data$ + $PathSetup_Msi32$ )
......@@ -232,12 +244,18 @@ If $ProcessorArchitecture$ = "64 Bit System"
WinBatch_install_x86_MSI /WaitOnClose
SetLogLevel = 1
Sub "%ScriptPath%\check_msi-exitcode.ins"
If $Updated_javapath$ = "False"
SetLogLevel = 6
Files_add_symlinks_in_javapath_x86
Set $Updated_javapath$ = "True"
SetLogLevel = 1
EndIf
Else
Message "Fatal error: File not found: " + $PathSetup_Data$ + $PathSetup_Msi32$
LogError "File not found: " + $PathSetup_Data$ + $PathSetup_Msi32$
IsFatalError "File not found: " + $PathSetup_Data$ + $PathSetup_Msi32$
EndIf
; Reset changed variables
Sub "%ScriptPath%\Sub_UpdateVariables.ins"
Else
......@@ -250,7 +268,7 @@ If $ProcessorArchitecture$ = "64 Bit System"
EndIf
; #############################################################################################################################################
; ################################################################### Install x32 ###################################################################
; ################################################################### Install x32 #############################################################
; #############################################################################################################################################
If $ProcessorArchitecture$ = "x86 System" And $ProductProperty_64bitOnly$ = "False"
......@@ -260,6 +278,12 @@ If $ProcessorArchitecture$ = "x86 System" And $ProductProperty_64bitOnly$ = "Fal
WinBatch_install_x86 /WaitOnClose
SetLogLevel = 1
Sub "%ScriptPath%\check_msi-exitcode.ins"
If $Updated_javapath$ = "False"
SetLogLevel = 6
Files_add_symlinks_in_javapath_x86
Set $Updated_javapath$ = "True"
SetLogLevel = 1
EndIf
Else
Message "Fatal error: File not found: " + $PathSetup_Data$ + $PathSetup_Exe32$
LogError "File not found: " + $PathSetup_Data$ + $PathSetup_Exe32$
......@@ -301,7 +325,7 @@ If $ProductProperty_PatchJCE$ = "On"
LogWarning "NOT Patching JCE for x86 JRE and JDK; File not found: %ProgramFiles32Dir%\Java\jre" + $ProductVersion$ + "\bin\java.exe"
EndIf
EndIf
Message "Install complete"
Else
LogWarning "NOT Patching JCE for x86 JRE and JDK; decision by administrator"
......@@ -309,6 +333,16 @@ Else
EndIf
[Files_add_symlinks_in_javapath_x64]
symlink "%ProgramFiles64Dir%\Java\jre$ProductVersion$\bin\java.exe" C:\ProgramData\Oracle\Java\javapath\java.exe
symlink "%ProgramFiles64Dir%\Java\jre$ProductVersion$\bin\javaw.exe" C:\ProgramData\Oracle\Java\javapath\javaw.exe
symlink "%ProgramFiles64Dir%\Java\jre$ProductVersion$\bin\javaws.exe" C:\ProgramData\Oracle\Java\javapath\javaws.exe
[Files_add_symlinks_in_javapath_x86]
symlink "%ProgramFiles32Dir%\Java\jre$ProductVersion$\bin\java.exe" C:\ProgramData\Oracle\Java\javapath\java.exe
symlink "%ProgramFiles32Dir%\Java\jre$ProductVersion$\bin\javaw.exe" C:\ProgramData\Oracle\Java\javapath\javaw.exe
symlink "%ProgramFiles32Dir%\Java\jre$ProductVersion$\bin\javaws.exe" C:\ProgramData\Oracle\Java\javapath\javaws.exe
[WinBatch_install_x86_MSI]
msiexec /i "$PathSetup_Data$$PathSetup_Msi32$" $Arguments_Msi$
......
......@@ -6,7 +6,7 @@ TraceMode = Off
StayOnTop = False
[Actions]
RequiredWinstVersion >= "4.11.3"
RequiredWinstVersion >= "4.11.5"
Message "Prepare..."
DefStringList $StringList_Java6$
DefStringList $StringList_Java7$
......@@ -44,12 +44,15 @@ DefVar $ProductProperty_PatchJCE$
DefVar $ProductVersion$
DefVar $RegistryPath$
DefVar $RegistryPath_x64$
DefVar $Updated_javapath$
DefVar $Temp_ExitCode$
DefVar $Temp_Message$
DefVar $Temp_MicrosoftWindowsVersionRequired$
DefVar $Temp_MicrosoftWindowsVersionRequiredName$
DefVar $Temp_Msi$
DefVar $Temp_MsiSuffix$
DefVar $Temp_MsiPrefix_64$
DefVar $Temp_MsiPrefix_86$
DefVar $Temp_MsiDiff01$
DefVar $UninstallCommand$
DefVar $UpdateVersion8$
......@@ -63,10 +66,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', '99', '101' )
; 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', '73', '74', '77', '91', '92' )
; Get last (Critical Patch Update) update version
Set $UpdateVersion8$ = TakeString ( -2, $StringList_Java8$ )
Set $StringList_Java8$ = CreateStringList ( '00', '05', '11', '20', '25', '31', '40', '45', '51', '60', '65', '66', '71', '72', '73', '74', '77', '91', '92', '101', '102' )
Set $DefaultLogLevel$ = "6"
Set $IsUninstall$ = "False"
......@@ -86,6 +86,7 @@ Set $ProductProperty_updateBranch$ = GetProductProperty ( "updateBranch" , "CPU"
Set $RegistryPath$ = "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\"
Set $RegistryPath_x64$ = "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\"
Set $Temp_MsiSuffix$ = ""
Set $Updated_javapath$ = "False"
; Reset changed variables
Sub "%ScriptPath%\Sub_UpdateVariables.ins"
......
[Package]
version: 4.2.4
version: 4.2.5
depends:
incremental: False
......@@ -9,7 +9,7 @@ id: java
name: Java
description:
advice:
version: 1.8.0.92
version: 1.8.0.102
priority: -95
licenseRequired: False
productClasses:
......@@ -94,6 +94,11 @@ values: ["CPU", "PSU"]
default: ["CPU"]
[Changelog]
java (1.8.0.102-4.2.5)
-- Kevin Weis <Compilenix@compilenix.org> 2016-07-25
* update
* update/create symbolic links at C:\ProgramData\Oracle\Java\javapath\. prefering x64 jre if possible.
java (1.8.0.92-4.2.4)
-- Kevin Weis <Compilenix@compilenix.org> 2016-05-03
* update
......
====== Java (java_1.8.0.92-4.2.4) ======
====== Java (java_1.8.0.102-4.2.5) ======
**Feel free to contact me :)**
Tested with Opsi 4.0.6.11\\
Tested with Winst 4.11.3.6\\
Tested with Opsi 4.0.6.46\\
Tested with Winst 4.11.5.20\\
Tested with 10 Pro x64\\
Tested with 8.1 Pro x64\\
Tested with Java 6u10 - 8u92\\
requiredWinstVersion >= 4.11.3\\
By <Compilenix@compilenix.org> 2016-05-03\\
Tested with 7 Pro x64\\
Tested with 7 Pro x86\\
Tested with Java 6u10 - 8u102\\
requiredWinstVersion >= 4.11.5\\
By <Compilenix@compilenix.org> 2016-07-25\\
Download: [[https://compilenix.org/public/opsi/localboot/java/java_1.8.0.92-4.2.4.opsi | All in one - installable opsi package (~ 1.8 GiB)]]\\
Download: [[https://compilenix.org/public/opsi/localboot/java/java_1.8.0.102-4.2.5.opsi | All in one - installable opsi package (~ 1.8 GiB)]]\\
Checksum's and detached pgp signatures: https://compilenix.org/public/opsi/localboot/java/
Source Code: [[https://git.compilenix.org/Compilenix/opsi-java | Code repository]]\\
Check if you have the JCE extrension installed: [[https://compilenix.org/public/opsi/jceCheck.jar | jceCheck.jar]] [[https://compilenix.org/public/opsi/jceCheck.jar.asc | (detached pgp signature)]]\\
Check if you have the JCE installed: [[https://compilenix.org/public/opsi/jceCheck.jar | jceCheck.jar]] [[https://compilenix.org/public/opsi/jceCheck.jar.asc | (detached pgp signature)]]\\
All downloads are pgp signed with:\\
Compilenix <Compilenix@compilenix.org>\\
......@@ -34,48 +37,48 @@ Tree:
│   │   └── local_policy.jar
│   ├── setup_data
│   │   ├── msi
│   │   │   ├── jdk1.8.0_91
│   │   │   │   ├── jdk1.8.0_91.msi
│   │   │   │   ├── sj180910.cab
│   │   │   │   ├── ss180910.cab
│   │   │   │   ├── st180910.cab
│   │   │   │   └── sz180910.cab
│   │   │   ├── jdk1.8.0_91_x64
│   │   │   │   ├── jdk1.8.0_91.msi
│   │   │   │   ├── sj180910.cab
│   │   │   │   ├── ss180910.cab
│   │   │   │   ├── st180910.cab
│   │   │   │   └── sz180910.cab
│   │   │   ├── jdk1.8.0_92
│   │   │   │   ├── jdk1.8.0_92.msi
│   │   │   │   ├── sj180920.cab
│   │   │   │   ├── ss180920.cab
│   │   │   │   ├── st180920.cab
│   │   │   │   └── sz180920.cab
│   │   │   ├── jdk1.8.0_92_x64
│   │   │   │   ├── jdk1.8.0_92.msi
│   │   │   │   ├── sj180920.cab
│   │   │   │   ├── ss180920.cab
│   │   │   │   ├── st180920.cab
│   │   │   │   └── sz180920.cab
│   │   │   ├── jre1.8.0_91
│   │   │   │   └── jre1.8.0_91.msi
│   │   │   ├── jre1.8.0_91_x64
│   │   │   │   └── jre1.8.0_91.msi
│   │   │   ├── jre1.8.0_92
│   │   │   │   └── jre1.8.0_92.msi
│   │   │   └── jre1.8.0_92_x64
│   │   │   └── jre1.8.0_92.msi
│   │   │   ├── jdk1.8.0_101
│   │   │   │   ├── jdk1.8.0_101.msi
│   │   │   │   ├── sj180101.cab
│   │   │   │   ├── ss180101.cab
│   │   │   │   ├── st180101.cab
│   │   │   │   └── sz180101.cab
│   │   │   ├── jdk1.8.0_101_x64
│   │   │   │   ├── jdk1.8.0_10164.msi
│   │   │   │   ├── sj180101.cab
│   │   │   │   ├── ss180101.cab
│   │   │   │   ├── st180101.cab
│   │   │   │   └── sz180101.cab
│   │   │   ├── jdk1.8.0_102
│   │   │   │   ├── jdk1.8.0_102.msi
│   │   │   │   ├── sj180102.cab
│   │   │   │   ├── ss180102.cab
│   │   │   │   ├── st180102.cab
│   │   │   │   └── sz180102.cab
│   │   │   ├── jdk1.8.0_102_x64
│   │   │   │   ├── jdk1.8.0_10264.msi
│   │   │   │   ├── sj180102.cab
│   │   │   │   ├── ss180102.cab
│   │   │   │   ├── st180102.cab
│   │   │   │   └── sz180102.cab
│   │   │   ├── jre1.8.0_101
│   │   │   │   └── jre1.8.0_101.msi
│   │   │   ├── jre1.8.0_101_x64
│   │   │   │   └── jre1.8.0_10164.msi
│   │   │   ├── jre1.8.0_102
│   │   │   │   └── jre1.8.0_102.msi
│   │   │   └── jre1.8.0_102_x64
│   │   │   └── jre1.8.0_10264.msi
│   │   ├── License.txt
│   │   ├── License.url
│   │   ├── jdk-8u91-windows-i586.exe
│   │   ├── jdk-8u91-windows-x64.exe
│   │   ├── jdk-8u92-windows-i586.exe
│   │   ├── jdk-8u92-windows-x64.exe
│   │   ├── jre-8u91-windows-i586.exe
│   │   ├── jre-8u91-windows-x64.exe
│   │   ├── jre-8u92-windows-i586.exe
│   │   └── jre-8u92-windows-x64.exe
│   │   ├── jdk-8u101-windows-i586.exe
│   │   ├── jdk-8u101-windows-x64.exe
│   │   ├── jdk-8u102-windows-i586.exe
│   │   ├── jdk-8u102-windows-x64.exe
│   │   ├── jre-8u101-windows-i586.exe
│   │   ├── jre-8u101-windows-x64.exe
│   │   ├── jre-8u102-windows-i586.exe
│   │   └── jre-8u102-windows-x64.exe
│   ├── Sub_UpdateVariables.ins
│   ├── check_msi-exitcode.ins
│   ├── check_uninstall.ins
......@@ -99,7 +102,7 @@ Tree:
==== What is does, and what not ====
It Does:
- Handle install: x64 and x86, JRE and JDK
- Handle uninstall: x64 and x86, JRE of Java 1.6.0.10 until 1.8.0.92, JDK of Java 1.7.0.0 until 1.8.0.92
- Handle uninstall: x64 and x86, JRE of Java 1.6.0.10 until 1.8.0.102, JDK of Java 1.7.0.0 until 1.8.0.102
- Installation of Java 8
- Add the JCE Patch to every Java installation; see: [[https://docs.oracle.com/javase/8/docs/technotes/guides/security/SunProviders.html | JCE Documentation]]
- Use the check_msi-exitcode script from "Der-Matze": [[userspace:check_msi-exitcode]] (modified)
......@@ -120,9 +123,10 @@ This happends only on x64 System`s. My package will ever prefer of using the EXE
==== Change Log ====
<code>
java (1.8.0.92-4.2.4)
-- Kevin Weis <Compilenix@compilenix.org> 2016-05-03
java (1.8.0.102-4.2.5)
-- Kevin Weis <Compilenix@compilenix.org> 2016-07-25
* update
* update/create symbolic links at C:\ProgramData\Oracle\Java\javapath\. prefering x64 jre if possible.
</code>
==== TODO ====
......@@ -133,7 +137,7 @@ java (1.8.0.92-4.2.4)
===== control =====
<code winst control.txt>
[Package]
version: 4.2.4
version: 4.2.5
depends:
incremental: False
......@@ -143,7 +147,7 @@ id: java
name: Java
description:
advice:
version: 1.8.0.92
version: 1.8.0.102
priority: -95
licenseRequired: False
productClasses:
......@@ -228,6 +232,11 @@ values: ["CPU", "PSU"]
default: ["CPU"]
[Changelog]
java (1.8.0.102-4.2.5)
-- Kevin Weis <Compilenix@compilenix.org> 2016-07-25
* update
* update/create symbolic links at C:\ProgramData\Oracle\Java\javapath\. prefering x64 jre if possible.
java (1.8.0.92-4.2.4)
-- Kevin Weis <Compilenix@compilenix.org> 2016-05-03
* update
......
d8fcd6a0fcbb051cdc429838f7ea286602a0f8adc08643257d1c2b00d7c25beb CLIENT_DATA/uninstall.ins
c7defa4992eccc20cbe0331869ed32033bc0dadae9be970fb3a56af39f83f79f CLIENT_DATA/setup.ins
fadf649815e8dd4295980ec4c81a76e25fea3cecc8067de333a075bbcdaf8fb9 CLIENT_DATA/UnlimitedJCEPolicy/US_export_policy.jar
e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 CLIENT_DATA/UnlimitedJCEPolicy/JCE_PATCHED
4924cbe86a60d93351c8955b924b714ffdeea776b2621d84e3bad99749c56df3 CLIENT_DATA/UnlimitedJCEPolicy/local_policy.jar
82f40e518e74b1bfa00ae120c64227c38750a50651029bac1229e91009985208 CLIENT_DATA/UnlimitedJCEPolicy/README.txt
8484c13e3bc3ef3034ca2bd98ca8be7b0e3b14ce1a9a64c8720c5cb63acc09ea CLIENT_DATA/java.png
6ec94d96e255de0ef1bebe6ecb3c2345be5399ff0698b38d50ed8f80ca974476 CLIENT_DATA/delsub.ins
26677b0e4296ea6684a9ecf9c107528f3369dfb22e7bed67f064c9d3a25a7a65 CLIENT_DATA/check_uninstall.ins
a5858c421bce1ea1147b0c93d8ad99b55c3873495e40aed2972082368bdc5c53 CLIENT_DATA/setup_data/License.url
c188a8c11c6e20acd4960b39fdc90301635a1694cf27120c49ea4dd885af6202 CLIENT_DATA/setup_data/msi/jdk1.8.0_91_x64/sz180910.cab
764dd6cc883b64f5415590b2c2a1fa878f679aedf43735e01b305ef4099f94ae CLIENT_DATA/setup_data/msi/jdk1.8.0_91_x64/ss180910.cab
d40c3181a3dc0c2cea20719cf157f9baf08053f892ba55a8ba22ccf9396deda2 CLIENT_DATA/setup_data/msi/jdk1.8.0_91_x64/jdk1.8.0_91.msi
729ad6dec3ad128e8a4058691fac6caf750bc38cda52031d064b794798959abe CLIENT_DATA/setup_data/msi/jdk1.8.0_91_x64/sj180910.cab
dc9819871aeba398b7de5ca540f96e524a764b40ecb2e528f585642dc3b572f3 CLIENT_DATA/setup_data/msi/jdk1.8.0_91_x64/st180910.cab
b3833b6209a038e62778019e57e9a4d9fb54326f768a9fbacf110b55051a3bda CLIENT_DATA/setup_data/msi/jre1.8.0_92_x64/jre1.8.0_92.msi
54b48cfdb91c78b4de461edc96a805cd90d64891982267f189eed3f7a120f7ac CLIENT_DATA/setup_data/msi/jdk1.8.0_92/st180920.cab
6c3713d81c05a05ce3fe9d6b2f9776e3810848c5d52faf573788d6b1e63db39c CLIENT_DATA/setup_data/msi/jdk1.8.0_92/sj180920.cab
9ac9443bd93ae95ae2d698fc0945455bc479f83ce38ad016864c64219317441f CLIENT_DATA/setup_data/msi/jdk1.8.0_92/sz180920.cab
6844cca4c32032ca0b9be34e535497483b9347774c1c0f930beec7eb77e166c0 CLIENT_DATA/setup_data/msi/jdk1.8.0_92/ss180920.cab
8d2b6dcf39ce0bff088f6e638c98e6afca16b053cb30b57f4ff7755b2629bc5b CLIENT_DATA/setup_data/msi/jdk1.8.0_92/jdk1.8.0_92.msi
6baf95c7c770e22ca25b3b7dc6762f1505f9431c8245ec1cf018c9c970f076b4 CLIENT_DATA/setup_data/msi/jre1.8.0_92/jre1.8.0_92.msi
84052e12e0c43f5f0b0c58368ae0764b0df06db1a5d79a843663261eaedccb6d CLIENT_DATA/setup_data/msi/jdk1.8.0_91/sz180910.cab
51fa7543a66324f0bcccd0ec533f772bd0fcbdddab3195c1a157f04371c9d108 CLIENT_DATA/setup_data/msi/jdk1.8.0_91/ss180910.cab
fcb91cfd5103041f0636d3062cc6484fac49f9f1b6dfe2185d9ee8c42d961bf6 CLIENT_DATA/setup_data/msi/jdk1.8.0_91/jdk1.8.0_91.msi
d947c72c5d8b3559fe9c6bdd6241e4bb344d9af1806a0204883d7558e6f85dba CLIENT_DATA/setup_data/msi/jdk1.8.0_91/sj180910.cab
52ceb860243d4dbacc264466fb1c766b52febef04ac99d40dababdfc611ee839 CLIENT_DATA/setup_data/msi/jdk1.8.0_91/st180910.cab
5ba7c0b63ed2124f01d581b80da16c77642037a2cd131fdbad7e7f2309375e01 CLIENT_DATA/setup_data/msi/jre1.8.0_91/jre1.8.0_91.msi
ef55efdfcc33424353b288c8af9fbf6b89b71bf1b9d5f560a7223d039ceaaaf3 CLIENT_DATA/setup_data/msi/jdk1.8.0_92_x64/st180920.cab
be38e678d224384b5002c8ba03914d204d8cfe5720b8dc5866f50e9f0c18ace8 CLIENT_DATA/setup_data/msi/jdk1.8.0_92_x64/sj180920.cab
108856c9b49bd09dd0ca3bc9c361210de5b1413a6bdb3e05e4a901285526228e CLIENT_DATA/setup_data/msi/jdk1.8.0_92_x64/sz180920.cab
7250ea1ed41a5a971776e82ec2fd2d97982633274e7f300b5c49c5af88b0f0b1 CLIENT_DATA/setup_data/msi/jdk1.8.0_92_x64/ss180920.cab
658b4087e107ad3a3e013ddda6b935e31ac18e2c7ff50608e98f0e91c9ed3c37 CLIENT_DATA/setup_data/msi/jdk1.8.0_92_x64/jdk1.8.0_92.msi
446df72b227d69abaed0c52d7954fae349b8a87bb7d22c281104a4e4e1671ada CLIENT_DATA/setup_data/msi/jre1.8.0_91_x64/jre1.8.0_91.msi
5bcfd4c59ec4bd2be60d5fe508539b4b136b3e4a858ee88f516059a547e7565c CLIENT_DATA/setup_data/jre-8u92-windows-i586.exe