[ductilej] push by samskivert - A variety of build configuration cleanups. on 2010-11-24 19:00 GMT
duct...@googlecode.com
Author: Michael Bayne <m...@samskivert.com>
Date: Wed Nov 24 11:00:06 2010
Log: A variety of build configuration cleanups.
http://code.google.com/p/ductilej/source/detail?r=95af90ffbf
Modified:
/build.xml
=======================================
--- /build.xml Sun Jun 27 10:47:57 2010
+++ /build.xml Wed Nov 24 11:00:06 2010
@@ -1,19 +1,9 @@
<?xml version="1.0"?>
<project name="detyper" default="compile" basedir=".">
- <!-- project metadata -->
- <property name="lib.name" value="detyper"/>
- <property name="doc.packages" value="org.ductilej.detyper.*"/>
- <property name="doc.overview"
value="org/ductilej/detyper/overview.html"/>
-
- <!-- various directories used when building things -->
<property name="src.dir" value="src"/>
<property name="deploy.dir" value="dist"/>
<property name="classes.dir" value="${deploy.dir}/classes"/>
<property name="dtclass.dir" value="${deploy.dir}/dtclass"/>
- <property name="dtdistclass.dir" value="${deploy.dir}/dtdistclass"/>
- <property name="stclass.dir" value="${deploy.dir}/stclass"/>
- <property name="javadoc.dir" value="${deploy.dir}/docs"/>
- <property name="libs.dir" value="lib"/>
<!-- read in the desired configuration local configuration -->
<property file="build.properties"/>
@@ -34,53 +24,32 @@
<path id="build.classpath">
<path refid="base.classpath"/>
</path>
- <path id="dist.classpath">
- <pathelement location="${deploy.dir}/detyper.jar"/>
- <pathelement location="${dtclass.dir}"/>
- <path refid="build.classpath"/>
- </path>
-
- <!-- defines our runtime library dependencies -->
- <fileset dir="${libs.dir}" id="runtime.libs">
+
+ <!-- defines our runtime and build-time library dependencies -->
+ <fileset dir="lib" id="runtime.libs">
<include name="guava.jar"/>
</fileset>
-
- <!-- defines our build-time library dependencies -->
- <fileset dir="${libs.dir}" id="build.libs">
- <!--<include name="ant.jar"/>-->
+ <fileset dir="lib" id="build.libs">
<include name="junit4.jar"/>
</fileset>
- <!-- prepares the application directories -->
- <target name="prepare">
+ <target name="-prepare">
<mkdir dir="${deploy.dir}"/>
<mkdir dir="${deploy.dir}/lib"/>
<mkdir dir="${classes.dir}"/>
- <mkdir dir="${javadoc.dir}"/>
<copy todir="${deploy.dir}/lib" flatten="true">
<fileset refid="build.libs"/>
<fileset refid="runtime.libs"/>
</copy>
</target>
- <!-- cleans out the intermediate build files -->
<target name="clean" description="Cleans out build results.">
- <delete dir="${classes.dir}"/>
- <delete dir="${stclass.dir}"/>
- <delete dir="${dtclass.dir}"/>
- <delete dir="${deploy.dir}/docs"/>
- <delete failonerror="false"><fileset dir="${deploy.dir}"
includes="*.jar"/></delete>
- </target>
-
- <!-- wipes the entire build directory clean -->
- <target name="distclean" description="Completely removes build result
directory.">
<delete dir="${deploy.dir}"/>
</target>
- <!-- builds the java class files -->
- <target name="compile" depends="prepare" description="Compiles the
code.">
+ <target name="compile" depends="-prepare" description="Compiles the
code.">
<javac fork="yes" executable="${javac.home}/bin/javac" debug="on"
- source="1.6" target="1.6" encoding="utf-8"
+ source="1.6" target="1.6" encoding="utf-8"
includeAntRuntime="no"
srcdir="${src.dir}" destdir="${classes.dir}">
<classpath refid="build.classpath"/>
<exclude name="org/ductilej/tests/**"/>
@@ -90,11 +59,10 @@
</javac>
</target>
- <!-- builds the javadoc documentation -->
- <target name="javadoc" depends="prepare" description="Generates javadoc
documentation.">
- <javadoc windowtitle="${lib.name} API" doctitle="${lib.name} API"
- overview="${src.dir}/${doc.overview}" destdir="${javadoc.dir}"
- additionalparam="-breakiterator">
+ <target name="javadoc" depends="-prepare" description="Generates javadoc
documentation.">
+ <mkdir dir="${deploy.dir}/docs"/>
+ <javadoc windowtitle="${ant.project.name} API"
doctitle="${ant.project.name} API"
+ destdir="${deploy.dir}/docs" additionalparam="-breakiterator">
<packageset dir="${src.dir}">
<exclude name="org/ductilej/detyper/tests/**"/>
</packageset>
@@ -103,24 +71,19 @@
</javadoc>
</target>
- <!-- rebuilds everything -->
- <target name="all" depends="clean,prepare,compile,javadoc,dist"
+ <target name="all" depends="clean,-prepare,compile,javadoc,dist"
description="Cleans and rebuilds everything including
documentation."/>
- <!-- runs all test -->
- <target name="all-tests" description="Runs all tests.">
- <antcall target="stock-tests"/>
- <antcall target="dist-tests"/>
- <antcall target="tests"/>
- <antcall target="dtests"/>
+ <target name="test-all"
depends="test-stock,test-ductile,test-ductile-only"
+ description="Runs all tests.">
</target>
<!-- builds our distribution jar file -->
- <target name="dist" depends="prepare,compile"
+ <target name="dist" depends="compile"
description="Compiles the code and builds our jar file.">
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
classpath="lib/jarjar-1.0.jar"/>
- <jarjar destfile="${deploy.dir}/${lib.name}.jar"
basedir="${classes.dir}">
+ <jarjar destfile="${deploy.dir}/${ant.project.name}.jar"
basedir="${classes.dir}">
<service type="javax.annotation.processing.Processor"
provider="org.ductilej.detyper.Processor"/>
<exclude name="**/tests/**"/>
@@ -130,14 +93,14 @@
</target>
<!-- compiles our unit tests with the detyper and runs them -->
- <target name="tests" depends="prepare,compile"
+ <target name="test-ductile" depends="compile"
description="Compiles and runs the unit tests (with detyper).">
<delete dir="${dtclass.dir}"/>
<mkdir dir="${dtclass.dir}"/>
<!-- compile our helper classes, let them be treated like lib classes
-->
<javac fork="yes" executable="${javac.home}/bin/javac" debug="on"
- source="1.6" target="1.6" encoding="utf-8"
+ source="1.6" target="1.6" encoding="utf-8"
includeAntRuntime="no"
srcdir="${src.dir}" destdir="${dtclass.dir}">
<classpath>
<pathelement location="${dtclass.dir}"/>
@@ -151,7 +114,7 @@
<!-- allows passing -Dtest=NamePrefix to restrict to subset of tests
-->
<property name="test" value=""/>
<javac fork="yes" executable="${javac.home}/bin/javac" debug="on"
- source="1.6" target="1.6" encoding="utf-8"
+ source="1.6" target="1.6" encoding="utf-8"
includeAntRuntime="no"
srcdir="${src.dir}" destdir="${dtclass.dir}">
<classpath>
<pathelement location="${dtclass.dir}"/>
@@ -177,30 +140,16 @@
</antcall>
</target>
- <!-- compiles our dist unit tests with the detyper and runs them -->
- <target name="dist-tests" depends="dist">
- <delete dir="${dtdistclass.dir}"/>
- <mkdir dir="${dtdistclass.dir}"/>
- <javac sourcepath="" srcdir="${src.dir}" destdir="${dtdistclass.dir}">
- <classpath refid="dist.classpath"/>
- <include name="**/ConstructorPackageTest*.java"/>
- </javac>
- <javac sourcepath="" srcdir="${src.dir}" destdir="${dtdistclass.dir}">
- <classpath refid="dist.classpath"/>
- <include name="**/ConstructorPackageTest*.java"/>
- </javac>
- </target>
-
- <!-- compiles our unit tests with the stock compiler and runs them -->
- <target name="stock-tests" depends="prepare,compile"
+ <target name="test-stock" depends="compile"
description="Compiles and runs the unit tests (without
detyper).">
+ <property name="stclass.dir" value="${deploy.dir}/stclass"/>
<delete dir="${stclass.dir}"/>
<mkdir dir="${stclass.dir}"/>
<!-- allows passing -Dtest=NamePrefix to restrict to subset of tests
-->
<property name="test" value=""/>
<javac fork="yes" executable="${javac.home}/bin/javac" debug="on"
- source="1.6" target="1.6" encoding="utf-8"
+ source="1.6" target="1.6" encoding="utf-8"
includeAntRuntime="no"
srcdir="${src.dir}" destdir="${stclass.dir}">
<classpath>
<pathelement location="${stclass.dir}"/>
@@ -218,8 +167,7 @@
</antcall>
</target>
- <!-- compiles our Ductile-only unit tests with the detyper and runs them
-->
- <target name="dtests" depends="prepare,compile"
+ <target name="test-ductile-only" depends="compile"
description="Compiles and runs the Ductile-only unit tests.">
<delete dir="${dtclass.dir}"/>
<mkdir dir="${dtclass.dir}"/>
@@ -227,7 +175,7 @@
<!-- allows passing -Dtest=NamePrefix to restrict to subset of tests
-->
<property name="test" value=""/>
<javac fork="yes" executable="${javac.home}/bin/javac" debug="on"
- source="1.6" target="1.6" encoding="utf-8"
+ source="1.6" target="1.6" encoding="utf-8"
includeAntRuntime="no"
srcdir="${src.dir}" destdir="${dtclass.dir}">
<classpath>
<pathelement location="${dtclass.dir}"/>
@@ -285,7 +233,7 @@
</batchtest>
</junit>
<!-- these tests require special package naming conventions and must
- handled in separate <unit> blocks which can run (or not) depending
+ handled in separate <unit> blocks which may run (or not) depending
on the value of the "test" property -->
<antcall target="runspecial">
<param name="testpkg" value="OtherPackage"/>
@@ -319,29 +267,4 @@
</then>
</if>
</target>
-
- <!-- runs the compiler on a test class with the astviz processor active
-->
- <target name="astviz" depends="prepare,compile"
- description="Compiles the test code with the astviz processor.">
- <delete dir="${stclass.dir}"/>
- <mkdir dir="${stclass.dir}"/>
-
- <property name="test" value=""/>
- <echo>--- Compiling ${test}* with astviz:</echo>
- <javac fork="yes" executable="${javac.home}/bin/javac" debug="on"
- source="1.6" target="1.6" encoding="utf-8"
- srcdir="${src.dir}" destdir="${stclass.dir}">
- <classpath>
- <path refid="build.classpath"/>
- <pathelement location="${stclass.dir}"/>
- </classpath>
- <compilerarg value="-Xlint"/>
- <compilerarg value="-Xlint:-serial"/>
- <!--<compilerarg value="-XprintProcessorInfo"/>-->
- <compilerarg value="-processor"/>
- <compilerarg value="org.ductilej.astviz.Processor"/>
- <include name="org/ductilej/tests/${test}**"/>
- </javac>
- </target>
</project>
-