3:43 a.m.
Author: hardy.ferentschik
Date: 2008-06-05 04:43:42 -0400 (Thu, 05 Jun 2008)
New Revision: 14738
Modified:
annotations/trunk/
annotations/trunk/build.xml
annotations/trunk/common-build.xml
Log:
Build file cleanup:
- removed obsolete lib directory
- introduced a variable for the test reports
- moved test reports into build directory
- removed duplicated junitsingle target
Property changes on: annotations/trunk
___________________________________________________________________
Name: svn:ignore
- target
test_output
build
.*
+ target
build
.*
Modified: annotations/trunk/build.xml
===================================================================
--- annotations/trunk/build.xml 2008-06-05 08:06:33 UTC (rev 14737)
+++ annotations/trunk/build.xml 2008-06-05 08:43:42 UTC (rev 14738)
@@ -135,64 +135,6 @@
</javac>
</target>
-
- <!-- target name="junit" depends="compiletest">
- <mkdir dir="test_output"/>
- <junit fork="yes" printsummary="yes"
haltonfailure="yes"
- forkmode="perBatch">
- <classpath>
- <fileset dir="${jdbc.dir}">
- <include name="**/*.jar"/>
- <include name="**/*.zip"/>
- </fileset>
- <path refid="lib.class.path"/>
- <pathelement path="${classes.dir}"/>
- <pathelement path="${src.dir}"/>
- <pathelement path="${test.dir}"/>
- </classpath>
- <formatter type="plain"/>
- <formatter type="xml"/>
- <batchtest fork="yes" todir="test_output"
haltonfailure="no">
- <fileset dir="${classes.dir}">
- <include name="**/*Test.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target -->
-
- <!-- Run a single unit test. -->
- <target name="junitsingle" depends="compiletest"
- description="Run a single test suite (requires testname and jdbc.driver
properties)">
- <mkdir dir="test_output"/>
- <junit printsummary="yes" fork="yes"
haltonfailure="yes">
- <classpath>
- <fileset dir="${jdbc.dir}">
- <include name="**/*.jar"/>
- <include name="**/*.zip"/>
- </fileset>
- <path refid="lib.class.path"/>
- <pathelement path="${classes.dir}"/>
- <pathelement path="${src.dir}"/>
- <!-- pick up properties from here -->
- <pathelement path="${test.dir}"/>
- <!-- pick up mappings from here -->
- </classpath>
- <formatter type="plain"/>
- <formatter type="xml"/>
- <test fork="yes" todir="test_output"
haltonfailure="no" name="${testname}"/>
- </junit>
- </target>
-
- <!-- target name="report">
- <mkdir dir="test_output"/>
- <junitreport todir="test_output">
- <fileset dir="test_output">
- <include name="TEST-*.xml"/>
- </fileset>
- <report format="frames" todir="test_output/report"/>
- </junitreport>
- </target -->
-
<target name="jar" depends="compile" description="Build the
distribution .jar file">
<mkdir dir="${classes.dir}/META-INF"/>
<manifest file="${classes.dir}/META-INF/MANIFEST.MF">
@@ -216,10 +158,6 @@
/>
</target>
- <!-- target name="javadoc" description="Compile the Javadoc API
documentation to dist dir">
- <echo>Skipping java doc since ant's javadoc task cannot handle an
alternative javadoc</echo>
- </target -->
-
<target name="jpa-javadoc" if="jpa-present">
<mkdir dir="${jpa-javadoc.dir}"/>
<ant dir="../jpa-api" target="javadoc"
inheritAll="false"/>
Modified: annotations/trunk/common-build.xml
===================================================================
--- annotations/trunk/common-build.xml 2008-06-05 08:06:33 UTC (rev 14737)
+++ annotations/trunk/common-build.xml 2008-06-05 08:43:42 UTC (rev 14738)
@@ -16,7 +16,8 @@
<property name="lib.dir" location="lib"/>
<property name="build.dir" location="build"/>
<property name="classes.dir"
location="${build.dir}/classes"/>
- <property name="testclasses.dir"
location="${build.dir}/testclasses"/>
+ <property name="testclasses.dir"
location="${build.dir}/testclasses"/>
+ <property name="testreports.dir"
location="${build.dir}/test-reports"/>
<property name="dist.target.dir" location="target"/>
<property name="dist.dir"
location="${dist.target.dir}/${name}"/>
<property name="instrumenttest.out.dir"
value="instrumenttestout"/>
@@ -47,21 +48,9 @@
<property name="build.lib.dir" value="${lib.dir}/build"/>
<taskdef name="junit"
classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
- <classpath>
- <fileset dir="${common-build.basedir}/lib/build"> <!--
${build.lib.dir} fails in reference doc build -->
- <include name="junit-*.jar"/>
- <include name="ant-junit-*.jar"/>
- </fileset>
- </classpath>
</taskdef>
<taskdef name="junitreport"
classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator">
- <classpath>
- <fileset dir="${common-build.basedir}/lib/build"> <!--
${build.lib.dir} fails in reference doc build -->
- <include name="junit-*.jar"/>
- <include name="ant-junit-*.jar"/>
- </fileset>
- </classpath>
</taskdef>
<!-- ivy load -->
@@ -377,12 +366,12 @@
</target>
<target name="junit" depends="compiletest">
- <mkdir dir="test_output"/>
+ <mkdir dir="${testreports.dir}"/>
<junit printsummary="yes" haltonfailure="yes"
forkmode="once">
<classpath refid="junit.classpath"/>
<formatter type="plain"/>
<formatter type="xml"/>
- <batchtest fork="yes" todir="test_output"
haltonfailure="no">
+ <batchtest fork="yes" todir="${testreports.dir}"
haltonfailure="no">
<fileset refid="junit.batchtestset"/>
</batchtest>
</junit>
@@ -390,12 +379,12 @@
<!-- Run a single unit test. -->
<target name="junitsingle" depends="compiletest"
description="Run a single test suite (requires testname and jdbc.driver
properties)">
- <mkdir dir="test_output"/>
+ <mkdir dir="${testreports.dir}"/>
<junit printsummary="yes" fork="yes"
haltonfailure="yes">
<classpath refid="junit.classpath"/>
<formatter type="plain"/>
<formatter type="xml"/>
- <test fork="yes" todir="test_output"
haltonfailure="no" name="${testname}"/>
+ <test fork="yes" todir="${testreports.dir}"
haltonfailure="no" name="${testname}"/>
</junit>
</target>
@@ -416,11 +405,11 @@
</target>
<target name="junitreport" depends="">
- <junitreport todir="./test_output">
- <fileset dir="test_output">
+ <junitreport todir="${testreports.dir}">
+ <fileset dir="${testreports.dir}">
<include name="TEST-*.xml"/>
</fileset>
- <report format="frames" todir="./test_output"/>
+ <report format="frames"
todir="${testreports.dir}"/>
</junitreport>
</target>