You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/09/27 19:56:52 UTC
cvs commit: jakarta-tomcat-4.0/webapps build.xml
craigmcc 00/09/27 10:56:52
Modified: webapps build.xml
Log:
Ant and relative paths strike again!
Make the property paths, and paths to subordinate webapps, absolute so that
nested builds (such as when you build Tomcat 4.0 from a freshly checked out
CVS source tree) work correctly.
Submitted by: Shaun O'Hagen <so...@tanning.com>
Revision Changes Path
1.6 +8 -8 jakarta-tomcat-4.0/webapps/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 2000/08/31 19:09:04 1.5
+++ build.xml 2000/09/27 17:56:51 1.6
@@ -2,12 +2,12 @@
<!-- ===================== Initialize Property Values =================== -->
- <property name="ant.home" value="../../jakarta-ant"/>
+ <property name="ant.home" value="${basedir}/../../jakarta-ant"/>
<property name="build.compiler" value="classic"/>
- <property name="servletapi.home" value="../../jakarta-servletapi"/>
- <property name="webapps.build" value="../../build/webapps"/>
- <property name="webapps.deploy" value="../../build/tomcat-4.0"/>
- <property name="webapps.dist" value="../../dist/webapps"/>
+ <property name="servletapi.home" value="${basedir}/../../jakarta-servletapi"/>
+ <property name="webapps.build" value="${basedir}/../../build/webapps"/>
+ <property name="webapps.deploy" value="${basedir}/../../build/tomcat-4.0"/>
+ <property name="webapps.dist" value="${basedir}/../../dist/webapps"/>
<!-- ================== Derived Property Values ========================= -->
@@ -25,15 +25,15 @@
<!-- Add a new target for each webapp subproject -->
<target name="ROOT">
- <ant dir="./ROOT" target="dist"/>
+ <ant dir="${basedir}/ROOT" target="dist"/>
</target>
<target name="examples">
- <ant dir="./examples" target="dist"/>
+ <ant dir="${basedir}/examples" target="dist"/>
</target>
<target name="webdav">
- <ant dir="./webdav" target="dist"/>
+ <ant dir="${basedir}/webdav" target="dist"/>
</target>