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
commit 6f2ac3e07c92d6e6502e1d915189f62db39889f9 Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri May 23 17:25:03 2025 +0100 Update build environment and recommended versions --- native/srclib/BUILDING | 28 +++++++++------------------- native/srclib/VERSIONS | 4 ++-- xdocs/miscellaneous/changelog.xml | 11 +++++++++++ 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/native/srclib/BUILDING b/native/srclib/BUILDING index cb5b3b85f..69312723f 100644 --- a/native/srclib/BUILDING +++ b/native/srclib/BUILDING @@ -1,35 +1,25 @@ Building apr on windows ----------------------- -Open Visual Studio command prompt and execute -nmake -f NMAKEMakefile BUILD_CPU=x86 APR_DECLARE_STATIC=1 +For 32-bit windows use +> "c:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat" +> nmake -f NMAKEmakefile CPU=X86 APR_DECLARE_STATIC=1 -For building 64-bit version execute -nmake -f NMAKEMakefile BUILD_CPU=x64 APR_DECLARE_STATIC=1 - -Make sure you select the correct Visual Studio command prompt -environment before calling nmake so that correct -compiler is setup for the target architecture. +For 64-bit windows use +> "c:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" +> nmake -f NMAKEmakefile CPU=X64 APR_DECLARE_STATIC=1 Building OpenSSL 3.0.0 and later ---------------------------------- -Apply openssl-msvcrt-3.0.x.patch - -This patch makes sure that static version of OpenSSL libraries -is linked to msvcrt.dll instead statically linking msvcrt. -Without that patch it won't be possible to create statically linked -Tomcat native .dll -This patch also addresses issues caused by CMSC compiling against an older Windows -API than expected for the compiler version. - -Then follow the standard OpenSSL make procedure ... - +For 32-bit Windows use +> "c:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat" > perl Configure no-shared VC-WIN32 > nmake For 64-bit Windows use +> "c:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" > perl Configure no-shared VC-WIN64A > nmake diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS index c4aabb926..8c73f431f 100644 --- a/native/srclib/VERSIONS +++ b/native/srclib/VERSIONS @@ -4,8 +4,8 @@ The current minimum versions are: The following version of the libraries are recommended: -- APR 1.7.4 or later, http://apr.apache.org -- OpenSSL 3.0.14 or later, http://www.openssl.org +- APR 1.7.6 or later, http://apr.apache.org +- OpenSSL 3.5.0 or later, http://www.openssl.org Older versions should also work but are not as thoroughly tested by the Tomcat Native team diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index 809f9bfd6..9f3d2deb8 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -32,6 +32,17 @@ </p> </section> <section name="Changes in 2.0.9"> + <changelog> + <update> + Update the Windows build environment to use Visual Studio 2022. (markt) + </update> + <update> + Update the recommended minimum version of OpenSSL to 3.5.0. (markt) + </update> + <update> + Update the recommended minimum version of APR to 1.7.6. (markt) + </update> + </changelog> </section> <section name="Changes in 2.0.8"> <changelog> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org