You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/06/16 18:30:12 UTC
[tomcat] branch main updated: More 32-bit Windows removal.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new b19ed00e30 More 32-bit Windows removal.
b19ed00e30 is described below
commit b19ed00e3043d40ae27b8633c58c1a07b63cbfd5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 16 19:30:06 2023 +0100
More 32-bit Windows removal.
---
res/install-win/tomcat.nsi | 36 ++----------------------------------
res/welcome.bin.html | 17 +++++------------
res/welcome.main.html | 17 +++++------------
webapps/docs/setup.xml | 15 ++++++---------
4 files changed, 18 insertions(+), 67 deletions(-)
diff --git a/res/install-win/tomcat.nsi b/res/install-win/tomcat.nsi
index db033fd733..8bd9b11cf5 100644
--- a/res/install-win/tomcat.nsi
+++ b/res/install-win/tomcat.nsi
@@ -860,34 +860,7 @@ Function findJavaHome
${EndIf}
${EndIf}
- ; If no 64-bit Java was found, look for 32-bit Java
- ${If} $1 == ""
- SetRegView 32
- 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
- ${EndIf}
- ${EndIf}
-
- ; If no 32-bit Java (JRE) found, look for 64-bit Java JDK
+ ; If no 64-bit Java (JRE) found, look for 64-bit Java JDK
${If} $1 == ""
${AndIf} $0 != "%PROGRAMW6432%"
ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\JDK" "CurrentVersion"
@@ -1189,12 +1162,7 @@ FunctionEnd
nsExec::ExecToLog '"$INSTDIR\bin\$TomcatServiceFileName" //DS//$TomcatServiceName --LogPath "$INSTDIR\logs"'
ClearErrors
- ; Don't know if 32-bit or 64-bit registry was used so, for now, remove both
- SetRegView 32
- DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName"
- DeleteRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@\$TomcatServiceName"
- DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName"
- DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName"
+ ; Remove registry entries
SetRegView 64
DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName"
DeleteRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@\$TomcatServiceName"
diff --git a/res/welcome.bin.html b/res/welcome.bin.html
index 095c8009d0..b9d6cec86f 100644
--- a/res/welcome.bin.html
+++ b/res/welcome.bin.html
@@ -51,19 +51,12 @@ RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
<dd>Base distribution. These distributions do not include the Windows
service wrapper nor the compiled APR/native library for Windows.</dd>
<dt>apache-tomcat-[version].exe</dt>
- <dd>32-bit/64-bit Windows installer for Tomcat.   Please note that while this
- distribution includes the vast majority of the base distribution, some of the
- command-line scripts for launching Tomcat are not included. This distribution
- is intended for those users planning to launch Tomcat through the Windows
- shortcuts or services.</dd>
- <dt>apache-tomcat-[version]-windows-x86.zip</dt>
- <dd>32-bit Windows specific distribution that includes the Windows service
- wrapper and the compiled APR/native library for use with 32-bit JVMs on both
- 32 and 64 bit Windows platforms.</dd>
+ <dd>Windows installer for Tomcat.   This distribution is intended for
+ those users planning to launch Tomcat through the Windows shortcuts or
+ services.</dd>
<dt>apache-tomcat-[version]-windows-x64.zip</dt>
- <dd>64-bit Windows specific distribution that includes the Windows service
- wrapper and the compiled APR/native library for use with 64-bit JVMs on
- x64 Windows platforms.</dd>
+ <dd>Windows specific distribution that includes the Windows service wrapper
+ and the compiled APR/native library.</dd>
<dt>apache-tomcat-[version]-deployer.zip or .tar.gz</dt>
<dd>The standalone
<a href="https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/deployer-howto.html">
diff --git a/res/welcome.main.html b/res/welcome.main.html
index ff22030a68..fccc367b7f 100644
--- a/res/welcome.main.html
+++ b/res/welcome.main.html
@@ -51,19 +51,12 @@ RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
<dd>Base distribution. These distributions do not include the Windows
service wrapper nor the compiled APR/native library for Windows.</dd>
<dt>apache-tomcat-[version].exe</dt>
- <dd>32-bit/64-bit Windows installer for Tomcat.   Please note that while this
- distribution includes the vast majority of the base distribution, some of the
- command-line scripts for launching Tomcat are not included. This distribution
- is intended for those users planning to launch Tomcat through the Windows
- shortcuts or services.</dd>
- <dt>apache-tomcat-[version]-windows-x86.zip</dt>
- <dd>32-bit Windows specific distribution that includes the Windows service
- wrapper and the compiled APR/native library for use with 32-bit JVMs on both
- 32 and 64 bit Windows platforms.</dd>
+ <dd>Windows installer for Tomcat.   This distribution is intended for
+ those users planning to launch Tomcat through the Windows shortcuts or
+ services.</dd>
<dt>apache-tomcat-[version]-windows-x64.zip</dt>
- <dd>64-bit Windows specific distribution that includes the Windows service
- wrapper and the compiled APR/native library for use with 64-bit JVMs on
- x64 Windows platforms.</dd>
+ <dd>Windows specific distribution that includes the Windows service wrapper
+ and the compiled APR/native library.</dd>
<dt>apache-tomcat-[version]-deployer.zip or .tar.gz</dt>
<dd>The standalone
<a href="https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/deployer-howto.html">
diff --git a/webapps/docs/setup.xml b/webapps/docs/setup.xml
index b3e80280eb..7769588d93 100644
--- a/webapps/docs/setup.xml
+++ b/webapps/docs/setup.xml
@@ -62,15 +62,12 @@
<li><strong>Java location</strong>: The installer will provide a default
JRE to use to run the service. The installer uses the registry to
determine the base path of a Java <min-java-version/> or later JRE,
- including the JRE installed as part of the full JDK. When running on
- a 64-bit operating system, the installer will first look for a
- 64-bit JRE and only look for a 32-bit JRE if a 64-bit JRE is not
- found. If a JRE cannot be found when running on a 64-bit operating
- system, the installer will look for a 64-bit JDK. Finally, if a JRE
- or JDK has not been found, the installer will try to use the
- <code>JAVA_HOME</code> environment variable. It is not mandatory to
- use the default JRE detected by the installer. Any installed Java
- <min-java-version/> or later JRE (32-bit or 64-bit) may be
+ including the JRE installed as part of the full JDK. The installer
+ will first look for a JRE and only look for a JDK if a JRE is not
+ found. Finally, if a JRE or JDK has not been found, the installer
+ will try to use the <code>JAVA_HOME</code> environment variable. It
+ is not mandatory to use the default JRE detected by the installer.
+ Any installed Java <min-java-version/> or later JRE may be
used.</li>
<li><strong>Tray icon</strong>: When Tomcat is run as a service, there
will not be any tray icon present when Tomcat is running. Note that
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org