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

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

Author: rrajesh
Date: 2006-08-09 11:48:57 -0400 (Wed, 09 Aug 2006)
New Revision: 55440

Modified:
   trunk/tools/etc/cruisecontrol/scripts/build-microcontainer-head-testsuite.xml
Log:
Updated build to use the standalone mc project on svn

Modified: trunk/tools/etc/cruisecontrol/scripts/build-microcontainer-head-testsuite.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/build-microcontainer-head-testsuite.xml	2006-08-09 13:12:05 UTC (rev 55439)
+++ trunk/tools/etc/cruisecontrol/scripts/build-microcontainer-head-testsuite.xml	2006-08-09 15:48:57 UTC (rev 55440)
@@ -28,8 +28,8 @@
 
     <target name="build" depends="getcode" description="Build the jboss-head project">
         <sequential>
-        <exec executable="ant" failonerror="false"  resultproperty="build.returncode" output="${log.dir}/compilejbosshead.log">
-            <arg line=" -buildfile ${proj.dir}/build/build.xml"/>
+        <exec executable="bash" dir="${proj.dir}/build" failonerror="false"  resultproperty="build.returncode" output="${log.dir}/build.log">
+            <arg line="build.sh"/>
             <env key="PATH" path="/opt/jdk1.5.0_03/bin:${env.PATH}"/>
             <env key="JAVA_HOME" path="/opt/jdk1.5.0_03"/>
         </exec>
@@ -42,41 +42,13 @@
         </condition>
         <fail unless="build.success">
           Exit code: ${build.returncode}
-          See compilejbosshead.log in Build Artifacts for details.
+          See build.log in Build Artifacts for details.
         </fail>
         </sequential>
     </target>
 
     <target name="tests" depends="build" description="Runs the container tests">
-        <sequential>
-        <antcall target="checkout-module">
-            <param name="checkout.module" value="container"/>
-            <param name="checkout.dir" value="container"/>
-        </antcall> 
-        <antcall target="checkout-module">
-            <param name="checkout.module" value="jboss-dependency"/>
-            <param name="checkout.dir" value="dependency"/>
-        </antcall>
-        <antcall target="checkout-module">
-            <param name="checkout.module" value="microkernel"/>
-            <param name="checkout.dir" value="kernel"/>
-        </antcall>
-        <antcall target="checkout-module">
-            <param name="checkout.module" value="aop-mc-int"/>
-            <param name="checkout.dir" value="aop-mc-int"/>
-        </antcall>
-        <antcall target="build-module">
-            <param name="checkout.dir" value="container"/>
-        </antcall> 
-        <antcall target="build-module">
-            <param name="checkout.dir" value="dependency"/>
-        </antcall>
-        <antcall target="build-module">
-            <param name="checkout.dir" value="kernel"/>
-        </antcall>
-        <antcall target="build-module">
-            <param name="checkout.dir" value="aop-mc-int"/>
-        </antcall>         
+        <sequential>      
         <antcall target="runtests">
             <param name="checkout.dir" value="container"/>
         </antcall> 
@@ -96,35 +68,7 @@
         </sequential>
     </target>
     
-    <target name="checkout-module">
-        <svn>
-            <checkout url="http://anonsvn.jboss.org/repos/jbossas/projects/microcontainer/trunk/${checkout.dir}" destPath="../checkout/${jboss.dir}/${checkout.dir}"/>
-        </svn> 
-    </target>
     
-    <target name="build-module" description="Runs the microcontainer tests">
-        <exec executable="ant" failonerror="false"  resultproperty="build.${checkout.dir}.returncode" output="${log.dir}/compile.log" append="true">
-            <arg line=" -buildfile ${proj.dir}/${checkout.dir}/build.xml"/>
-            <env key="PATH" path="/opt/jdk1.5.0_03/bin:${env.PATH}"/>
-            <env key="JAVA_HOME" path="/opt/jdk1.5.0_03"/>
-        </exec>
-        <condition property="build.${checkout.dir}.success">
-          <equals arg1="${build.container.returncode}" arg2="0"/>
-        </condition>
-        <condition property="build.${checkout.dir}.success">
-          <equals arg1="${build.dependency.returncode}" arg2="0"/>
-        </condition>
-        <condition property="build.${checkout.dir}.success">
-          <equals arg1="${build.kernel.returncode}" arg2="0"/>
-        </condition>
-        <condition property="build.${checkout.dir}.success">
-          <equals arg1="${build.aop-mc-int.returncode}" arg2="0"/>
-        </condition>        
-        <fail unless="build.${checkout.dir}.success">
-          See compile.log in Build Artifacts for details.
-        </fail> 
-    </target>
-    
     <target name="runtests" description="Runs the microcontainer tests">
         <exec executable="ant" failonerror="false" resultproperty="tests.${checkout.dir}.returncode" output="${log.dir}/tests.log" append="true">
             <arg line=" -buildfile ${proj.dir}/${checkout.dir}/build-test.xml tests"/>