craigmcc 01/04/11 12:40:10
Modified: beanutils/build build.xml
Log:
Use basedir=".." so that paths do not have to be manually adjusted.
Correct the use of filtering so that it actually takes effect.
Revision Changes Path
1.2 +15 -17 jakarta-commons/beanutils/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/beanutils/build/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2001/04/11 18:48:48 1.1
+++ build.xml 2001/04/11 19:40:10 1.2
@@ -1,9 +1,9 @@
-<project name="Bean Utilities" default="compile" basedir=".">
+<project name="Bean Utilities" default="compile" basedir="..">
<!--
"Bean Utilities" component of the Jakarta Commons Subproject
- $Id: build.xml,v 1.1 2001/04/11 18:48:48 craigmcc Exp $
+ $Id: build.xml,v 1.2 2001/04/11 19:40:10 craigmcc Exp $
-->
@@ -43,19 +43,19 @@
<property name="component.version" value="0.1-dev"/>
<!-- The base directory for compilation targets -->
- <property name="build.home" value="../target"/>
+ <property name="build.home" value="target"/>
<!-- The base directory for component configuration files -->
- <property name="conf.home" value="../conf"/>
+ <property name="conf.home" value="conf"/>
<!-- The base directory for distribution targets -->
- <property name="dist.home" value="../dist"/>
+ <property name="dist.home" value="dist"/>
<!-- The base directory for component sources -->
- <property name="source.home" value="../src/share"/>
+ <property name="source.home" value="src/share"/>
<!-- The base directory for unit test sources -->
- <property name="test.home" value="../src/test"/>
+ <property name="test.home" value="src/test"/>
<!-- ========== Compiler Defaults ========================================= -->
@@ -99,6 +99,8 @@
<target name="init"
description="Initialize and evaluate conditionals">
<echo message="-------- ${component.name} ${component.version} --------"/>
+ <filter token="name" value="${component.name}"/>
+ <filter token="version" value="${component.version}"/>
</target>
@@ -115,9 +117,7 @@
<target name="static" depends="prepare"
description="Copy static files to build directory">
<tstamp/>
- <filter token="name" value="${component.name}"/>
- <filter token="version" value="${component.version}"/>
- <copy todir="${build.home}/conf">
+ <copy todir="${build.home}/conf" filtering="on">
<fileset dir="${conf.home}" includes="*.MF"/>
</copy>
</target>
@@ -132,7 +132,7 @@
optimize="${compile.optimize}">
<classpath refid="compile.classpath"/>
</javac>
- <copy todir="${build.home}/classes">
+ <copy todir="${build.home}/classes" filtering="on">
<fileset dir="${source.home}" excludes="**/*.java"/>
</copy>
</target>
@@ -147,7 +147,7 @@
optimize="${compile.optimize}">
<classpath refid="test.classpath"/>
</javac>
- <copy todir="${build.home}/tests">
+ <copy todir="${build.home}/tests" filtering="on">
<fileset dir="${test.home}" excludes="**/*.java"/>
</copy>
</target>
@@ -184,14 +184,14 @@
<mkdir dir="${dist.home}"/>
<mkdir dir="${dist.home}/conf"/>
<copy todir="${dist.home}/conf">
- <fileset dir="${conf.home}"/>
+ <fileset dir="${build.home}/conf"/>
</copy>
<mkdir dir="${dist.home}/lib"/>
<jar jarfile="${dist.home}/lib/commons-${component.name}.jar"
basedir="${build.home}/classes"
manifest="${build.home}/conf/MANIFEST.MF"/>
<mkdir dir="${dist.home}/src"/>
- <copy todir="${dist.home}/src">
+ <copy todir="${dist.home}/src" filtering="on">
<fileset dir="${source.home}"/>
</copy>
</target>
@@ -212,9 +212,7 @@
<java classname="${test.runner}" fork="yes"
failonerror="${test.failonerror}">
<arg value="org.apache.commons.beanutils.PropertyUtilsTestCase"/>
- <classpath>
- <path refid="test.classpath"/>
- </classpath>
+ <classpath refid="test.classpath"/>
</java>
</target>
