On 3/29/02 3:25 PM, "[EMAIL PROTECTED]" <[EMAIL PROTECTED]> wrote:
> jon 02/03/29 12:25:29
>
> Modified: . build.xml
> Added: . default.properties
> Log:
> cleaned up the build system.
"cleaned up" is a rather large stretch of the english language.
Why didn't you leave the defaults in place in there? Makes it much easier
to read...
>
> -jon
>
> Revision Changes Path
> 1.18 +9 -75 jakarta-velocity-dvsl/build.xml
>
> Index: build.xml
> ===================================================================
> RCS file: /home/cvs/jakarta-velocity-dvsl/build.xml,v
> retrieving revision 1.17
> retrieving revision 1.18
> diff -u -r1.17 -r1.18
> --- build.xml 17 Mar 2002 21:09:11 -0000 1.17
> +++ build.xml 29 Mar 2002 20:25:29 -0000 1.18
> @@ -3,68 +3,13 @@
>
> <!-- ========== Initialize Properties =====================================
> -->
>
> - <property file="build/build.properties"/> <!-- Component local
> -->
> - <property file="../build.properties"/> <!-- Commons local
> -->
> - <property file="${user.home}/build.properties"/> <!-- User local
> -->
> -
> -<!-- ========== External Dependencies =====================================
> -->
> -
> - <!-- the local repository -->
> - <property name="local.repository" value="./lib" />
> -
> -<!-- ========== Component Declarations ====================================
> -->
> -
> - <!-- The name of this component -->
> - <property name="project.name" value="velocity-dvsl" />
> -
> - <!-- The title of this component -->
> - <property name="project.title" value="DVSL"/>
> -
> - <!-- The current version number of this component -->
> - <property name="project.version" value="0.43"/>
> -
> - <!-- The base directory for compilation targets -->
> - <property name="build.home" value="target"/>
> -
> - <!-- The base directory for distribution targets -->
> - <property name="dist.home" value="dist"/>
> -
> - <!-- The base directory for component sources -->
> - <property name="source.home" value="src"/>
> -
> - <!-- The base directory for component sources -->
> - <property name="conf.home" value="src/conf"/>
> -
> - <!-- The docs source directory -->
> - <property name="docs.src" value="xdocs"/>
> -
> - <!-- The docs destination directory -->
> - <property name="docs.dest" value="docs"/>
> -
> - <!-- The printdocs destination directory -->
> - <property name="docs-printable.dest" value="docs_print"/>
> -
> - <!-- Name of generated dvsl.jar file -->
> - <property name="dvsl.jar"
> - value="${project.name}-${project.version}.jar" />
> -
> - <!-- Location of ant.jar -->
> - <property name="ant.jar" value="${ant.home}/lib/ant.jar" />
> + <property file="${user.home}/${project.name}.build.properties" />
> + <property file="${user.home}/build.properties" />
> + <property file="${basedir}/build.properties" />
> + <property file="${basedir}/default.properties" />
>
> <!-- ========== Compiler Defaults =========================================
> -->
>
> -
> - <!-- Should Java compilations set the 'debug' compiler option? -->
> - <property name="compile.debug" value="true"/>
> -
> - <!-- Should Java compilations set the 'deprecation' compiler option? -->
> - <property name="compile.deprecation" value="true"/>
> -
> - <!-- Should Java compilations set the 'optimize' compiler option? -->
> - <property name="compile.optimize" value="true"/>
> -
> -
> -
> <!-- Construct compile classpath -->
> <path id="classpath">
> <fileset dir="${local.repository}">
> @@ -73,11 +18,6 @@
> <pathelement location="${ant.jar}"/>
> </path>
>
> -
> -
> -<!-- ========== Test Execution Defaults ===================================
> -->
> -
> -
> <!-- Construct unit test classpath -->
> <path id="test.classpath">
> <pathelement location="${build.home}/classes"/>
> @@ -85,20 +25,13 @@
> <path refid="classpath" />
> </path>
>
> - <!-- Should all tests fail if one does? -->
> - <property name="test.failonerror" value="true"/>
> -
> - <!-- The test runner to execute -->
> - <property name="test.runner" value="junit.textui.TestRunner"/>
> -
> -
> <!-- ========== Executable Targets ========================================
> -->
>
> <!-- ================================================================== -->
> <!-- I N I T -->
> <!-- ================================================================== -->
> <target name="init">
> - <echo message="-------- ${project.name} ${project.version} --------"/>
> + <echo message="-------- ${final.name} --------"/>
> <filter token="name" value="${project.name}"/>
> <filter token="version" value="${project.version}"/>
> </target>
> @@ -124,7 +57,6 @@
> </copy>
> </target>
>
> -
> <!-- ================================================================== -->
> <!-- C O M P I L E -->
> <!-- ================================================================== -->
> @@ -149,7 +81,6 @@
>
> </target>
>
> -
> <!-- ================================================================== -->
> <!-- C O M P I L E - T E S T -->
> <!-- ================================================================== -->
> @@ -176,7 +107,10 @@
> <target name="clean"
> description="Clean build and distribution directories">
> <delete dir="${build.home}"/>
> - <delete file="${dvsl.jar}"/>
> + <delete>
> + <fileset dir="${basedir}" includes="**/${project.name}*.jar"/>
> + </delete>
> + <delete file="velocity.log"/>
> <delete dir="${dist.home}"/>
> <delete dir="${docs-printable.dest}"/>
> </target>
>
>
>
> 1.1 jakarta-velocity-dvsl/default.properties
>
> Index: default.properties
> ===================================================================
> # the local repository
> local.repository = ./lib
>
> # The name of this project
> project.name = velocity-dvsl
>
> # The title of this project
> project.title = DVSL
>
> # version number
> project.version = 0.43
>
> # The name that is used to create the jar file
> final.name = ${project.name}-${project.version}
>
> # Name of generated dvsl.jar file
> dvsl.jar = ${final.name}.jar
>
> # The base directory for compilation targets
> build.home = target
>
> # The base directory for distribution targets
> dist.home = dist
>
> # The base directory for component sources
> source.home = src
>
> # The base directory for config files
> conf.home = src/conf
>
> # The docs source directory
> docs.src = xdocs
>
> # The docs destination directory
> docs.dest = docs
>
> # The printdocs destination directory
> docs-printable.dest = docs_print
>
> # Location of ant.jar
> ant.jar = ${ant.home}/lib/ant.jar
>
> # Should Java compilations set the 'debug' compiler option?
> compile.debug = true
>
> # Should Java compilations set the 'deprecation' compiler option?
> compile.deprecation = true
>
> # Should Java compilations set the 'optimize' compiler option?
> compile.optimize = true
>
> # Should all tests fail if one does?
> test.failonerror = true
>
> # The test runner to execute
> test.runner = junit.textui.TestRunner
>
>
>
>
> --
> To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
>
--
Geir Magnusson Jr. [EMAIL PROTECTED]
System and Software Consulting
"Now what do we do?"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
