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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Oct 18 17:30:53 EDT 2006


Author: rrajesh
Date: 2006-10-18 17:30:51 -0400 (Wed, 18 Oct 2006)
New Revision: 57712

Modified:
   trunk/tools/etc/cruisecontrol/scripts/build-aop-head-testsuite.xml
Log:
Added jboss-aop builds

Modified: trunk/tools/etc/cruisecontrol/scripts/build-aop-head-testsuite.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/build-aop-head-testsuite.xml	2006-10-18 21:30:31 UTC (rev 57711)
+++ trunk/tools/etc/cruisecontrol/scripts/build-aop-head-testsuite.xml	2006-10-18 21:30:51 UTC (rev 57712)
@@ -1,10 +1,9 @@
-<project name="build-aop-head-testsuite" default="copyresults">
+<project name="build-jboss-aop-testsuite" default="copyresults">
 
-    <property name="cvs.repository" value=":pserver:anonymous at anoncvs.forge.jboss.com:/cvsroot/jboss"/>
     <property name="log.dir" value="${basedir}/logbuild/${jboss.dir}"/>
     <property environment="env"/>
 
-    <import file="build-common-targets.xml"/>
+    <import file="build-common.xml"/>
 
     <target name="clean" depends="" description="Cleans checkout directory">
 	<sequential>
@@ -20,71 +19,62 @@
     </target>
 
     <target name="getcode" depends="clean" description="Update packages from CVS">
-        <cvs command="co -d ${jboss.dir} jboss-head" cvsroot="${cvs.repository}" compressionlevel="3" dest="../checkout" failonerror="true" output="${log.dir}/cvsco.log"/>
+        <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="build" depends="getcode" description="Build the jboss-head project">
+    <target name="build" depends="getcode" description="Build the aop project">
 	<sequential>
-        <exec executable="ant" failonerror="false" dir="../checkout/${jboss.dir}/build" resultproperty="build.returncode" output="${log.dir}/compilejbosshead.log">
-            <arg line=""/>
-            <env key="PATH" path="/opt/jdk1.5.0_03/bin:${env.PATH}"/>
-            <env key="JAVA_HOME" path="/opt/jdk1.5.0_03"/>            
+        <exec executable="ant" failonerror="false" dir="../checkout/${jboss.dir}/build" resultproperty="buildaop.returncode"  output="${log.dir}/build.log">
+            <arg line="clean main"/>
+            <env key="PATH" path="${java15}/bin:${env.PATH}"/>
+            <env key="JAVA_HOME" path="${java15}"/> 
         </exec>
-        <antcall target="copylogs">
-           <param name="dest.dir" value="${log.dir}"/>
-           <param name="proj.dir" value="${jboss.dir}"/>
-        </antcall>
-        <condition property="build.success">
-          <equals arg1="${build.returncode}" arg2="0"/>
-        </condition>
-        <fail unless="build.success">
-          Exit code: ${build.returncode}
-          See compilejbosshead.log in Build Artifacts for details.
-        </fail>
-        </sequential>
-    </target>
-
-    <target name="buildaop" depends="build" description="Build the aop project">
-	<sequential>
-        <exec executable="ant" failonerror="false" dir="../checkout/${jboss.dir}/aop/" resultproperty="buildaop.returncode"  output="${log.dir}/compileaop.log">
-            <arg line=""/>
-            <env key="PATH" path="/opt/jdk1.5.0_03/bin:${env.PATH}"/>
-            <env key="JAVA_HOME" path="/opt/jdk1.5.0_03"/> 
-            <env key="JROCKIT_HOME" path="/opt/jrockit-jdk1.5.0_03"/>
-        </exec>
-        <antcall target="copylogs">
-           <param name="dest.dir" value="${log.dir}"/>
-           <param name="proj.dir" value="${jboss.dir}/aop"/>
-        </antcall>
         <condition property="buildaop.success">
           <equals arg1="${buildaop.returncode}" arg2="0"/>
         </condition>
         <fail unless="buildaop.success">
           Exit code: ${buildaop.returncode}
-          See compileaop.log in Build Artifacts for details.
+          See build.log in Build Artifacts for details.
         </fail>
         </sequential>
     </target>
 
-    <target name="tests" depends="buildaop" description="Runs the aop tests">
+    <target name="tests" depends="build" description="Runs the aop tests">
 	<sequential>
-        <exec executable="ant" failonerror="false" dir="../checkout/${jboss.dir}/aop/"  resultproperty="tests.returncode"  output="${log.dir}/tests.log">
-            <arg line="tests tests-report-html"/>
-            <env key="PATH" path="/opt/jdk1.5.0_03/bin:${env.PATH}"/>
-            <env key="JAVA_HOME" path="/opt/jdk1.5.0_03"/> 
-            <env key="JROCKIT_HOME" path="/opt/jrockit-jdk1.5.0_03"/>            
+        <exec executable="bash" failonerror="false" dir="../checkout/${jboss.dir}/aop/"  resultproperty="tests50.returncode"  output="${log.dir}/tests-jdk50.log">
+            <arg line="build.sh -f build-tests-jdk50.xml tests tests-report-html"/>
+            <env key="PATH" path="${java15}/bin:${env.PATH}"/>
+            <env key="JAVA_HOME" path="${java15}"/> 
         </exec>
+		<!--
+        <exec executable="bash" failonerror="false" dir="../checkout/${jboss.dir}/aop/"  resultproperty="tests50.returncode"  output="${log.dir}/tests-jdk14.log">
+            <arg line="build.sh -f build-tests-jdk14.xml tests"/>
+            <env key="PATH" path="${java15}/bin:${env.PATH}"/>
+            <env key="JAVA_HOME" path="${java15}"/> 
+        </exec>-->		
         <antcall target="copylogs">
            <param name="dest.dir" value="${log.dir}"/>
            <param name="proj.dir" value="${jboss.dir}"/>
         </antcall>
-        <condition property="tests.success">
-          <equals arg1="${tests.returncode}" arg2="0"/>
+        <condition property="tests50.success">
+          <equals arg1="${tests50.returncode}" arg2="0"/>
         </condition>
-        <fail unless="tests.success">
-          Exit code: ${tests.returncode}
-          See tests.log in Build Artifacts for details.
+        <fail unless="tests50.success">
+          Exit code: ${tests50.returncode}
+          See tests-jdk50.log in Build Artifacts for details.
         </fail>
+		<!--
+        <condition property="tests14.success">
+          <equals arg1="${tests14.returncode}" arg2="0"/>
+        </condition>
+        <fail unless="tests14.success">
+          Exit code: ${tests14.returncode}
+          See tests-jdk14.log in Build Artifacts for details.
+        </fail>-->		
         </sequential>	
     </target>
 
@@ -94,7 +84,7 @@
            <fileset dir="../checkout/${jboss.dir}/aop/output/reports"/>
         </copy>
         <copy todir="${log.dir}/results">
-           <fileset dir="../checkout/j${jboss.dir}/aop/output/reports/html"/>
+           <fileset dir="../checkout/${jboss.dir}/aop/output/reports/html"/>
         </copy>    
 	<delete dir="${log.dir}/results/html"/>
         <antcall target="test-build-failure">




More information about the jboss-cvs-commits mailing list