[hibernate-commits] Hibernate SVN: r18074 - core/branches/Branch_3_2_4_SP1_CP.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Thu Nov 26 15:41:05 EST 2009
Author: stliu
Date: 2009-11-26 15:41:04 -0500 (Thu, 26 Nov 2009)
New Revision: 18074
Modified:
core/branches/Branch_3_2_4_SP1_CP/build.xml
Log:
JBPAPP-3170 update build.xml in hibernate-core (branch_3_2_4_SP1_CP)
Modified: core/branches/Branch_3_2_4_SP1_CP/build.xml
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/build.xml 2009-11-26 20:29:18 UTC (rev 18073)
+++ core/branches/Branch_3_2_4_SP1_CP/build.xml 2009-11-26 20:41:04 UTC (rev 18074)
@@ -38,7 +38,6 @@
<property name="dir.jdbc" value="jdbc" />
<property name="dir.doc" value="doc"/>
<property name="dir.doc.api" value="${dir.doc}/api"/>
- <property name="dir.doc.ref" value="${dir.doc}/reference"/>
<property name="dir.eg" value="eg"/>
<property name="dir.props" value="${dir.etc}" />
@@ -51,8 +50,6 @@
<property name="dir.out.junit" value="${dir.build}/testout" />
<property name="dir.out.junit-reports" value="${dir.build}/test-reports" />
<property name="dir.out.perf-test" value="${dir.build}/testout-perf" />
- <property name="dir.out.clover" value="${dir.build}/cloverout" />
- <property name="dir.out.dist" value="${dir.build}/cloverout" />
<property name="dir.out.db" value="${dir.build}/db" />
<property name="dir.out.doc" value="${dir.build}/doc" />
<property name="dir.out.eg" value="${dir.build}/eg" />
@@ -65,7 +62,6 @@
<property name="javac.target" value="1.5"/>
<property name="javac.source" value="1.4"/>
<property name="jar.driver" value="${dir.jdbc}/hsqldb.jar"/>
- <property name="jar.clover" value="${ant.home}/lib/clover.jar"/>
<!-- JAR and dist file names -->
<property name="jar.name" value="${name2}"/>
@@ -143,9 +139,6 @@
<classpath refid="path.lib"/>
</taskdef>
- <taskdef resource="clovertasks"/>
-
-
<!-- ################################################################## -->
<!-- ############################ Targets ############################# -->
<!-- ################################################################## -->
@@ -341,7 +334,6 @@
<pathelement path="${dir.out.classes}"/>
<pathelement path="${dir.out.test-classes}"/>
<pathelement path="${dir.props}"/>
- <pathelement path="${jar.clover}"/>
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
@@ -369,7 +361,6 @@
<pathelement path="${dir.out.classes}"/>
<pathelement path="${dir.out.test-classes}"/>
<pathelement path="${dir.props}"/>
- <pathelement path="${jar.clover}"/>
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
@@ -391,7 +382,6 @@
<pathelement path="${dir.out.classes}"/>
<pathelement path="${dir.out.test-classes}"/>
<pathelement path="${dir.props}"/>
- <pathelement path="${jar.clover}"/>
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
@@ -414,7 +404,6 @@
<pathelement path="${dir.out.classes}"/>
<pathelement path="${dir.out.test-classes}"/>
<pathelement path="${dir.props}"/>
- <pathelement path="${jar.clover}"/>
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
@@ -433,17 +422,16 @@
<pathelement path="${dir.out.classes}"/>
<pathelement path="${dir.out.test-classes}"/>
<pathelement path="${dir.props}"/>
- <pathelement path="${jar.clover}"/>
</classpath>
<formatter type="plain"/>
- <test name="org.hibernate.test.NewPerformanceTest" todir="${dir.out.perf-test}" haltonfailure="no"/>
- <test name="org.hibernate.test.NewerPerformanceTest" todir="${dir.out.perf-test}" haltonfailure="no"/>
- <test name="org.hibernate.test.PerformanceTest" todir="${dir.out.perf-test}" haltonfailure="no"/>
+ <test name="org.hibernate.test.legacy.NewPerformanceTest" todir="${dir.out.perf-test}" haltonfailure="no"/>
+ <test name="org.hibernate.test.legacy.NewerPerformanceTest" todir="${dir.out.perf-test}" haltonfailure="no"/>
+ <test name="org.hibernate.test.legacy.PerformanceTest" todir="${dir.out.perf-test}" haltonfailure="no"/>
</junit>
</target>
<target name="eg" depends="prepare-dist" description="Compile and run the simple example">
- <!-- works only in distribution, not in CVS tree; see 'eg.inline' target -->
+ <!-- works only in distribution, not in SVN tree; see 'eg.inline' target -->
<mkdir dir="${dir.out.eg}" />
<available classname="org.eclipse.core.launcher.Main"
@@ -718,13 +706,16 @@
<exclude name="oscache.properties" />
</zipfileset>
<zipfileset prefix="${name}-${version.major_minor}-src" file="${basedir}/hibernate_logo.gif" />
+ <zipfileset prefix="${name}-${version.major_minor}-src" file="${basedir}/lgpl.txt" />
+ <zipfileset prefix="${name}-${version.major_minor}-src" file="${basedir}/JBossORG-EULA.txt" />
+ <zipfileset prefix="${name}-${version.major_minor}-src" file="${basedir}/readme.txt" />
</zip>
<checksum file="${dir.dist}/${fullname}-src.zip" algorithm="MD5" fileext=".md5.txt"/>
<delete file="${dir.dist}/build.xml"/>
</target>
- <target name="dist.complete" depends="init,versioncheck,jar,javadoc,refdoc,antlr.bnf"
+ <target name="dist.complete" depends="init,versioncheck,jar,javadoc,antlr.bnf"
description="Build and package everything, and run test suite and eg example">
<!-- perform a call to the junit target -->
@@ -770,11 +761,6 @@
<copy file="${dir.doc.api}/package.html" todir="${dir.out.doc}/api"/>
</target>
- <target name="refdoc" depends="splash" description="Generate and copy reference documentation">
- <ant dir="${dir.doc.ref}" inheritall="false" target="all.doc"/>
- </target>
-
-
<!-- miscellaneous targets -->
<target name="checkstyle" description="Check coding style">
@@ -782,29 +768,14 @@
<classpath refid="path.lib"/>
</taskdef>
<checkstyle config="checkstyle_checks.xml">
- <fileset dir="${src.dir}">
+ <fileset dir="${dir.src}">
<include name="**/*.java"/>
</fileset>
<formatter type="plain"/>
</checkstyle>
</target>
- <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 name="prepare-dir-up" depends="jar">
<!-- for backwards compatibility with where the tools expect to find the jar and libs -->
<property name="targetdir" value="../${name}-${version.major_minor}"/>
More information about the hibernate-commits
mailing list