yoavs 2004/05/26 13:14:27
Modified: . build.xml
Log:
Modified to include ant-launcher.jar for people building with Ant 1.6 or later (also
required for startup-using-launcher scripts).
Revision Changes Path
1.186 +6 -3 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- build.xml 26 May 2004 16:48:26 -0000 1.185
+++ build.xml 26 May 2004 20:14:27 -0000 1.186
@@ -25,6 +25,7 @@
<property name="jtc.project" value="jakarta-tomcat-connectors" />
<property name="jasper.project" value="jakarta-tomcat-jasper" />
<property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
+ <property name="ant-launcher.jar value="${ant.home}/lib/ant-launcher.jar"/>
<property name="cvstag" value="" />
<property name="cvs.base"
value="${basedir}/.."/>
@@ -145,6 +146,7 @@
failonerror="false" />
<copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
+ <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/>
</target>
<!-- ====================== Build all components =================== -->
@@ -639,13 +641,13 @@
<copy todir="embed/lib" file="${jmx.jar}"/>
<copy todir="embed/lib" file="${regexp.jar}"/>
+ <copy todir="embed/lib" file="${ant.jar}"/>
+ <copy todir="embed/lib" file="${ant-launcher.jar}"/>
+
<copy todir="embed/lib">
<fileset dir="build/server/lib">
<include name="tomcat-util.jar"/>
</fileset>
- <fileset dir="${ant.home}/lib">
- <include name="ant.jar"/>
- </fileset>
</copy>
<!-- Connector -->
@@ -698,6 +700,7 @@
<copy todir="embed/lib">
<fileset dir="build/common/lib">
<include name="ant.jar"/>
+ <include name="ant-launcher.jar" />
</fileset>
<fileset dir="build/common/lib">
<include name="jasper-compiler.jar"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
