This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push: new 2c36386 Correct registry entry locations for silent installs with 64-bit JVMs 2c36386 is described below commit 2c363861fe7c81778893aefb33f1983f4d5176f8 Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Sep 10 09:04:39 2019 +0100 Correct registry entry locations for silent installs with 64-bit JVMs --- res/tomcat.nsi | 10 +++++++--- webapps/docs/changelog.xml | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/res/tomcat.nsi b/res/tomcat.nsi index 6f9304f..c50f084 100644 --- a/res/tomcat.nsi +++ b/res/tomcat.nsi @@ -823,22 +823,26 @@ Function checkJava IntOp $R3 $R3 << 8 IntOp $R2 $R2 + $R3 - IntCmp $R2 0x014c +1 +3 +3 + IntCmp $R2 0x014c +1 +4 +4 StrCpy "$Arch" "x86" + SetRegView 32 Goto DonePEHeader - IntCmp $R2 0x8664 +1 +3 +3 + IntCmp $R2 0x8664 +1 +4 +4 StrCpy "$Arch" "x64" + SetRegView 64 Goto DonePEHeader - IntCmp $R2 0x0200 +1 +3 +3 + IntCmp $R2 0x0200 +1 +4 +4 StrCpy "$Arch" "i64" + SetRegView 64 Goto DonePEHeader WrongPEHeader: IfSilent +2 MessageBox MB_OK|MB_ICONEXCLAMATION 'Cannot read PE header from "$JvmDll"$\r$\nWill assume that the architecture is x86.' DetailPrint 'Cannot read PE header from "$JvmDll". Assuming the architecture is x86.' + SetRegView 32 StrCpy "$Arch" "x86" DonePEHeader: diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index c8735f1..e781d04 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -133,6 +133,11 @@ that meant that when installing a service, the service display name was not set. (markt) </fix> + <fix> + When performing a silent install with the Windows Installer, ensure that + the registry entires are added to the 64-bit registry when using a + 64-bit JVM. (markt) + </fix> </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org