[hibernate-commits] Hibernate SVN: r14820 - in commons-annotations/trunk: ivy and 1 other directory.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Sun Jun 29 09:06:16 EDT 2008
Author: hardy.ferentschik
Date: 2008-06-29 09:06:15 -0400 (Sun, 29 Jun 2008)
New Revision: 14820
Modified:
commons-annotations/trunk/build.xml
commons-annotations/trunk/common-build.xml
commons-annotations/trunk/ivy/ivyconf.xml
Log:
* Synchronised ivyconf.xml and common-build.xml with annotations project.
* Cleanup of build.xml
Modified: commons-annotations/trunk/build.xml
===================================================================
--- commons-annotations/trunk/build.xml 2008-06-29 08:18:20 UTC (rev 14819)
+++ commons-annotations/trunk/build.xml 2008-06-29 13:06:15 UTC (rev 14820)
@@ -21,20 +21,6 @@
<import file="${common.dir}/common-build.xml"/>
- <!-- FIXME path id="lib.class.path">
- <fileset dir="${hibernate-core.lib.dir}">
- <include name="commons-logging*.jar"/>
- <include name="log4j*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${ivy.dep.dir}/core">
- <include name="*.jar"/>
- </fileset>
- <path refid="lib.moduleclass.path"/>
- <pathelement path="${clover.jar}"/>
- </path -->
<path id="lib.moduleclass.path">
<fileset dir="${ivy.dep.dir}/core">
<include name="*.jar"/>
@@ -59,16 +45,6 @@
<taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/>
- <!-- 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="init" description="Initialize the build">
<!-- CCed from common-build to avoid failure when hibernate core is not compiled -->
<tstamp>
@@ -95,8 +71,6 @@
<mkdir dir="${ivy.dep.dir}/core"/>
<mkdir dir="${ivy.dep.dir}/test"/>
<ivy:configure file="${ivy.jar.dir}/ivyconf.xml" />
- <!-- check for dependency artefacts -->
- <!-- available file="${jpa-api.jar}" type="file" property="jpa-api.jar.available"/ -->
</target>
<target name="get.deps.core" depends="init" description="retrieve the core dependencies">
@@ -131,11 +105,6 @@
</javac>
</target>
- <!-- target name="get.jpa-api" depends="init" unless="jpa-api.jar.available">
- <ant inheritall="false" dir="${basedir}/../jpa-api" target="clean"/>
- <ant inheritall="false" dir="${basedir}/../jpa-api" target="jar"/>
- </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">
Modified: commons-annotations/trunk/common-build.xml
===================================================================
--- commons-annotations/trunk/common-build.xml 2008-06-29 08:18:20 UTC (rev 14819)
+++ commons-annotations/trunk/common-build.xml 2008-06-29 13:06:15 UTC (rev 14820)
@@ -13,10 +13,11 @@
<property name="src.dir" location="src/java"/>
<property name="test.dir" location="src/test"/>
- <property name="lib.dir" location="lib"/>
+ <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"/>
@@ -43,25 +44,23 @@
<property name="pom.file" value="pom.xml"/>
<property name="src.jar" value="${build.dir}/src.jar"/>
- <!-- build related properties -->
- <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 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>
+ <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 -->
@@ -82,9 +81,6 @@
<artifact:remoteRepository id="offline.repository.jboss.org" url="file://${offline.repository.jboss.org}" />
<path id="lib.class.path">
- <fileset dir="${lib.dir}">
- <include name="*.jar"/>
- </fileset>
<path refid="lib.moduleclass.path"/>
<pathelement path="${clover.jar}"/>
</path>
@@ -131,9 +127,6 @@
<taskdef resource="clovertasks"/>
<path id="junit.classpath">
- <fileset dir="${lib.dir}">
- <include name="*.jar"/>
- </fileset>
<pathelement path="${classes.dir}"/>
<pathelement path="${testclasses.dir}"/>
<path refid="lib.class.path"/>
@@ -278,19 +271,19 @@
</fileset>
</copy>
</target>
-
- <target name="copylib" description="Copy jars to lib dir">
- <mkdir dir="${dist.lib.dir}"/>
- <copy todir="${dist.lib.dir}">
- <fileset dir="${lib.dir}">
- <include name="*.jar"/>
- <exclude name="log4j.jar"/>
- <exclude name="checkstyle*.jar"/>
- <include name="*.txt"/>
- </fileset>
- </copy>
- </target>
-
+
+ <target name="copylib" description="Copy jars to lib dir">
+ <mkdir dir="${dist.lib.dir}"/>
+ <copy todir="${dist.lib.dir}" verbose="true">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ <exclude name="log4j.jar"/>
+ <exclude name="checkstyle*.jar"/>
+ <include name="*.txt"/>
+ </fileset>
+ </copy>
+ </target>
+
<target name="copydoc" description="Copy doc to dist dir" if="copy.doc">
<mkdir dir="${dist.doc.dir}"/>
<copy todir="${dist.doc.dir}">
@@ -351,7 +344,7 @@
</replace>
</target>
- <target name="dist" depends="jar,javadoc,copysource,copylib,copydoc,extras" description="Build everything">
+ <target name="dist" depends="jar,javadoc,copysource,copydoc,extras" description="Build everything">
<zip zipfile = "${dist.dir}-${version}.zip">
<zipfileset prefix="${name}-${version}" dir="${dist.dir}"/>
</zip>
@@ -377,12 +370,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 +383,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 +409,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>
Modified: commons-annotations/trunk/ivy/ivyconf.xml
===================================================================
--- commons-annotations/trunk/ivy/ivyconf.xml 2008-06-29 08:18:20 UTC (rev 14819)
+++ commons-annotations/trunk/ivy/ivyconf.xml 2008-06-29 13:06:15 UTC (rev 14820)
@@ -9,9 +9,13 @@
</chain>
<chain name="rep-hibernate" returnFirst="true" latest="latest-revision">
<filesystem name="local">
- <ivy pattern="../[module]/target/[revision]/ivy.xml"/>
- <artifact pattern="../[module]/target/[revision]/[artifact].[ext]"/>
+ <ivy pattern="../[module]/target/hibernate-[module]/ivy.xml"/>
+ <artifact pattern="../[module]/target/hibernate-[module]/[artifact].[ext]"/>
</filesystem>
+ <filesystem name="hudson-local">
+ <ivy pattern="../../[module]/trunk/target/hibernate-[module]/ivy.xml"/>
+ <artifact pattern="../../[module]/trunk/target/hibernate-[module]/[artifact].[ext]"/>
+ </filesystem>
<filesystem name="maven-local" m2compatible="true">
<artifact pattern="${offline.repository.jboss.org}/[organization]/hibernate-[module]/[revision]/hibernate-[artifact]-[revision].[ext]"/>
</filesystem>
More information about the hibernate-commits
mailing list