Author: stliu Date: 2010-02-25 08:30:22 -0500 (Thu, 25 Feb 2010) New Revision: 18885 Modified: annotations/branches/v3_3_1_GA_CP/build.xml annotations/branches/v3_3_1_GA_CP/common-build.xml Log: clean build script Modified: annotations/branches/v3_3_1_GA_CP/build.xml =================================================================== --- annotations/branches/v3_3_1_GA_CP/build.xml 2010-02-25 13:12:27 UTC (rev 18884) +++ annotations/branches/v3_3_1_GA_CP/build.xml 2010-02-25 13:30:22 UTC (rev 18885) @@ -24,20 +24,12 @@ <property name="javac.source" value="1.5"/> <property name="javac.target" value="1.5"/> <property name="common.dir" value="${basedir}"/> - - <!-- property name="jpa-api.jar" value="${basedir}/../jpa-api/build/ejb3-persistence.jar"/> - <property name="commons-annotations.jar" - value="${basedir}/../commons-annotations/target/hibernate-commons-annotations/hibernate-commons-annotations.jar"/ --> <property name="ivy.dep.dir" value="${basedir}/build/lib" /> - - <available property="jpa-present" file="${basedir}/../jpa-api" type="dir"/> <import file="${common.dir}/common-build.xml"/> <property name="jpa-javadoc.dir" value="${dist.doc.dir}/jpa-api"/> <path id="lib.moduleclass.path"> - <!-- pathelement location="${jpa-api.jar}"/> - <pathelement location="${commons-annotations.jar}"/ --> <fileset dir="${ivy.dep.dir}/core"> <include name="*.jar"/> </fileset> @@ -70,24 +62,11 @@ <tstamp> <format property="now" pattern="yyyyMMddhhmmss"/> </tstamp> - <!-- available file="${jpa-api.jar}" type="file" property="jpa-api.jar.available"/> - <available file="${commons-annotations.jar}" type="file" property="commons-annotations.jar.available"/ --> <mkdir dir="${lib.dir}/test"/> <mkdir dir="${ivy.dep.dir}/core"/> <mkdir dir="${ivy.dep.dir}/test"/> <ivy:configure file="${ivy.jar.dir}/ivyconf.xml" /> </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="get.commons-annotations" depends="init" unless="commons-annotations.jar.available"> - <ant inheritall="false" dir="${basedir}/../commons-annotations" target="clean"/> - <ant inheritall="false" dir="${basedir}/../commons-annotations" target="jar"/> - </target --> - <target name="get.deps.core" depends="init" description="retrieve the core dependencies"> <ivy:resolve conf="core" /> <ivy:retrieve pattern="${ivy.dep.dir}/core/[artifact].[ext]" conf="core" /> @@ -142,32 +121,6 @@ <src refid="testsrc.path"/> </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)"> @@ -181,9 +134,7 @@ <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"/> @@ -191,16 +142,6 @@ </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"> @@ -223,10 +164,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"/> @@ -261,8 +198,6 @@ <!-- copy dependencies --> <copy todir="${dist.lib.dir}" failonerror="false"> - <!-- fileset file="${jpa-api.jar}"/> - <fileset file="${commons-annotations.jar}"/ --> <fileset dir="${ivy.dep.dir}/core"> <include name="*.jar"/> </fileset> Modified: annotations/branches/v3_3_1_GA_CP/common-build.xml =================================================================== --- annotations/branches/v3_3_1_GA_CP/common-build.xml 2010-02-25 13:12:27 UTC (rev 18884) +++ annotations/branches/v3_3_1_GA_CP/common-build.xml 2010-02-25 13:30:22 UTC (rev 18885) @@ -47,28 +47,6 @@ <property name="hibernate-core.jdbc.dir" location="${hibernate-core.home}/lib"/> <!-- for some reason jdbc.dir is renamed to lib instead of jdbc when doing a dist of hibernate3 --> <property name="hibernate-core.doc.api" location="${hibernate-core.home}/doc/api"/> <property name="hibernate-cvs.doc.reference" location="${common-build.basedir}/../core/doc/reference"/> - - <!-- - Explicitly define tasks from ant.. - Unfortunately, checkstyle-a<path id="lib.class.path"> - <path location="${hibernate-core.jar}"></path> - <fileset dir="${hibernate-core.lib.dir}"> - <include name="*.jar"/> - </fileset> - <fileset dir="${lib.dir}"> - <include name="*.jar"/> - </fileset> - <pathelement path="${clover.jar}"/> - </path>ll.jar contains it's own version of ANTLR, so ANTLR cannot be in the classpath. - --> - <!-- Emmanuel: Removed antlr, shouldn't be useful in Ext package... - taskdef name="antlr" classname="org.apache.tools.ant.taskdefs.optional.ANTLR"> - <classpath> - <pathelement location="${hibernate-core.lib.dir}/antlr-2.7.2.jar"/> - <pathelement location="${hibernate-core.lib.dir}/ant-antlr-1.6.1.jar"/> - </classpath> - </taskdef --> - <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"> <classpath> <fileset dir="${hibernate-core.lib.dir}"> @@ -96,7 +74,6 @@ <include name="*.jar"/> </fileset> <path refid="lib.moduleclass.path"/> - <pathelement path="${clover.jar}"/> </path> <!-- overridable in modules --> @@ -133,13 +110,7 @@ <path id="testsrc.path"> <pathelement location="${test.dir}"/> - </path> - - <!-- Clover --> - <property name="clover.out.dir" value="cloverout"/> - <property name="clover.jar" value="${ant.home}/lib/clover.jar"/> - <taskdef resource="clovertasks"/> - + </path> <path id="junit.classpath"> <fileset dir="${lib.dir}"> <include name="*.jar"/> @@ -148,33 +119,12 @@ <pathelement path="${testclasses.dir}"/> <path refid="lib.class.path"/> <path refid="junit.moduleclasspath"/> - <path location="${clover.jar}"/> </path> - - <!-- Clover tasks --> - <target name="with.clover"> - <clover-setup initString="clover_coverage.db"/> - </target> - - <target name="cloverreport.html" depends="with.clover" - description="Generate a clover report from the current clover database."> - <clover-report> - <current outfile="${clover.out.dir}"> - <format type="html"/> - </current> - </clover-report> - </target> - - <target name="cloverreport" depends="with.clover,junitreport,cloverreport.html" - description="Run the tests and generate a clover report"> - </target> - <!-- Tasks --> <target name="clean" description="Cleans up build and dist directories"> <delete dir="${build.dir}"/> <delete dir="${dist.target.dir}"/> - <delete dir="${clover.out.dir}"/> </target> <target name="init" description="Initialize the build"> @@ -254,14 +204,6 @@ <exclude name="**/*Tests.class"/> </fileset> </instrument> - - <!-- jar jarfile="${build.dir}/instrumented-classes.jar"> - <fileset dir="${testclasses.dir}"> - <include name="org/hibernate/test/**/*.class"/> - <exclude name="org/hibernate/test/**/*Test.class"/> - </fileset> - </jar --> - </target> <target name="copytest" description="Copy tests to dist dir" if="copy.test" >