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 2022/06/30 07:49:08 UTC
[tomcat-native] branch main updated: Update minimum Windows version to 7 / 2008 R2
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-native.git
The following commit(s) were added to refs/heads/main by this push:
new 97750492f Update minimum Windows version to 7 / 2008 R2
97750492f is described below
commit 97750492f8d1cb22f03f332a46c32a0c5e49c4bf
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 30 08:49:04 2022 +0100
Update minimum Windows version to 7 / 2008 R2
---
native/NMAKEmakefile.inc | 16 ++--------------
xdocs/miscellaneous/changelog.xml | 5 +++++
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/native/NMAKEmakefile.inc b/native/NMAKEmakefile.inc
index 257d30b6d..0b380b4ef 100644
--- a/native/NMAKEmakefile.inc
+++ b/native/NMAKEmakefile.inc
@@ -146,19 +146,7 @@ WINVER=WIN7
!ENDIF
-!IF "$(WINVER)" == "WIN2K"
-NMAKE_WINVER = 0x0500
-_WIN32_IE = 0x0500
-!ELSEIF "$(WINVER)" == "WINXP"
-NMAKE_WINVER = 0x0501
-_WIN32_IE = 0x0600
-!ELSEIF "$(WINVER)" == "WIN2003"
-NMAKE_WINVER = 0x0502
-_WIN32_IE = 0x0600
-!ELSEIF "$(WINVER)" == "VISTA"
-NMAKE_WINVER = 0x0600
-_WIN32_IE = 0x0700
-!ELSEIF "$(WINVER)" == "WIN7"
+!IF "$(WINVER)" == "WIN7"
NMAKE_WINVER = 0x0601
_WIN32_IE = 0x0800
!ELSEIF "$(WINVER)" == "WIN8"
@@ -171,7 +159,7 @@ _WIN32_IE = 0x0A00
NMAKE_WINVER = 0x0A00
_WIN32_IE = 0x0A00
!ELSE
-!ERROR Must specify WINVER environment variable (WIN2K, WINXP, WIN2003, VISTA, WIN7, WIN8, WIN81, WIN10)
+!ERROR Must specify WINVER environment variable (WIN7, WIN8, WIN81, WIN10)
!ENDIF
NMAKE_WINNT = -DWINNT -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) -D_WIN32_IE=$(_WIN32_IE) -DPSAPI_VERSION=1
diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml
index b2267bd1c..609673dce 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -59,6 +59,11 @@
<update>
Update the minimum required Java version to Java 11. (markt)
</update>
+ <update>
+ Remove support for Windows 2000, Windows XP, Windows Server 2003, Windows
+ Vista and Windows Server 2008. The minimum Windows version is now Windows
+ 7 / Windows Server 2008 R2. (markt)
+ </update>
</changelog>
</section>
<section name="Changes in 1.2.x">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org