Hello,
Can someone review and commit the following 4 patches to the HEAD branch of
jakarta-tomcat-4.0?
catalina/build.xml
jasper/build.xml
tester/build.xml
webapps/build.xml
These 4 patches correct a problem when invoking ant within any of the above 4
directories. Prior to these patches, ant would create "build" and "dist"
directories in a different place than if ant was invoked in the
jakarta-tomcat-4.0 topmost directory. As a result, ant would create strange
extraneous directories like the following in the distribution:
webapps/build/examples/build/examples/build/examples
Thanks,
Patrick
Index: build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.74
diff -u -r1.74 build.xml
--- build.xml 2001/10/03 22:59:43 1.74
+++ build.xml 2001/10/04 04:39:06
@@ -11,9 +11,9 @@
<!-- Build Defaults -->
<property name="build.compiler" value="classic"/>
- <property name="catalina.build" value="build"/>
- <property name="catalina.deploy" value="../build"/>
- <property name="catalina.dist" value="dist"/>
+ <property name="catalina.build" value="${basedir}/build"/>
+ <property name="catalina.deploy" value="${basedir}/../build"/>
+ <property name="catalina.dist" value="${basedir}/dist"/>
<property name="test.failonerror" value="true"/>
<property name="test.runner" value="junit.textui.TestRunner"/>
<property name="test.webapp" value="../webapps/build/examples"/>
Index: build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-4.0/jasper/build.xml,v
retrieving revision 1.25
diff -u -r1.25 build.xml
--- build.xml 2001/10/03 21:39:12 1.25
+++ build.xml 2001/10/04 04:39:27
@@ -11,9 +11,9 @@
<!-- Build Defaults -->
<property name="build.compiler" value="classic"/>
- <property name="jasper.build" value="build"/>
- <property name="jasper.deploy" value="../build"/>
- <property name="jasper.dist" value="dist"/>
+ <property name="jasper.build" value="${basedir}/build"/>
+ <property name="jasper.deploy" value="${basedir}/../build"/>
+ <property name="jasper.dist" value="${basedir}/dist"/>
<property name="test.failonerror" value="true"/>
<property name="test.runner" value="junit.textui.TestRunner"/>
<property name="tools.jar" value="${java.home}/lib/tools.jar"/>
Index: build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-4.0/tester/build.xml,v
retrieving revision 1.15
diff -u -r1.15 build.xml
--- build.xml 2001/10/03 21:39:12 1.15
+++ build.xml 2001/10/04 04:41:31
@@ -9,9 +9,9 @@
<property name="build.compiler" value="classic"/>
<property name="servletapi.home" value="../../jakarta-servletapi-4/dist"/>
- <property name="tester.build" value="build"/>
- <property name="tester.deploy" value="../build"/>
- <property name="tester.dist" value="dist"/>
+ <property name="tester.build" value="${basedir}/build"/>
+ <property name="tester.deploy" value="${basedir}/../build"/>
+ <property name="tester.dist" value="${basedir}/dist"/>
<!-- ================== Derived Property Values ========================= -->
<property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
Index: build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/build.xml,v
retrieving revision 1.17
diff -u -r1.17 build.xml
--- build.xml 2001/09/16 04:58:28 1.17
+++ build.xml 2001/10/04 04:40:08
@@ -10,9 +10,9 @@
<property file="${user.home}/build.properties"/>
<property name="build.compiler" value="classic"/>
- <property name="webapps.build" value="build"/>
- <property name="webapps.deploy" value="../build"/>
- <property name="webapps.dist" value="dist"/>
+ <property name="webapps.build" value="${basedir}/build"/>
+ <property name="webapps.deploy" value="${basedir}/../build"/>
+ <property name="webapps.dist" value="${basedir}/dist"/>
<!-- =================== BUILD: Create Directories ====================== -->
