costin 01/11/26 16:51:16
Modified: jk build.properties.sample build.xml
jk/native build.xml
Log:
Added new properties for apr.
Make sure apr-related files are excluded if apr is not available. This will
be enhanced as we go.
Note that short-term we'll keep the non-APR files. Some features ( like use of
shared memory or pipes for IPC, etc ) will not be available, but the basic
AJP over TCP/IP will work in any case.
As we start using APR we'll try to eliminate as much 'unportable' code as possible.
When this is done, we can get rid of configure and use only a simpler build system
( configure is great for detecting system-specific details, but we'll have less
need for that since APR provides the needed abstractions ).
Revision Changes Path
1.5 +10 -21 jakarta-tomcat-connectors/jk/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.properties.sample,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.properties.sample 2001/11/08 19:30:31 1.4
+++ build.properties.sample 2001/11/27 00:51:16 1.5
@@ -2,31 +2,20 @@
# sample build.properties for ajp connector.
# edit to taste...
#
-# $Id: build.properties.sample,v 1.4 2001/11/08 19:30:31 costin Exp $
+# $Id: build.properties.sample,v 1.5 2001/11/27 00:51:16 costin Exp $
#
-# Directory where catalina is installed
+# Location of Apache2, Apache1.3, Netscape, IIS
+apache2.home=/opt/apache2
+apache13.home=/opt/apache13
+
+# APR location - by default the version included in Apache2 is used.
+apr.include=${apache2.home}/include
+apr.lib=${apache2.home}/lib
+
+# Directory where catalina is installed.
catalina.home=../../jakarta-tomcat-4.0/build
# Directory where tomcat3.3 is installed
tomcat33.home= ../../jakarta-tomcat/build/tomcat
-#
-# tomcat 4 internals
-#
-catalina.jar = ${catalina.home}/server/lib/catalina.jar
-
-#
-# servlet api 2.3
-#
-servlet.jar = ${catalina.home}/common/lib/servlet.jar
-
-#
-# utils.
-#
-tomcat-util.jar = ../util/build/lib/tomcat-util.jar
-
-#
-# junit jar
-#
-junit.jar=f:/dev/junit/junit.jar
1.15 +6 -2 jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 2001/10/26 22:28:27 1.14
+++ build.xml 2001/11/27 00:51:16 1.15
@@ -93,6 +93,7 @@
excludes="**/CVS/**">
<exclude name="org/apache/ajp/tomcat4/**" unless="tomcat4.detect"/>
<exclude name="org/apache/ajp/tomcat33/**" unless="tomcat33.detect"/>
+ <exclude name="org/apache/ajp/test/**" />
<classpath refid="build-main.classpath"/>
</javac>
@@ -154,17 +155,20 @@
<copy todir="${jkant.build}/classes/META-INF" file="jkant/ant.tasks"/>
<jar jarfile="${jkant.build}/jkant.jar"
basedir="${jkant.build}/classes" />
+ </target>
+
+ <!-- It's better to call it directly with individual tags -->
+ <target name="native" >
<ant dir="native" antfile="build.xml" />
</target>
-
<!-- ================ BUILD: Create Jk Javadocs =================== -->
<target name="javadoc">
<delete dir="${jk.build}/javadoc"/>
<mkdir dir="${jk.build}/javadoc"/>
<javadoc packagenames="org.apache.ajp,org.apache.ajp.tomcat4"
sourcepath="java"
- classpath="${tomcat-util.jar}:${catalina.jar}:${servlet.jar}"
+
classpath="${tomcat-util.jar}:${catalina.home}/server/lib/catalina.jar:${catalina.home}/common/lib/servlet.jar"
destdir="${jk.build}/javadoc"
author="true"
version="true"
1.21 +7 -1 jakarta-tomcat-connectors/jk/native/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.xml 2001/11/26 19:37:58 1.20
+++ build.xml 2001/11/27 00:51:16 1.21
@@ -6,6 +6,7 @@
<property file="${user.home}/.ant.properties" />
<property file="${user.home}/build.properties" />
+ <property file="../build.properties" />
<property file="build.properties" />
<!-- Experimental -->
@@ -32,12 +33,13 @@
<!-- ==================== Targets ==================== -->
- <target name="main" depends="init,apache20,apache13,jni">
+ <target name="main" depends="init,apache20,jni">
</target>
<target name="init" >
<taskdef resource="META-INF/ant.tasks"
classpathref="jkant" />
+ <available property="HAVE_APR" file="${apr.include}/apr.h" />
</target>
<target name="jni" depends="init">
@@ -56,6 +58,7 @@
<include name="common/jk_pool.c" />
<include name="common/jk_logger.c" />
<include name="common/jk_nwmain.c" if="netware" />
+ <include name="common/apr/*.c" unless="HAVE_APR" />
</src>
<includes>
<include name="${native.dir}/common" />
@@ -159,6 +162,7 @@
<include name="common/*.c" />
<exclude name="jk_nwmain.c"
unless="netware" />
+ <include name="common/apr/*.c" unless="HAVE_APR" />
</src>
<includes>
<include name="${native.dir}/common" />
@@ -238,6 +242,7 @@
<include name="common/*.c" />
<exclude name="jk_nwmain.c"
unless="netware" />
+ <include name="common/apr/*.c" unless="HAVE_APR" />
</src>
<includes>
<include name="${java.home}/../include" />
@@ -281,6 +286,7 @@
<include name="common/*.c" />
<exclude name="jk_nwmain.c"
unless="netware" />
+ <include name="common/apr/*.c" unless="HAVE_APR" />
</src>
<includes>
<include name="${native.dir}/common" />
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
