This is an automated email from the ASF dual-hosted git repository.
michaelo 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 d280a8d1e BZ 67615: Windows binary for version 2 has incorrect version
suffix compared to the GNU autoconf version
d280a8d1e is described below
commit d280a8d1e3e8f8e0ff23b53ead03c429f4e8ad35
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Wed Oct 11 17:08:34 2023 +0200
BZ 67615: Windows binary for version 2 has incorrect version suffix
compared to the GNU autoconf version
---
native/NMAKEmakefile | 4 ++--
native/libtcnative.dsp | 4 ++--
native/tcnative.dsp | 4 ++--
xdocs/miscellaneous/changelog.xml | 6 ++++++
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/native/NMAKEmakefile b/native/NMAKEmakefile
index 51653caf5..011cbb06a 100644
--- a/native/NMAKEmakefile
+++ b/native/NMAKEmakefile
@@ -29,9 +29,9 @@
#
!IF !DEFINED(APR_DECLARE_STATIC) || "$(APR_DECLARE_STATIC)" == ""
-PROJECT = libtcnative-1
+PROJECT = libtcnative-2
!ELSE
-PROJECT = tcnative-1
+PROJECT = tcnative-2
!ENDIF
TARGET = DLL
diff --git a/native/libtcnative.dsp b/native/libtcnative.dsp
index 1e88b7c57..02c512b42 100644
--- a/native/libtcnative.dsp
+++ b/native/libtcnative.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib /nologo /base:"0x6EE00000" /subsystem:windows
/dll /debug /machine:I386 /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386
/out:"Release/libtcnative-1.dll" /libpath:"./srclib/openssl/out32"
/libpath:"./srclib/openssl/out32dll" /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386
/out:"Release/libtcnative-2.dll" /libpath:"./srclib/openssl/out32"
/libpath:"./srclib/openssl/out32dll" /opt:ref
!ELSEIF "$(CFG)" == "libtcnative - Win32 Debug"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib /nologo /base:"0x6EE00000" /subsystem:windows
/dll /incremental:no /debug /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386
/out:"Debug/libtcnative-1.dll" /libpath:"./srclib/openssl/out32"
/libpath:"./srclib/openssl/out32dll"
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386
/out:"Debug/libtcnative-2.dll" /libpath:"./srclib/openssl/out32"
/libpath:"./srclib/openssl/out32dll"
!ENDIF
diff --git a/native/tcnative.dsp b/native/tcnative.dsp
index 56c9db8c7..dbaeae301 100644
--- a/native/tcnative.dsp
+++ b/native/tcnative.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib /nologo /base:"0x6EE00000" /subsystem:windows
/dll /debug /machine:I386 /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386
/out:"LibR/tcnative-1.dll" /libpath:"./srclib/openssl/out32"
/libpath:"./srclib/openssl/out32dll" /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386
/out:"LibR/tcnative-2.dll" /libpath:"./srclib/openssl/out32"
/libpath:"./srclib/openssl/out32dll" /opt:ref
!ELSEIF "$(CFG)" == "tcnative - Win32 Debug"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib /nologo /base:"0x6EE00000" /subsystem:windows
/dll /incremental:no /debug /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386
/out:"LibD/tcnative-1.dll" /libpath:"./srclib/openssl/out32"
/libpath:"./srclib/openssl/out32dll"
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386
/out:"LibD/tcnative-2.dll" /libpath:"./srclib/openssl/out32"
/libpath:"./srclib/openssl/out32dll"
!ENDIF
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index 5f75084b3..9772a91a9 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -32,6 +32,12 @@
</p>
</section>
<section name="Changes in 2.0.7">
+ <changelog>
+ <fix>
+ <bug>67615</bug>: Windows binary for version 2 has incorrect version
suffix
+ compared to the GNU autoconf version. (michaelo)
+ </fix>
+ </changelog>
</section>
<section name="Changes in 2.0.6">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
