tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r895679 - in /tomcat/native/trunk/native: BUILDING build/rpm/tcnative.spec.in build/tcnative.m4 buildconf include/tcn_version.h libtcnative.dsp os/win32/libtcnative.rc srclib/VERSIONS tcnative.dsp
Date Mon, 04 Jan 2010 16:18:38 GMT
Author: rjung
Date: Mon Jan  4 16:18:23 2010
New Revision: 895679

URL: http://svn.apache.org/viewvc?rev=895679&view=rev
Log:
Update/fix some version numbers for tc native 2.0 (trunk).

Modified:
    tomcat/native/trunk/native/BUILDING
    tomcat/native/trunk/native/build/rpm/tcnative.spec.in
    tomcat/native/trunk/native/build/tcnative.m4
    tomcat/native/trunk/native/buildconf
    tomcat/native/trunk/native/include/tcn_version.h
    tomcat/native/trunk/native/libtcnative.dsp
    tomcat/native/trunk/native/os/win32/libtcnative.rc
    tomcat/native/trunk/native/srclib/VERSIONS
    tomcat/native/trunk/native/tcnative.dsp

Modified: tomcat/native/trunk/native/BUILDING
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/BUILDING?rev=895679&r1=895678&r2=895679&view=diff
==============================================================================
--- tomcat/native/trunk/native/BUILDING (original)
+++ tomcat/native/trunk/native/BUILDING Mon Jan  4 16:18:23 2010
@@ -44,8 +44,8 @@
   - configure --disable-openssl: Configure without ssl support.
   - To use it in Tomcat you may have to add in bin/setenv.sh:
     LD_LIBRARY_PATH=openssl_install_location/lib; export LD_LIBRARY_PATH
-    (use ldd ./.libs/libtcnative-1.so to check it).
+    (use ldd ./.libs/libtcnative-2.so to check it).
   - quick testing: openssl s_client -connect localhost:8443
   - For MAC OS X you must manually add a link
     cd ${tcnative installdir}
-    ln -d libtcnative-1.dylib libtcnative-1.jnilib
+    ln -d libtcnative-2.dylib libtcnative-2.jnilib

Modified: tomcat/native/trunk/native/build/rpm/tcnative.spec.in
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/rpm/tcnative.spec.in?rev=895679&r1=895678&r2=895679&view=diff
==============================================================================
--- tomcat/native/trunk/native/build/rpm/tcnative.spec.in (original)
+++ tomcat/native/trunk/native/build/rpm/tcnative.spec.in Mon Jan  4 16:18:23 2010
@@ -15,7 +15,8 @@
 # limitations under the License.
 #
 
-%define tcnver 1
+%define tcnver 2
+%define aprver 1
 
 Summary: Tomcat Native Java library
 Name: tcnative
@@ -26,7 +27,7 @@
 URL: http://apr.apache.org/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 0:{version}-{release}, openssl >=
0.9.7
+BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 0:{version}-{release}, openssl >=
0.9.8
 
 %description
 The mission of the Tomcat Native Library (TCN) is to provide a
@@ -36,7 +37,7 @@
 %package devel
 Group: Development/Libraries
 Summary: Tomcat Native development kit
-Requires: tcnative = %{version}-%{release}, apr-devel >= 0:{version}-{release}, openssl-devel
>= 0.9.7
+Requires: tcnative = %{version}-%{release}, apr-devel >= 0:{version}-{release}, openssl-devel
>= 0.9.8
 
 %description devel
 The mission of the Tomcat Native Library (TCN) is to provide a
@@ -48,7 +49,7 @@
 
 %build
 %configure --with-apr=%{_prefix} \
-        --includedir=%{_includedir}/apr-%{tcnver}
+        --includedir=%{_includedir}/apr-%{aprver}
 make %{?_smp_mflags} && make dox
 
 %check
@@ -85,10 +86,12 @@
 %{_libdir}/libtcnative-%{tcnver}.*a
 %{_libdir}/libtcnative-%{tcnver}.so
 %{_libdir}/pkgconfig/tcnative-%{tcnver}.pc
-%{_includedir}/apr-%{tcnver}/*.h
+%{_includedir}/apr-%{aprver}/*.h
 %doc --parents html
 
 %changelog
+* Mon Jan 04 2010 Rainer Jung <rjung@apache.org> 2.0.0-1
+- update for tcnative 2.0
 * Tue Jun 22 2004 Mladen Turk <mturk@jboss.com> 1.0.0-1
 - update to support v1.0.2 of APR
                                                                                 

Modified: tomcat/native/trunk/native/build/tcnative.m4
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/tcnative.m4?rev=895679&r1=895678&r2=895679&view=diff
==============================================================================
--- tomcat/native/trunk/native/build/tcnative.m4 (original)
+++ tomcat/native/trunk/native/build/tcnative.m4 Mon Jan  4 16:18:23 2010
@@ -33,10 +33,10 @@
   sapr_version="`echo $sapr_pversion|sed -e 's/\([a-z]*\)$/.\1/'`"
   tc_save_IFS=$IFS; IFS=.; set $sapr_version; IFS=$tc_save_IFS
   if test "${1}" -lt "1"; then
-    AC_MSG_ERROR(You need APR version 1.2.1 or newer installed.)
+    AC_MSG_ERROR(You need APR version 1.3.3 or newer installed.)
   else
     if test "${2}" -lt "2"; then
-      AC_MSG_ERROR(You need APR version 1.2.1 or newer installed.)
+      AC_MSG_ERROR(You need APR version 1.3.3 or newer installed.)
     fi
   fi
 
@@ -365,14 +365,11 @@
 #include <stdio.h>
 #include <openssl/opensslv.h>
 int main() {
-        if ((OPENSSL_VERSION_NUMBER >= 0x0090701fL &&
-         OPENSSL_VERSION_NUMBER < 0x00908000L) ||
-         OPENSSL_VERSION_NUMBER >= 0x0090801fL)
+        if (OPENSSL_VERSION_NUMBER >= 0x009080bfL)
             return (0);
     printf("\n\nFound   OPENSSL_VERSION_NUMBER %#010x\n",
         OPENSSL_VERSION_NUMBER);
-    printf("Require OPENSSL_VERSION_NUMBER 0x0090701f or greater (0.9.7a)\n"
-           "Require OPENSSL_VERSION_NUMBER 0x0090801f or greater (0.9.8a)\n\n");
+    printf("Require OPENSSL_VERSION_NUMBER 0x009080bf or greater (0.9.8k)\n\n");
         return (1);
 }
         ],

Modified: tomcat/native/trunk/native/buildconf
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/buildconf?rev=895679&r1=895678&r2=895679&view=diff
==============================================================================
--- tomcat/native/trunk/native/buildconf (original)
+++ tomcat/native/trunk/native/buildconf Mon Jan  4 16:18:23 2010
@@ -19,7 +19,7 @@
 
 # Default place to look for apr source.  Can be overridden with 
 #   --with-apr=[directory]
-apr_src_dir=`pwd`/srclib/apr-1.2.7
+apr_src_dir=`pwd`/srclib/apr-1.3.3
 
 while test $# -gt 0 
 do

Modified: tomcat/native/trunk/native/include/tcn_version.h
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/tcn_version.h?rev=895679&r1=895678&r2=895679&view=diff
==============================================================================
--- tomcat/native/trunk/native/include/tcn_version.h (original)
+++ tomcat/native/trunk/native/include/tcn_version.h Mon Jan  4 16:18:23 2010
@@ -60,13 +60,13 @@
  * programs such as structure size changes.  No binary compatibility is
  * possible across a change in the major version.
  */
-#define TCN_MAJOR_VERSION       1
+#define TCN_MAJOR_VERSION       2
 
 /**
  * Minor API changes that do not cause binary compatibility problems.
  * Should be reset to 0 when upgrading TCN_MAJOR_VERSION
  */
-#define TCN_MINOR_VERSION       2
+#define TCN_MINOR_VERSION       0
 
 /** patch level */
 #define TCN_PATCH_VERSION       0

Modified: tomcat/native/trunk/native/libtcnative.dsp
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/libtcnative.dsp?rev=895679&r1=895678&r2=895679&view=diff
==============================================================================
--- tomcat/native/trunk/native/libtcnative.dsp (original)
+++ tomcat/native/trunk/native/libtcnative.dsp Mon Jan  4 16:18:23 2010
@@ -53,7 +53,7 @@
 # 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:"../openssl/out32" /libpath:"../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:"../openssl/out32" /libpath:"../openssl/out32dll"
/opt:ref
 
 !ELSEIF  "$(CFG)" == "libtcnative - Win32 Debug"
 
@@ -79,7 +79,7 @@
 # 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:"../openssl/out32"
/libpath:"../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:"../openssl/out32"
/libpath:"../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=895679&r1=895678&r2=895679&view=diff
==============================================================================
--- tomcat/native/trunk/native/os/win32/libtcnative.rc (original)
+++ tomcat/native/trunk/native/os/win32/libtcnative.rc Mon Jan  4 16:18:23 2010
@@ -20,7 +20,7 @@
                      "See the License for the specific language governing " \
                      "permissions and limitations under the License."
 
-#define TCN_VERSION "1.1.16"
+#define TCN_VERSION "2.0.0"
 1000 ICON "apache.ico"
 
 1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@
 END
 
 1 VERSIONINFO
- FILEVERSION 1,1,16,0
- PRODUCTVERSION 1,1,16,0
+ FILEVERSION 2,0,0,0
+ PRODUCTVERSION 2,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -56,9 +56,9 @@
             VALUE "CompanyName", "Apache Software Foundation\0"
             VALUE "FileDescription", "Tomcat Native Java Library\0"
             VALUE "FileVersion", TCN_VERSION "\0"
-            VALUE "InternalName", "libtcnative-1\0"
+            VALUE "InternalName", "libtcnative-2\0"
             VALUE "LegalCopyright", TCN_COPYRIGHT "\0"
-            VALUE "OriginalFilename", "libtcnative-1.dll\0"
+            VALUE "OriginalFilename", "libtcnative-2.dll\0"
             VALUE "ProductName", "Tomcat Native Java Library\0"
             VALUE "ProductVersion", TCN_VERSION "\0"
         END

Modified: tomcat/native/trunk/native/srclib/VERSIONS
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/VERSIONS?rev=895679&r1=895678&r2=895679&view=diff
==============================================================================
--- tomcat/native/trunk/native/srclib/VERSIONS (original)
+++ tomcat/native/trunk/native/srclib/VERSIONS Mon Jan  4 16:18:23 2010
@@ -1,4 +1,4 @@
 Use the following version of the libraries
 
-- APR 1.2.8, http://apr.apache.org
-- OpenSSL 0.9.8e, http://www.openssl.org
+- APR 1.3.3, http://apr.apache.org
+- OpenSSL 0.9.8k, http://www.openssl.org

Modified: tomcat/native/trunk/native/tcnative.dsp
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/tcnative.dsp?rev=895679&r1=895678&r2=895679&view=diff
==============================================================================
--- tomcat/native/trunk/native/tcnative.dsp (original)
+++ tomcat/native/trunk/native/tcnative.dsp Mon Jan  4 16:18:23 2010
@@ -53,7 +53,7 @@
 # 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:"../openssl/out32" /libpath:"../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:"../openssl/out32" /libpath:"../openssl/out32dll"
/opt:ref
 
 !ELSEIF  "$(CFG)" == "tcnative - Win32 Debug"
 
@@ -79,7 +79,7 @@
 # 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:"../openssl/out32"
/libpath:"../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:"../openssl/out32"
/libpath:"../openssl/out32dll" 
 
 !ENDIF 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message