Author: jfclere
Date: Mon Sep 8 03:05:40 2008
New Revision: 693041
URL: http://svn.apache.org/viewvc?rev=693041&view=rev
Log:
Arrange release build according to Rainer's comment on 1.1.14.
Modified:
tomcat/connectors/trunk/jni/README.txt
tomcat/connectors/trunk/jni/jnirelease.sh
tomcat/connectors/trunk/jni/native/BUILDING
tomcat/connectors/trunk/jni/native/configure.in
Modified: tomcat/connectors/trunk/jni/README.txt
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/README.txt?rev=693041&r1=693040&r2=693041&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/README.txt (original)
+++ tomcat/connectors/trunk/jni/README.txt Mon Sep 8 03:05:40 2008
@@ -19,7 +19,7 @@
Building
========
ant
-To build the native part see native/BUILDING
+To build the native part see jni/native/BUILDING
Running the examples
====================
Modified: tomcat/connectors/trunk/jni/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/jnirelease.sh?rev=693041&r1=693040&r2=693041&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/jnirelease.sh (original)
+++ tomcat/connectors/trunk/jni/jnirelease.sh Mon Sep 8 03:05:40 2008
@@ -55,17 +55,42 @@
# #define TCN_VERISON "1.1.14"
# FILEVERSION 1,1,14,0
# PRODUCTVERSION 1,1,14,0
-#JKJNIEXT="trunk"
-#JKJNIVER="current"
JKJNIEXT="tags/other/TOMCAT_NATIVE_1_1_15"
JKJNIVER="1.1.15"
+#JKJNIEXT="trunk"
+#JKJNIVER="current"
SVNBASE=https://svn.apache.org/repos/asf/tomcat/connectors/
JKJNIDIST=tomcat-native-${JKJNIVER}-src
rm -rf ${JKJNIDIST}
mkdir -p ${JKJNIDIST}/jni
svn export $SVNBASE/${JKJNIEXT}/jni/native ${JKJNIDIST}/jni/native
if [ $? -ne 0 ]; then
- echo "svn export failed"
+ echo "svn export native failed"
+ exit 1
+fi
+svn export $SVNBASE/${JKJNIEXT}/jni/java ${JKJNIDIST}/jni/java
+if [ $? -ne 0 ]; then
+ echo "svn export java failed"
+ exit 1
+fi
+svn export $SVNBASE/${JKJNIEXT}/jni/build.xml ${JKJNIDIST}/jni/build.xml
+if [ $? -ne 0 ]; then
+ echo "svn export build.xml failed"
+ exit 1
+fi
+svn export $SVNBASE/${JKJNIEXT}/jni/build.properties.sample
${JKJNIDIST}/jni/build.properties.sample
+if [ $? -ne 0 ]; then
+ echo "svn export build.xml failed"
+ exit 1
+fi
+svn export $SVNBASE/${JKJNIEXT}/jni/examples ${JKJNIDIST}/jni/examples
+if [ $? -ne 0 ]; then
+ echo "svn export examples failed"
+ exit 1
+fi
+svn export $SVNBASE/${JKJNIEXT}/jni/test ${JKJNIDIST}/jni/test
+if [ $? -ne 0 ]; then
+ echo "svn export test failed"
exit 1
fi
svn cat $SVNBASE/${JKJNIEXT}/KEYS > ${JKJNIDIST}/KEYS
Modified: tomcat/connectors/trunk/jni/native/BUILDING
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/BUILDING?rev=693041&r1=693040&r2=693041&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/BUILDING (original)
+++ tomcat/connectors/trunk/jni/native/BUILDING Mon Sep 8 03:05:40 2008
@@ -15,6 +15,10 @@
limitations under the License.
================================================================================
+ Building from source package:
+ configure --with-apr=apr_install_location --with-ssl=openssl_install_location
+ make
+
Building from the cvs tree:
sh buildconf --with-apr=apr_source_location.
configure --with-apr=apr_install_location --with-ssl=openssl_install_location
@@ -22,11 +26,11 @@
Testing the build:
The make should produce a .so file named libtcnative-1.so.
- Build the jar containing the example by
+ Build the jar containing the examples by
cd ..
ant jar
- Run the example:
- ant example-basic
+ Run one of the example (the echo one):
+ ant echo-example
Using it in Tomcat:
1 - In <Connector> use of conf/server.xml:
@@ -37,7 +41,7 @@
/home/jfclere/tomcat-connectors/jni/native/.libs for tclib_location
NOTES:
- - configure --without-ssl : Configure without ssl support.
+ - 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).
Modified: tomcat/connectors/trunk/jni/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/configure.in?rev=693041&r1=693040&r2=693041&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/configure.in (original)
+++ tomcat/connectors/trunk/jni/native/configure.in Mon Sep 8 03:05:40 2008
@@ -141,10 +141,14 @@
use_openssl=true;
AC_ARG_ENABLE(openssl,
-[ --disable-openssl avoid using OpenSSL toolkit],
+[AS_HELP_STRING([--disable-openssl],[avoid using OpenSSL toolkit])],
[
- use_openssl=false;
- AC_MSG_RESULT([Disabling SSL support...])
+ case "${enableval}" in
+ no )
+ use_openssl=false;
+ AC_MSG_RESULT([Disabling SSL support...])
+ ;;
+ esac
])
if $use_openssl ; then
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
