billbarker 2004/10/11 20:42:22
Modified: jk build.xml
Log:
Splitting out version targets, as part of Gump cleanup.
Shouldn't effect 'normal' builds at all.
Revision Changes Path
1.77 +127 -53 jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- build.xml 29 Aug 2004 18:14:17 -0000 1.76
+++ build.xml 12 Oct 2004 03:42:22 -0000 1.77
@@ -23,6 +23,12 @@
<property name="compile.debug" value="true" />
<property name="compile.deprecation" value="false" />
+ <property name="tomcat-jk.jar" value="${jk.build}/lib/tomcat-jk.jar" />
+ <property name="tomcat-jkconfig.jar" value="${jk.build}/lib/jkconfig.jar" />
+ <property name="tomcat-jkshm.jar" value="${jk.build}/lib/jkshm.jar" />
+ <property name="tomcat-jk2.jar" value="${jk.build}/lib/tomcat-jk2.jar" />
+ <property name="tomcat-jni.jar" value="${jk.build}/lib/tomcat-jni.jar" />
+
<!-- default locations, overrident by properties -->
<property name="base.path" location="/usr/share/java"/>
@@ -36,10 +42,17 @@
location="../../jakarta-tomcat-catalina/build" />
<property name="coyote.home"
location="../coyote/build" />
+ <property name="tomcat-util.home" location="../util/build" />
<property name="tomcat-coyote.jar"
location="${coyote.home}/lib/tomcat-coyote.jar" />
<property name="servlet-api.jar"
location="${tomcat5.home}/common/lib/servlet-api.jar" />
- <property name="tomcat-util.jar" location="../util/build/lib/tomcat-util.jar" />
+ <property name="tomcat-util.jar"
location="${tomcat-util.home}/lib/tomcat-util.jar" />
+ <property name="tc4-catalina.jar"
location="${tomcat41.home}/server/lib/catalina.jar" />
+ <property name="tc5-catalina.jar"
location="${tomcat5.home}/server/lib/catalina.jar" />
+ <property name="tc3-core.jar"
location="${tomcat33.home}/lib/common/tomcat_core.jar" />
+ <property name="tc3-core_util.jar"
location="${tomcat33.home}/lib/common/core_util.jar" />
+ <property name="tc3-util.jar"
location="${tomcat33.home}/lib/container/tomcat_util.jar" />
+ <property name="tc3-modules.jar"
location="${tomcat33.home}/lib/container/tomcat_modules.jar" />
<property name="commons-modeler.jar"
location="../../jakarta-commons/modeler/dist/commons-modeler.jar" />
<!-- Fix build via ECLIPSE which didn't export ant's jars -->
@@ -52,26 +65,29 @@
<path id="build-main.classpath">
<pathelement location="../util/build/classes"/>
- <pathelement location="${tomcat5.home}/server/lib/catalina.jar"/>
- <pathelement location="${tomcat41.home}/server/lib/catalina.jar"/>
- <pathelement location="${tomcat40.home}/server/lib/catalina.jar"/>
- <pathelement location="${tomcat33.home}/lib/common/tomcat_core.jar"/>
- <pathelement location="${tomcat33.home}/lib/common/core_util.jar"/>
<pathelement location="${servlet-api.jar}"/>
<pathelement location="${tomcat-util.jar}" />
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-modeler.jar}"/>
<pathelement location="${jmx.jar}"/>
- <pathelement location="${tomcat33.home}/lib/container/tomcat_modules.jar"/>
- <!-- this is needed - otherwise tomcat33 connector will not compile.
- Just change tomcat33.home in build.properties to point
- to nowhere, and tomcat_util will no longer be visible, nor
- 3.3 classes. -->
- <pathelement
- location="${tomcat33.home}/lib/container/tomcat_util.jar"/>
<pathelement location="${tomcat-coyote.jar}"/>
</path>
-
+
+ <path id="build-tc4.classpath">
+ <pathelement location="${tc4-catalina.jar}" />
+ <pathelement location="${servlet-api.jar}" />
+ </path>
+ <path id="build-tc5.classpath">
+ <pathelement location="${tc5-catalina.jar}" />
+ <pathelement location="${servlet-api.jar}" />
+ </path>
+ <path id="build-tc3.classpath">
+ <pathelement location="${tc3-core.jar}" />
+ <pathelement location="${tc3-core_util.jar}" />
+ <pathelement location="${tc3-util.jar}" />
+ <pathelement location="${tc3-modules.jar}" />
+ <pathelement location="${servlet-api.jar}" />
+ </path>
<!-- ==================== Detection and reports ==================== -->
<target name="report" >
@@ -166,65 +182,42 @@
depends="prepare,report,jkjava" />
<!-- ==================== Building ==================== -->
-
- <target name="jkjava"
- description="Build java side of the connector" >
+ <target name="jkjava-static" depends="prepare,report" >
+ <!-- Copy static resource files -->
+ <copy todir="${jk.build}/classes">
+ <fileset dir="java">
+ <include name="**/*.properties"/>
+ </fileset>
+ </copy>
+ <copy todir="${jk.build}/classes" >
+ <fileset dir="java" includes="**/*.xml" />
+ </copy>
+ </target>
+ <target name="jkjava-shared" depends="jkjava-static"
+ description="Build shared java side of the connector" >
<javac srcdir="java"
destdir="${jk.build}/classes"
deprecation="${compile.deprecation}"
debug="${compile.debug}"
optimize="${optimize}"
verbose="off" >
- <exclude name="org/apache/ajp/**" if="tomcat5.detect"/>
- <exclude name="org/apache/ajp/tomcat4/**" unless="tomcat40.detect"/>
- <exclude name="org/apache/ajp/tomcat33/**" unless="tomcat33.detect"/>
+ <include name="org/apache/jk/**"/>
<exclude name="org/apache/jk/common/JkMX.java" unless="jmx.detect"/>
<exclude name="org/apache/jk/common/ModJkMX.java" unless="jmx.detect"/>
<exclude name="org/apache/jk/common/Shm14.java" unless="jdk14.detect"/>
- <exclude name="org/apache/jk/config/*Config.java"
unless="tomcat5.detect" />
+ <exclude name="org/apache/jk/config/*Config.java" />
+ <exclude name="org/apache/jk/ant/**" />
<classpath>
<path refid="xml-apis.classpath"/>
<path refid="build-main.classpath"/>
</classpath>
-
</javac>
-
- <!-- Copy static resource files -->
- <copy todir="${jk.build}/classes">
- <fileset dir="java">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <property name="tomcat-jk.jar" value="${jk.build}/lib/tomcat-jk.jar" />
- <property name="tomcat-jkconfig.jar" value="${jk.build}/lib/jkconfig.jar" />
- <property name="tomcat-jkshm.jar" value="${jk.build}/lib/jkshm.jar" />
- <property name="tomcat-jk2.jar" value="${jk.build}/lib/tomcat-jk2.jar" />
- <property name="tomcat-jni.jar" value="${jk.build}/lib/tomcat-jni.jar" />
-
- <jar jarfile="${tomcat-jk.jar}"
- index="true"
- basedir="${jk.build}/classes">
- <include name="org/apache/ajp/**" />
- </jar>
-
<jar jarfile="${tomcat-jkconfig.jar}"
index="true"
basedir="${jk.build}/classes"
manifest="conf/jkconfig.manifest">
<include name="org/apache/jk/config/**" />
</jar>
-
- <jar jarfile="${tomcat-jkshm.jar}"
- index="true"
- basedir="${jk.build}/classes"
- manifest="conf/shm.manifest">
- <include name="org/apache/ajp/common/Shm.class" />
- </jar>
-
- <copy todir="${jk.build}/classes" >
- <fileset dir="java" includes="**/*.xml" />
- </copy>
<jar jarfile="${tomcat-jk2.jar}"
index="true"
manifest="conf/tomcat-jk2.manifest"
@@ -241,6 +234,87 @@
<include name="org/apache/jk/core/**" />
</jar>
+ </target>
+ <target name="jkjava-tc5" depends="jkjava-shared" if="tomcat5.detect"
+ description="Build TC5 java side of the connector" >
+ <javac srcdir="java"
+ destdir="${jk.build}/classes"
+ deprecation="${compile.deprecation}"
+ debug="${compile.debug}"
+ optimize="${optimize}"
+ verbose="off" >
+ <include name="org/apache/jk/config/**"/>
+ <classpath>
+ <path refid="xml-apis.classpath"/>
+ <path refid="build-main.classpath"/>
+ <path refid="build-tc5.classpath"/>
+ </classpath>
+ </javac>
+ <jar jarfile="${tomcat-jkconfig.jar}"
+ index="true"
+ basedir="${jk.build}/classes"
+ manifest="conf/jkconfig.manifest">
+ <include name="org/apache/jk/config/**" />
+ </jar>
+ </target>
+ <target name="jkjava-tc4" depends="jkjava-shared" if="tomcat40.detect"
+ description="Build the TC4 java side of the connector">
+ <javac srcdir="java"
+ destdir="${jk.build}/classes"
+ deprecation="${compile.deprecation}"
+ debug="${compile.debug}"
+ optimize="${optimize}"
+ verbose="off" >
+ <include name="org/apache/ajp/**" />
+ <exclude name="org/apache/ajp/tomcat33/**" />
+ <classpath>
+ <path refid="xml-apis.classpath"/>
+ <path refid="build-main.classpath"/>
+ <path refid="build-tc4.classpath"/>
+ </classpath>
+
+ </javac>
+
+ <jar jarfile="${tomcat-jk.jar}"
+ index="true"
+ basedir="${jk.build}/classes">
+ <include name="org/apache/ajp/**" />
+ </jar>
+
+ <jar jarfile="${tomcat-jkshm.jar}"
+ index="true"
+ basedir="${jk.build}/classes"
+ manifest="conf/shm.manifest">
+ <include name="org/apache/ajp/common/Shm.class" />
+ </jar>
+ </target>
+ <target name="jkjava-tc3" depends="jkjava-shared" if="tomcat33.detect"
+ description="Build the TC3 java side of the connector">
+ <javac srcdir="java"
+ destdir="${jk.build}/classes"
+ deprecation="${compile.deprecation}"
+ debug="${compile.debug}"
+ optimize="${optimize}"
+ verbose="off" >
+ <include name="org/apache/ajp/**" />
+ <exclude name="org/apache/ajp/tomcat4/**" />
+ <classpath>
+ <path refid="xml-apis.classpath"/>
+ <path refid="build-main.classpath"/>
+ <path refid="build-tc3.classpath"/>
+ </classpath>
+
+ </javac>
+
+ <jar jarfile="${tomcat-jk.jar}"
+ index="true"
+ basedir="${jk.build}/classes">
+ <include name="org/apache/ajp/**" />
+ </jar>
+
+ </target>
+ <target name="jkjava" depends="jkjava-tc3,jkjava-tc4,jkjava-tc5"
+ description="Build java side of the connector" >
</target>
<target name="jkant" >
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
