[jboss-cvs] JBossAS SVN: r57557 - trunk/tools/etc/cruisecontrol/scripts

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

Author: rrajesh
Date: 2006-10-10 23:53:54 -0400 (Tue, 10 Oct 2006)
New Revision: 57557

Modified:
   trunk/tools/etc/cruisecontrol/scripts/build-jbossnative.xml
Log:
Updated jbossnative builds to use the new build scripts

Modified: trunk/tools/etc/cruisecontrol/scripts/build-jbossnative.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/build-jbossnative.xml	2006-10-10 22:13:02 UTC (rev 57556)
+++ trunk/tools/etc/cruisecontrol/scripts/build-jbossnative.xml	2006-10-11 03:53:54 UTC (rev 57557)
@@ -17,27 +17,12 @@
     </target>
 
     <target name="getcode" depends="clean" description="Update packages from CVS">
-        <record name="${log.dir}/svnco.log" action="start"/>
         <svn>
             <checkout url="${svn.url}" destPath="../checkout/${jboss.dir}"/>
         </svn>
-        <record name="${log.dir}/svnco.log" action="stop"/>
     </target>
-        	
-    <target name="buildprep" depends="getcode" description="Prepares the native build for the remote platform">
-        <exec dir="${jbossnative.dir}/build" executable="bash" failonerror="false" resultproperty="build.returncode"  output="${log.dir}/buildprep.log">
-            <arg line="buildprep.sh"/>
-        </exec>
-        <condition property="build.success">
-          <equals arg1="${build.returncode}" arg2="0"/>
-        </condition>
-        <fail unless="build.success">
-          Exit code: ${build.returncode}
-          See buildprep.log in Build Artifacts for details.
-        </fail>       
-    </target>
     
-    <target name="build" depends="buildprep" description="Deploys JBossWeb on different platforms and runs the testsuite">   
+    <target name="build" depends="getcode" description="Deploys JBossWeb on different platforms and runs the testsuite">   
         <antcall target="buildJBossNative">
             <param name="platform" value="linux-i686"/>
             <param name="remote.address" value="10.16.6.127"/>
@@ -94,22 +79,7 @@
         -->
     </target>
 
-    <pathconvert targetos="${cc.os}" property="jbossnative.tarball">
-        <path>
-        	<fileset dir="../checkout" includes="jboss-native*gz"/>
-        </path>
-    </pathconvert>
-
-    <pathconvert targetos="${cc.os}" property="jbossnative.tarball.src">
-        <path>
-        	<fileset dir="${jbossnative-builder}" includes="jboss-native*gz"/>
-        </path>
-    </pathconvert>
-
 	<target name="buildJBossNative">
-		<delete file="${jbossnative.tarball.src}"/>
-        <copy file="${jbossnative.tarball}" todir="${jbossnative-builder}"/>
-
         <exec executable="ant" resultproperty="${platform}.tests.returncode" failonerror="false" append="true">
             <arg line=" -buildfile ${jbossnative-builder}/build.xml buildJBossNative -Dremote.address=${remote.address} -Dremote.port=${remote.port} -Dplatform=${platform} -Dtarget.os=${target.os}"/>
             <env key="PATH" path="/opt/jdk1.5.0_03/bin:${env.PATH}"/>