[jboss-svn-commits] JBL Code SVN: r9841 - in labs/jbosstm/trunk: common and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Feb 28 09:40:36 EST 2007
Author: kevin.conner at jboss.com
Date: 2007-02-28 09:40:36 -0500 (Wed, 28 Feb 2007)
New Revision: 9841
Modified:
labs/jbosstm/trunk/build.xml
labs/jbosstm/trunk/common/build.xml
Log:
Moved back to ant 1.6.5
Modified: labs/jbosstm/trunk/build.xml
===================================================================
--- labs/jbosstm/trunk/build.xml 2007-02-28 14:31:49 UTC (rev 9840)
+++ labs/jbosstm/trunk/build.xml 2007-02-28 14:40:36 UTC (rev 9841)
@@ -37,6 +37,24 @@
<available property="jts.present" file="${jts.dir}" type="dir"/>
+ <property name="junit.jar" location="ext/junit.jar"/>
+ <macrodef name="runant">
+ <attribute name="target"/>
+ <sequential>
+ <java classname="org.apache.tools.ant.launch.Launcher"
+ classpath="${ant.library.dir}/ant-launcher.jar"
+ fork="true" failonerror="true">
+ <sysproperty key="ant.home" value="${ant.home}"/>
+ <sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
+ <arg value="-cp"/>
+ <arg value="${junit.jar}"/>
+ <arg value="-f"/>
+ <arg value="${ant.file}"/>
+ <arg value="@{target}"/>
+ </java>
+ </sequential>
+ </macrodef>
+
<target name="help">
<echo>
Targets supported in this build.xml file
@@ -49,21 +67,45 @@
</echo>
</target>
- <target name="jts" if="jts.present">
+ <target name="jts">
+ <runant target="run_jts"/>
+ </target>
+
+ <target name="jta">
+ <runant target="run_jta"/>
+ </target>
+
+ <target name="core">
+ <runant target="run_core"/>
+ </target>
+
+ <target name="jbossjts">
+ <runant target="run_jbossjts"/>
+ </target>
+
+ <target name="jbossjta">
+ <runant target="run_jbossjta"/>
+ </target>
+
+ <target name="clean">
+ <runant target="run_clean"/>
+ </target>
+
+ <target name="run_jts" if="jts.present">
<antcall target="install_jts"/>
</target>
- <target name="jta" depends="install_jta"/>
+ <target name="run_jta" depends="install_jta"/>
- <target name="core" depends="install_core"/>
+ <target name="run_core" depends="install_core"/>
- <target name="jbossjts" if="jts.present" depends="init_integration, install_jts">
+ <target name="run_jbossjts" if="jts.present" depends="init_integration, install_jts">
<antcall target="install_integration"/>
</target>
- <target name="jbossjta" depends="init_integration, install_jta, install_integration"/>
+ <target name="run_jbossjta" depends="init_integration, install_jta, install_integration"/>
- <target name="clean" depends="clean_jts">
+ <target name="run_clean" depends="clean_jts">
<delete dir="${com.hp.mw.installationdirectory}"/>
<ant dir="${jta.dir}" target="clean"/>
<ant dir="${core.dir}" target="clean"/>
@@ -112,7 +154,7 @@
</target>
<target name="build_common" depends="build_buildsystem">
- <ant dir="${common.dir}" target="jar"/>
+ <ant dir="${common.dir}" target="tests"/>
</target>
<target name="build_buildsystem">
Modified: labs/jbosstm/trunk/common/build.xml
===================================================================
--- labs/jbosstm/trunk/common/build.xml 2007-02-28 14:31:49 UTC (rev 9840)
+++ labs/jbosstm/trunk/common/build.xml 2007-02-28 14:40:36 UTC (rev 9841)
@@ -55,6 +55,7 @@
<property name="com.hp.mwlabs.ts.common.dest" location="${com.arjuna.common.destroot}/classes"/>
<property name="com.hp.mwlabs.ts.common.htdocs.dest" value="${com.arjuna.common.destroot}/htdocs"/>
<property name="com.hp.mwlabs.ts.common.tests.dest" location="${com.arjuna.common.destroot}/tests"/>
+ <property name="com.hp.mwlabs.ts.common.reports.dest" location="${com.arjuna.common.destroot}/reports"/>
<property name="com.hp.mwlabs.ts.common.tests.destdir" location="${com.hp.mwlabs.ts.common.jar.dest}/tests/"/>
@@ -218,32 +219,30 @@
debug="${com.hp.mwlabs.ts.common.debug}">
<classpath>
<path location="${com.hp.mwlabs.ts.common.dest}"/>
- <path location="../ext/junit.jar"/>
- </classpath>
+ </classpath>
</javac>
</target>
- <target name="com.hp.mw.ts.common.tests.run" depends="com.hp.mw.ts.common.tests.compile">
- <!-- if this taskdef is blowing up, it's probably because you need ant 1.7.0 in order to use
- the embedded classpath method of finding junit.jar. -->
- <junit haltonerror="yes" haltonfailure="yes" fork="yes"
- printsummary="yes">
- <formatter type="plain"/>
- <test name="com.hp.mwtests.commonlogging.testlevels.TestLevels"/>
- <classpath>
- <pathelement location="${com.hp.mwlabs.ts.common.tests.dest}"/>
- <pathelement location="../ext/junit.jar"/>
- <path location="${com.hp.mwlabs.ts.common.dest}"/>
- <pathelement path="${build.classpath}"/>
- <pathelement location="etc"/>
- </classpath>
- </junit>
- </target>
+ <target name="com.hp.mw.ts.common.tests.run" depends="com.hp.mw.ts.common.tests.compile" if="com.hp.mwlabs.ts.common.tests.compile">
+ <mkdir dir="${com.hp.mwlabs.ts.common.reports.dest}"/>
+ <junit printsummary="yes">
+ <formatter type="plain"/>
+ <classpath>
+ <pathelement location="${com.hp.mwlabs.ts.common.tests.dest}"/>
+ <path location="${com.hp.mwlabs.ts.common.dest}"/>
+ <pathelement path="${build.classpath}"/>
+ <pathelement location="etc"/>
+ </classpath>
+ <batchtest haltonerror="yes" haltonfailure="yes" fork="yes"
+ todir="${com.hp.mwlabs.ts.common.reports.dest}">
+ <fileset dir="${com.hp.mwlabs.ts.common.tests.src}" includes="**/TestLevels.java"/>
+ </batchtest>
+ </junit>
+ </target>
+ <target name="com.hp.mwlabs.ts.common.tests.jar" depends="com.hp.mw.ts.common.tests.run" if="com.hp.mwlabs.ts.common.tests.compile">
- <target name="com.hp.mwlabs.ts.common.tests.jar" depends="com.hp.mw.ts.common.tests.run" if="com.hp.mwlabs.ts.common.tests.compile">
-
<mkdir dir="${com.hp.mwlabs.ts.common.tests.destdir}"/>
<jar basedir="${com.hp.mwlabs.ts.common.tests.dest}"
jarfile="${com.hp.mwlabs.ts.common.tests.destdir}/${com.arjuna.common.modulename}_tests.jar"/>
@@ -340,8 +339,8 @@
<!-- Short target names -->
<target name="compile" depends="com.arjuna.common.compile"/>
- <target name="jar" depends="com.arjuna.common.build"/>
- <!-- <target name="jar" depends="com.hp.mw.ts.common.jar"/> -->
+ <target name="jar" depends="com.hp.mw.ts.common.jar"/>
+ <target name="tests" depends="com.arjuna.common.build"/>
<target name="clean" depends="com.hp.mw.ts.common.clean"/>
<target name="htdocs" depends="com.hp.mw.ts.common.htdocs"/>
<target name="install" depends="com.hp.mw.ts.common.install"/>
More information about the jboss-svn-commits
mailing list