[Jboss-cvs] JBossAS SVN: r56152 - trunk/tools/etc/cruisecontrol/scripts

[jboss-cvs-commits at lists.jboss.org]

Author: rrajesh
Date: 2006-08-22 15:22:59 -0400 (Tue, 22 Aug 2006)
New Revision: 56152

Modified:
   trunk/tools/etc/cruisecontrol/scripts/build-jbpm.3.xml
   trunk/tools/etc/cruisecontrol/scripts/cruisecontrol.properties
Log:
JBQA-442 Updated jbpm.3 to the new build structure

Modified: trunk/tools/etc/cruisecontrol/scripts/build-jbpm.3.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/build-jbpm.3.xml	2006-08-22 19:22:59 UTC (rev 56151)
+++ trunk/tools/etc/cruisecontrol/scripts/build-jbpm.3.xml	2006-08-22 19:22:59 UTC (rev 56152)
@@ -4,7 +4,7 @@
     <property name="log.dir" value="${basedir}/logbuild/jbpm.3"/>
     <property environment="env"/>
 
-    <import file="build-common-targets.xml"/>
+    <import file="build-common.xml"/>
 
     <target name="clean" depends="">
 	<sequential>	
@@ -25,10 +25,7 @@
     
     <target name="get.dependencies" depends="getcode" description="Build the project">	
         <exec executable="ant" failonerror="true" dir="../checkout/jbpm.3/build" output="${log.dir}/get_dependencies.log">
-            <arg line="get.dependencies"/>
-        </exec> 
-        <exec executable="ant" failonerror="true" dir="../checkout/jbpm.3/build" output="${log.dir}/get_dependencies.log" append="true">
-            <arg line="get.docbook.support"/>
+            <arg line="clean get.dependencies get.docbook.support"/>
         </exec>         
     </target>
 
@@ -36,6 +33,8 @@
 	<sequential>
         <exec executable="ant" failonerror="false" dir="../checkout/jbpm.3/build" resultproperty="install.returncode"  output="${log.dir}/install_jbpm_ant.log">
             <arg line="install.jbpm.ant"/>
+            <env key="PATH" path="${ant-jbpm}/bin:${env.PATH}"/>
+            <env key="ANT_HOME" path="${ant-jbpm}"/>            
         </exec>
         <antcall target="copylogs">
            <param name="dest.dir" value="${log.dir}"/>
@@ -54,7 +53,7 @@
     <target name="build" depends="install" description="Build the jms project">
 	<sequential>
         <exec executable="ant" failonerror="false" dir="../checkout/jbpm.3/build" resultproperty="build.returncode"  output="${log.dir}/build.log">
-            <arg line="build"/>
+            <arg line="test"/>           
         </exec>
         <antcall target="copylogs">
            <param name="dest.dir" value="${log.dir}"/>
@@ -71,6 +70,16 @@
     </target>
     
     <target name="copyresults" depends="build" description="Copies test results to the logbuild directory">
+        <mkdir dir="${log.dir}/results"/>
+        <copy todir="${log.dir}/results">
+           <fileset dir="../checkout/jbpm.3/jpdl/jar/target/test.results"/>
+        </copy>
+        <antcall target="test-build-failure">
+            <param name="fileset.dir" value="${log.dir}/results/xml"/>
+            <param name="fileset.includes" value="TEST-*.xml"/>
+            <param name="error.text" value="errors=&quot;0&quot;"/>
+            <param name="failure.text" value="failures=&quot;0&quot;"/>
+        </antcall>    
     </target>
 </project>
 

Modified: trunk/tools/etc/cruisecontrol/scripts/cruisecontrol.properties
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/cruisecontrol.properties	2006-08-22 19:22:59 UTC (rev 56151)
+++ trunk/tools/etc/cruisecontrol/scripts/cruisecontrol.properties	2006-08-22 19:22:59 UTC (rev 56152)
@@ -9,4 +9,5 @@
 bea-jdk14=/opt/jrockit-j2sdk1.4.2_11
 bea-jdk15=/opt/jrockit-jdk1.5.0_06
 
-ant-ws=/opt/apache-ant-1.6.5-ws
\ No newline at end of file
+ant-ws=/opt/apache-ant-1.6.5-ws
+ant-jbpm=/home/cruisecontrol/apache-ant-1.6.5
\ No newline at end of file