Author: markt
Date: Wed Oct 11 18:14:09 2017
New Revision: 1811861
URL: http://svn.apache.org/viewvc?rev=1811861&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61598
Update the Windows installer to search the new (as of Java 9) registry
locations when looking for a JRE.
Modified:
tomcat/trunk/res/tomcat.nsi
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1811861&r1=1811860&r2=1811861&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Wed Oct 11 18:14:09 2017
@@ -854,26 +854,46 @@ Function findJavaHome
ExpandEnvStrings $0 "%PROGRAMW6432%"
${If} $0 != "%PROGRAMW6432%"
SetRegView 64
- ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment"
"CurrentVersion"
- ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2"
"JavaHome"
- ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2"
"RuntimeLib"
+ ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\JRE" "CurrentVersion"
+ ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\JRE\$2" "JavaHome"
+ ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\JRE\$2" "RuntimeLib"
IfErrors 0 +2
StrCpy $1 ""
ClearErrors
+
+ ${If} $1 == ""
+ ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment"
"CurrentVersion"
+ ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2"
"JavaHome"
+ ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2"
"RuntimeLib"
+
+ IfErrors 0 +2
+ StrCpy $1 ""
+ ClearErrors
+ ${EndIf}
${EndIf}
; If no 64-bit Java was found, look for 32-bit Java
${If} $1 == ""
SetRegView 32
- ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment"
"CurrentVersion"
- ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2"
"JavaHome"
- ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2"
"RuntimeLib"
+ ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\JRE" "CurrentVersion"
+ ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\JRE\$2" "JavaHome"
+ ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\JRE\$2" "RuntimeLib"
IfErrors 0 +2
StrCpy $1 ""
ClearErrors
+ ${If} $1 == ""
+ ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment"
"CurrentVersion"
+ ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2"
"JavaHome"
+ ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2"
"RuntimeLib"
+
+ IfErrors 0 +2
+ StrCpy $1 ""
+ ClearErrors
+ ${EndIf}
+
; If using 64-bit, go back to using 64-bit registry
${If} $0 != "%PROGRAMW6432%"
SetRegView 64
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1811861&r1=1811860&r2=1811861&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Oct 11 18:14:09 2017
@@ -112,6 +112,10 @@
<bug>61590</bug>: Enable <code>service.bat</code> to recognise when
<code>JAVA_HOME</code> is configured for a Java 9 JDK. (markt)
</fix>
+ <fix>
+ <bug>61598</bug>: Update the Windows installer to search the new (as of
+ Java 9) registry locations when looking for a JRE. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
