Author: rjung
Date: Sat Oct 31 11:43:27 2015
New Revision: 1711603
URL: http://svn.apache.org/viewvc?rev=1711603&view=rev
Log:
tcnative trunk is a 1.2.x branch, so the
dll major version is still 1.
Modified:
tomcat/native/trunk/native/libtcnative.dsp
tomcat/native/trunk/native/os/win32/libtcnative.rc
tomcat/native/trunk/native/tcnative.dsp
Modified: tomcat/native/trunk/native/libtcnative.dsp
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/libtcnative.dsp?rev=1711603&r1=1711602&r2=1711603&view=diff
==============================================================================
--- tomcat/native/trunk/native/libtcnative.dsp (original)
+++ tomcat/native/trunk/native/libtcnative.dsp Sat Oct 31 11:43:27 2015
@@ -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-2.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-1.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-2.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-1.dll" /libpath:"./srclib/openssl/out32"
/libpath:"./srclib/openssl/out32dll"
!ENDIF
Modified: tomcat/native/trunk/native/os/win32/libtcnative.rc
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/win32/libtcnative.rc?rev=1711603&r1=1711602&r2=1711603&view=diff
==============================================================================
--- tomcat/native/trunk/native/os/win32/libtcnative.rc (original)
+++ tomcat/native/trunk/native/os/win32/libtcnative.rc Sat Oct 31 11:43:27 2015
@@ -56,9 +56,9 @@ BEGIN
VALUE "CompanyName", "Apache Software Foundation\0"
VALUE "FileDescription", "Tomcat Native Java Library\0"
VALUE "FileVersion", TCN_VERSION "\0"
- VALUE "InternalName", "libtcnative-2\0"
+ VALUE "InternalName", "libtcnative-1\0"
VALUE "LegalCopyright", TCN_COPYRIGHT "\0"
- VALUE "OriginalFilename", "libtcnative-2.dll\0"
+ VALUE "OriginalFilename", "libtcnative-1.dll\0"
VALUE "ProductName", "Tomcat Native Java Library\0"
VALUE "ProductVersion", TCN_VERSION "\0"
END
@@ -68,3 +68,4 @@ BEGIN
VALUE "Translation", 0x409, 1200
END
END
+
Modified: tomcat/native/trunk/native/tcnative.dsp
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/tcnative.dsp?rev=1711603&r1=1711602&r2=1711603&view=diff
==============================================================================
--- tomcat/native/trunk/native/tcnative.dsp (original)
+++ tomcat/native/trunk/native/tcnative.dsp Sat Oct 31 11:43:27 2015
@@ -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-2.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-1.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-2.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-1.dll" /libpath:"./srclib/openssl/out32"
/libpath:"./srclib/openssl/out32dll"
!ENDIF
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
