cmlenz 2002/12/09 14:37:42
Modified: anttasks build.xml
framework build.xml
Log:
A couple of minor tweaks to the build files
- Use property-location instead of property-value for path properties
- Use body of the <echo> task for better readability
- Make the build slightly less chatty
Revision Changes Path
1.30 +26 -26 jakarta-cactus/anttasks/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/anttasks/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- build.xml 9 Dec 2002 20:41:04 -0000 1.29
+++ build.xml 9 Dec 2002 22:37:42 -0000 1.30
@@ -55,7 +55,7 @@
Base directory for all file related operations
========================================================================
-->
- <property name="base.dir" value="anttasks"/>
+ <property name="base.dir" location="anttasks"/>
<!--
========================================================================
@@ -63,10 +63,10 @@
========================================================================
-->
<!-- Source locations for the build -->
- <property name="src.dir" value="${base.dir}/src"/>
- <property name="src.java.dir" value="${src.dir}/java"/>
- <property name="build.dir" value="${base.dir}/."/>
- <property name="conf.dir" value="${base.dir}/conf"/>
+ <property name="src.dir" location="${base.dir}/src"/>
+ <property name="src.java.dir" location="${src.dir}/java"/>
+ <property name="build.dir" location="${base.dir}/."/>
+ <property name="conf.dir" location="${base.dir}/conf"/>
<!--
========================================================================
@@ -74,18 +74,19 @@
========================================================================
-->
<!-- Destination locations for the build -->
- <property name="target.dir" value="${base.dir}/target"/>
- <property name="target.classes.dir" value="${target.dir}/classes"/>
- <property name="target.classes.java.dir" value="${target.classes.dir}/java"/>
- <property name="target.doc.dir" value="${target.dir}/doc"/>
- <property name="target.doc.api.dir" value="${target.doc.dir}/api"/>
+ <property name="target.dir" location="${base.dir}/target"/>
+ <property name="target.classes.dir" location="${target.dir}/classes"/>
+ <property name="target.classes.java.dir"
+ location="${target.classes.dir}/java"/>
+ <property name="target.doc.dir" location="${target.dir}/doc"/>
+ <property name="target.doc.api.dir" location="${target.doc.dir}/api"/>
<!-- Distribution directory, i.e. where the expanded distibutable files
are located -->
- <property name="dist.dir" value="${base.dir}/dist"/>
- <property name="dist.lib.dir" value="${dist.dir}/lib"/>
- <property name="dist.doc.dir" value="${dist.dir}/doc"/>
- <property name="dist.doc.api.dir" value="${dist.doc.dir}/api"/>
+ <property name="dist.dir" location="${base.dir}/dist"/>
+ <property name="dist.lib.dir" location="${dist.dir}/lib"/>
+ <property name="dist.doc.dir" location="${dist.dir}/doc"/>
+ <property name="dist.doc.api.dir" location="${dist.doc.dir}/api"/>
<!--
========================================================================
@@ -103,14 +104,14 @@
-->
<target name="display.properties">
- <echo message="----- ${project.name.text} ${project.version} -----"/>
- <echo message=""/>
- <echo message="java.class.path = ${java.class.path}"/>
- <echo message=""/>
- <echo message="java.home = ${java.home}"/>
- <echo message="user.home = ${user.home}"/>
- <echo message="ant.home = ${ant.home}"/>
- <echo message=""/>
+ <echo>----- ${project.name.text} ${project.version} -----</echo>
+ <echo></echo>
+ <echo>java.class.path = ${java.class.path}"</echo>
+ <echo></echo>
+ <echo>java.home = ${java.home}</echo>
+ <echo>user.home = ${user.home}</echo>
+ <echo>ant.home = ${ant.home}</echo>
+ <echo></echo>
</target>
@@ -264,17 +265,16 @@
<mkdir dir="${target.dir}"/>
- <echo message="Errors are reported in ${target.dir}/checkstyle_errors.xml"/>
-
<checkstyle config="./checkstyle.xml"
- failOnViolation="false">
+ failOnViolation="false">
<fileset dir="${src.java.dir}">
<include name="**/*.java"/>
</fileset>
<formatter type="plain"/>
- <formatter type="xml" toFile="${target.dir}/checkstyle_errors.xml"/>
+ <formatter type="xml"
+ toFile="${target.dir}/checkstyle_results.xml"/>
<property key="checkstyle.header.file" file="./LICENSE.cactus"/>
</checkstyle>
1.33 +12 -15 jakarta-cactus/framework/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/build.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- build.xml 9 Dec 2002 20:41:03 -0000 1.32
+++ build.xml 9 Dec 2002 22:37:42 -0000 1.33
@@ -168,15 +168,16 @@
-->
<target name="display.properties">
- <echo message="----- ${project.name.text} ${project.version} -----"/>
- <echo message=""/>
- <echo message="java.class.path = ${java.class.path}"/>
- <echo message=""/>
- <echo message="java.home = ${java.home}"/>
- <echo message="user.home = ${user.home}"/>
- <echo message="ant.home = ${ant.home}"/>
- <echo message=""/>
- <echo message="clover.enable (optional) = ${clover.enable}"/>
+ <echo>----- ${project.name.text} ${project.version} -----</echo>
+ <echo></echo>
+ <echo>java.class.path = ${java.class.path}"</echo>
+ <echo></echo>
+ <echo>java.home = ${java.home}</echo>
+ <echo>user.home = ${user.home}</echo>
+ <echo>ant.home = ${ant.home}</echo>
+ <echo></echo>
+ <echo>clover.enable (optional) = ${clover.enable}</echo>
+ <echo></echo>
</target>
@@ -246,7 +247,6 @@
<!-- Clover write data at compile time *and* at runtime in this file -->
<property name="clover.initstring"
location="${basedir}/target-${j2ee.api}/clover-coverage.db"/>
- <echo message="clover.initstring = ${clover.initstring}"/>
<dirname property="clover.db.dir" file="${clover.initstring}"/>
<mkdir dir="${clover.db.dir}"/>
@@ -620,10 +620,6 @@
<mkdir dir="${target.dir}"/>
- <property name="checkstyle.results.file"
- location="${target.dir}/checkstyle_errors.xml"/>
- <echo message="Errors are reported in ${checkstyle.results.file}"/>
-
<checkstyle config="./checkstyle.xml"
failOnViolation="false">
@@ -636,7 +632,8 @@
</fileset>
<formatter type="plain"/>
- <formatter type="xml" toFile="${checkstyle.results.file}"/>
+ <formatter type="xml"
+ toFile="${target.dir}/checkstyle_results.xml"/>
<property key="checkstyle.header.file" file="./LICENSE.cactus"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
