costin 02/04/08 12:44:28
Modified: . build.xml
Log:
Few simplifications:
- use the binary version of common-logging. It is trivial to override this
to build-from-source version ( for Gump ), but new users should have minimal
pain.
- call ant in j-t-c/util, don't assume j-t-c will be built first.
This preserves the original behavior ( checkout / build - no extra rules )
( I hope :-), except you must check out both j-t and j-t-c
Revision Changes Path
1.167 +24 -11 jakarta-tomcat/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- build.xml 8 Apr 2002 01:56:50 -0000 1.166
+++ build.xml 8 Apr 2002 19:44:28 -0000 1.167
@@ -79,12 +79,19 @@
<property name="jtc.http11.home" location="${jakarta-tomcat-connectors}/http11"/>
<property name="jtc.http11.lib" location="${jtc.http11.home}/build/lib"/>
+ <!-- A binary copy of commons-logging.jar is checked in j-t-c.
+ It can be overriden by gump or if you want to build jakarta-commons -->
+ <!--
<property name="commons-logging.home"
location="${jakarta-commons}/logging"/>
<property name="commons-logging.lib"
location="${commons-logging.home}/dist"/>
<property name="commons-logging.jar"
location="${commons-logging.lib}/commons-logging.jar"/>
+ -->
+
+ <property name="commons-logging.jar"
+ location="${jakarta-tomcat-connectors}/lib/commons-logging.jar"/>
<!-- Binaries checked in ( servlet.jar is not likely to change,
the 2.2 spec is final -->
@@ -246,9 +253,6 @@
<copy tofile="${tomcat.build}/lib/common/servlet.jar"
file="${servlet22.jar}"/>
- <copy tofile="${tomcat.build}/lib/common/tomcat-util.jar"
- file="${tomcat-util.jar}"/>
-
<fixcrlf srcdir="${tomcat.build}/bin" includes="**/*.sh" eol="lf"/>
<fixcrlf srcdir="${tomcat.build}/bin" includes="**/*.bat" eol="crlf"/>
@@ -262,6 +266,8 @@
<!-- Local Tomcat utilities -->
<target name="tomcat_util" depends="prepare">
+ <ant dir="${jakarta-tomcat-connectors}/util" />
+
<javac destdir="${tomcat.build}/classes"
debug="${debug}"
optimize="${optimize}"
@@ -285,16 +291,23 @@
</fileset>
</copy>
- <jar jarfile="${tomcat.build}/lib/common/core_util.jar"
- basedir="${tomcat.build}/classes">
- <include name="org/apache/tomcat/util/hooks/**"/>
- <include name="org/apache/tomcat/util/log/**"/>
+ <jar jarfile="${tomcat.build}/lib/common/core_util.jar" >
+ <fileset dir="${tomcat.build}/classes">
+ <include name="org/apache/tomcat/util/hooks/**"/>
+ </fileset>
+ <fileset dir="${jakarta-tomcat-connectors}/util/build/classes">
+ <include name="org/apache/tomcat/util/log/**"/>
+ </fileset>
</jar>
- <jar jarfile="${tomcat.build}/lib/container/tomcat_util.jar"
- basedir="${tomcat.build}/classes">
- <include name="org/apache/tomcat/util/**"/>
- <exclude name="org/apache/tomcat/util/test/**"/>
+ <jar jarfile="${tomcat.build}/lib/container/tomcat_util.jar" >
+ <fileset dir="${tomcat.build}/classes">
+ <include name="org/apache/tomcat/util/**"/>
+ <exclude name="org/apache/tomcat/util/test/**"/>
+ </fileset>
+ <fileset dir="${jakarta-tomcat-connectors}/util/build/classes">
+ <include name="org/apache/tomcat/util/**"/>
+ </fileset>
</jar>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
