costin 01/06/22 22:52:12
Modified: jk build.xml
jk/native buildconf.sh
Log:
Added a new target to build ajp14 for tomcat33.
Added few more defaults for properties ( based on the current dir layout,
assuming the same dir is used to check out the repositories ). The
properties file can override that, but it's good to have defaults.
Added a small mkdir in the config script, cvs update -dP will remove
the build/unix dir.
Also made "optimize" and "debug" settable properties, consistent with
jakarta-tomcat and other projects.
Congrats for the ./configure scripts, it's amazing. Tommorow I'll play a bit
with ajp14, so far it compiles without problems.
Revision Changes Path
1.10 +54 -2 jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 2001/06/09 02:56:22 1.9
+++ build.xml 2001/06/23 05:52:11 1.10
@@ -13,6 +13,17 @@
<property name="test.runner" value="junit.textui.TestRunner"/>
<property name="test.entry" value="org.apache.ajp.test.TestAll"/>
+ <property name="optimize" value="off" />
+ <property name="debug" value="on" />
+
+ <!-- default locations -->
+ <property name="tomcat-util.jar"
+ location="../util/build/lib/tomcat-util.jar" />
+ <property name="tomcat33.src"
+ location="../../jakarta-tomcat" />
+ <property name="tomcat33.home"
+ location="${tomcat33.src}/build/tomcat" />
+
<path id="test.classpath">
<pathelement location="${jk.build}/classes"/>
<pathelement location="${tomcat-util.jar}"/>
@@ -26,6 +37,15 @@
<pathelement location="${junit.jar}"/>
</path>
+ <path id="build-tomcat33.classpath">
+ <pathelement location="${tomcat-util.jar}"/>
+ <pathelement location="${tomcat33.home}/lib/common/servlet.jar"/>
+ <pathelement location="${tomcat33.home}/lib/common/tomcat_core.jar"/>
+ <pathelement location="${tomcat33.home}/lib/common/core_util.jar"/>
+ <pathelement
+ location="${tomcat33.home}/lib/container/tomcat_util.jar"/>
+ </path>
+
<target name="build-prepare">
<mkdir dir="${jk.build}"/>
<mkdir dir="${jk.build}/classes"/>
@@ -37,8 +57,8 @@
<javac srcdir="java"
destdir="${jk.build}/classes"
deprecation="on"
- debug="on"
- optimize="off"
+ debug="${debug}"
+ optimize="${optimize}"
verbose="off"
excludes="**/CVS/**">
<exclude name="org/apache/ajp/tomcat4/**" if="tomcat4.skip"/>
@@ -89,4 +109,36 @@
<target name="clean">
<delete dir="${jk.build}"/>
</target>
+
+ <!-- ==================== Experimental tomcat33 build ================= -->
+
+ <target name="build-tomcat" depends="build-prepare" >
+ <ant dir="../util" antfile="../util/build.xml"/>
+ <javac srcdir="java"
+ destdir="${jk.build}/classes"
+ deprecation="on"
+ debug="${debug}"
+ optimize="${optimize}"
+ verbose="off"
+ excludes="**/CVS/**">
+ <exclude name="org/apache/ajp/tomcat4/**" />
+ <exclude name="org/apache/ajp/test/**" />
+ <classpath refid="build-tomcat33.classpath"/>
+ </javac>
+ <!-- Copy static resource files -->
+ <copy todir="${jk.build}/classes">
+ <fileset dir="java">
+ <include name="**/*.properties"/>
+ </fileset>
+ </copy>
+
+ <jar jarfile="${jk.build}/lib/tc33_ajp.jar"
+ basedir="${jk.build}/classes"
+ excludes="org/apache/ajp/test" />
+
+ <copy todir="${tomcat33.home}/lib/container"
+ file="build/lib/tc33_ajp.jar" />
+ </target>
+
+
</project>
1.2 +3 -0 jakarta-tomcat-connectors/jk/native/buildconf.sh
Index: buildconf.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/buildconf.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buildconf.sh 2001/06/11 11:07:46 1.1
+++ buildconf.sh 2001/06/23 05:52:12 1.2
@@ -1,4 +1,7 @@
#!/bin/sh
+
+# if cvs -dP the dir will not exist. Alternative: create a dummy file in it
+mkdir script/tool/unix
echo "libtoolize --force --automake"
libtoolize --force --automake
echo "automake -a --foreign -i"
