[jboss-svn-commits] JBossAS SVN: r54830 - trunk/tools/etc/cruisecontrol/scripts
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 28 22:43:47 EDT 2006
Author: rrajesh
Date: 2006-07-28 22:43:45 -0400 (Fri, 28 Jul 2006)
New Revision: 54830
Added:
trunk/tools/etc/cruisecontrol/scripts/build-common.xml
Modified:
trunk/tools/etc/cruisecontrol/scripts/build-cruisecontrol.xml
trunk/tools/etc/cruisecontrol/scripts/build-ejb3-4.0-testsuite.xml
trunk/tools/etc/cruisecontrol/scripts/build-ejb3-head-testsuite.xml
trunk/tools/etc/cruisecontrol/scripts/build-jboss-common-module.xml
trunk/tools/etc/cruisecontrol/scripts/build-jboss-common.xml
trunk/tools/etc/cruisecontrol/scripts/build-microcontainer-head-testsuite.xml
Log:
Refactored scripts to support jbossas migration to subversion
Added: trunk/tools/etc/cruisecontrol/scripts/build-common.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/build-common.xml 2006-07-29 02:41:42 UTC (rev 54829)
+++ trunk/tools/etc/cruisecontrol/scripts/build-common.xml 2006-07-29 02:43:45 UTC (rev 54830)
@@ -0,0 +1,20 @@
+ <project name="build-common">
+ <property file="cruisecontrol.properties"/>
+
+ <path id="project.classpath">
+ <fileset dir="../../svnant/lib/">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties">
+ <classpath>
+ <pathelement location="/opt/apache-ant-1.6.2/lib/ant-contrib.jar"/>
+ </classpath>
+ </taskdef>
+
+ <taskdef resource="svntask.properties" classpathref="project.classpath"/>
+
+ <import file="build-common-targets.xml"/>
+ </project>
+
Modified: trunk/tools/etc/cruisecontrol/scripts/build-cruisecontrol.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/build-cruisecontrol.xml 2006-07-29 02:41:42 UTC (rev 54829)
+++ trunk/tools/etc/cruisecontrol/scripts/build-cruisecontrol.xml 2006-07-29 02:43:45 UTC (rev 54830)
@@ -2,7 +2,7 @@
<property name="cvs.repository" value=":pserver:anonymous at anoncvs.forge.jboss.com:/cvsroot/jboss"/>
<property name="log.dir" value="${basedir}/logbuild/cruisecontrol"/>
- <import file="build-common-targets.xml"/>
+ <import file="build-common.xml"/>
<target name="clean" depends="" description="Cleans checkout directory">
<antcall target="clean.checkout">
@@ -12,7 +12,9 @@
</target>
<target name="getcode" depends="clean" description="Update packages from CVS">
- <cvs command="co -d cruisecontrol tools/etc/cruisecontrol" cvsroot="${cvs.repository}" compressionlevel="3" dest="../checkout" failonerror="true" output="${log.dir}/cvsco.log"/>
+ <svn>
+ <checkout url="${svn.url}" destPath="../checkout/${jboss.dir}"/>
+ </svn>
</target>
<target name="build" depends="getcode" description="Build the cruisecontrol project">
Modified: trunk/tools/etc/cruisecontrol/scripts/build-ejb3-4.0-testsuite.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/build-ejb3-4.0-testsuite.xml 2006-07-29 02:41:42 UTC (rev 54829)
+++ trunk/tools/etc/cruisecontrol/scripts/build-ejb3-4.0-testsuite.xml 2006-07-29 02:43:45 UTC (rev 54830)
@@ -4,7 +4,7 @@
<property name="log.dir" value="${basedir}/logbuild/ejb3-4.0-testsuite"/>
<property environment="env"/>
- <import file="build-common-targets.xml"/>
+ <import file="build-common.xml"/>
<target name="clean" depends="" description="Cleans checkout directory">
<sequential>
@@ -20,7 +20,9 @@
</target>
<target name="getcode" depends="clean" description="Update packages from CVS">
- <cvs command="co -r Branch_4_0 -d ejb3-4.0-testsuite jboss-4.0.x" cvsroot="${cvs.repository}" compressionlevel="3" dest="../checkout" failonerror="true" output="${log.dir}/cvsco.log"/>
+ <svn>
+ <checkout url="${svn.url}" destPath="../checkout/${jboss.dir}"/>
+ </svn>
</target>
<target name="build" depends="getcode" description="Build the jboss-4.0 project">
Modified: trunk/tools/etc/cruisecontrol/scripts/build-ejb3-head-testsuite.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/build-ejb3-head-testsuite.xml 2006-07-29 02:41:42 UTC (rev 54829)
+++ trunk/tools/etc/cruisecontrol/scripts/build-ejb3-head-testsuite.xml 2006-07-29 02:43:45 UTC (rev 54830)
@@ -4,7 +4,7 @@
<property name="log.dir" value="${basedir}/logbuild/ejb3-head-testsuite"/>
<property environment="env"/>
- <import file="build-common-targets.xml"/>
+ <import file="build-common.xml"/>
<target name="clean" depends="" description="Cleans checkout directory">
<sequential>
@@ -20,7 +20,9 @@
</target>
<target name="getcode" depends="clean" description="Update packages from CVS">
- <cvs command="co -d ejb3-head-testsuite jboss-head" cvsroot="${cvs.repository}" compressionlevel="3" dest="../checkout" failonerror="true" output="${log.dir}/cvsco.log"/>
+ <svn>
+ <checkout url="${svn.url}" destPath="../checkout/${jboss.dir}"/>
+ </svn>
</target>
<target name="build" depends="getcode" description="Build the jboss-head project">
Modified: trunk/tools/etc/cruisecontrol/scripts/build-jboss-common-module.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/build-jboss-common-module.xml 2006-07-29 02:41:42 UTC (rev 54829)
+++ trunk/tools/etc/cruisecontrol/scripts/build-jboss-common-module.xml 2006-07-29 02:43:45 UTC (rev 54830)
@@ -3,30 +3,9 @@
<property name="log.dir" value="${basedir}/logbuild/${jboss.dir}"/>
<property name="proj.dir" value="../checkout/${jboss.dir}"/>
<property environment="env"/>
+
+ <import file="build-common.xml"/>
- <property file="cruisecontrol.properties"/>
-
- <path id="project.classpath">
- <fileset dir="../../svnant/lib/">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <taskdef resource="net/sf/antcontrib/antcontrib.properties">
- <classpath>
- <pathelement location="/opt/apache-ant-1.6.2/lib/ant-contrib.jar"/>
- </classpath>
- </taskdef>
-
- <taskdef resource="svntask.properties" classpathref="project.classpath"/>
-
- <import file="build-common-targets.xml"/>
-
- <property name="jboss-4.0-common-url" value="http://anonsvn.jboss.org/repos/common/branches/Branch_4_0"/>
- <property name="jboss-head-common-url" value="http://anonsvn.jboss.org/repos/common/trunk"/>
- <propertycopy name="jboss.common.svn.url" from="${jboss.dir}-url"/>
-
-
<target name="clean" depends="" description="Cleans checkout directory">
<antcall target="clean.checkout">
<param name="checkout.dir" value="${proj.dir}"/>
@@ -36,7 +15,7 @@
<target name="getcode" depends="clean" description="Update packages from CVS">
<svn>
- <checkout url="${jboss.common.svn.url}" destPath="${proj.dir}"/>
+ <checkout url="${svn.url}" destPath="${proj.dir}"/>
</svn>
</target>
Modified: trunk/tools/etc/cruisecontrol/scripts/build-jboss-common.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/build-jboss-common.xml 2006-07-29 02:41:42 UTC (rev 54829)
+++ trunk/tools/etc/cruisecontrol/scripts/build-jboss-common.xml 2006-07-29 02:43:45 UTC (rev 54830)
@@ -11,7 +11,7 @@
<property name="jdk14.log" value="compile_jdk14.log"/>
<property name="jdk131.log" value="compile_jdk131.log"/>
- <property name="jboss.dir" value="${cvs.module}"/>
+ <!--<property name="jboss.dir" value="${cvs.module}"/>-->
<property name="build.reports" value="../checkout/${jboss.dir}/testsuite/output/reports"/>
<property name="cvs.repository" value=":pserver:anonymous at anoncvs.forge.jboss.com:/cvsroot/jboss"/>
@@ -20,23 +20,9 @@
<property file="committer-list.properties"/>
<property environment="env"/>
+
+ <import file="build-common.xml"/>
- <path id="project.classpath">
- <fileset dir="../../svnant/lib/">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <taskdef resource="svntask.properties" classpathref="project.classpath"/>
-
- <import file="build-common-targets.xml"/>
-
- <taskdef resource="net/sf/antcontrib/antcontrib.properties">
- <classpath>
- <pathelement location="/opt/apache-ant-1.6.2/lib/ant-contrib.jar"/>
- </classpath>
- </taskdef>
-
<macrodef name="kill-jboss-dead">
<sequential>
<exec dir="." executable="bash">
@@ -222,7 +208,7 @@
<param name="artifacts.dir" value="${log.dir}"/>
</antcall>
</target>
-
+ <!--
<target name="checkout" depends="clean">
<if>
<equals arg1="${cvs.branch}" arg2="HEAD" />
@@ -237,20 +223,16 @@
<cvs command="co -P ${cvs.branch.opt} -d ${jboss.dir} ${cvs.module}" cvsroot="${cvs.repository}" compressionlevel="3" quiet="true" failonerror="true" dest="../checkout"
output="${log.dir}/cvsco.log"/>
</target>
-
- <target name="checkout-svn" depends="clean" description="Update packages from SVN">
- <svn username="${svn.username}" password="${svn.password}">
- <checkout url="https://svn.jboss.org/repos/jbossas/mutated/branches/Branch_4_0/" destPath="../checkout/${jboss.dir}"/>
+ -->
+ <target name="checkout" depends="clean" description="Update packages from SVN">
+ <svn>
+ <checkout url="${svn.url}" destPath="../checkout/${jboss.dir}"/>
</svn>
</target>
<target name="build" depends="checkout">
<build logName="${jdk14.log}"/>
- </target>
-
- <target name="build-svn" depends="checkout-svn">
- <build logName="${jdk14.log}"/>
</target>
<target name="test" depends="build-testsuite">
@@ -310,8 +292,5 @@
</target>
<target name="build-3.2-jdks" depends="build">
<build javaHomeDir="${jdk131}" logName="${jdk131.log}"/>
- </target>
- <target name="build-4.0-jdks-svn" depends="build-svn">
- <build javaHomeDir="${jdk15}" logName="${jdk15.log}"/>
- </target>
+ </target>
</project>
Modified: trunk/tools/etc/cruisecontrol/scripts/build-microcontainer-head-testsuite.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/build-microcontainer-head-testsuite.xml 2006-07-29 02:41:42 UTC (rev 54829)
+++ trunk/tools/etc/cruisecontrol/scripts/build-microcontainer-head-testsuite.xml 2006-07-29 02:43:45 UTC (rev 54830)
@@ -5,7 +5,7 @@
<property name="proj.dir" value="../checkout/microcontainer-head-testsuite"/>
<property environment="env"/>
- <import file="build-common-targets.xml"/>
+ <import file="build-common.xml"/>
<target name="clean" depends="" description="Cleans checkout directory">
<sequential>
@@ -21,7 +21,9 @@
</target>
<target name="getcode" depends="clean" description="Update packages from CVS">
- <cvs command="co -d microcontainer-head-testsuite jboss-head" cvsroot="${cvs.repository}" compressionlevel="3" dest="../checkout" failonerror="true" output="${log.dir}/cvsco.log"/>
+ <svn>
+ <checkout url="${svn.url}" destPath="../checkout/${jboss.dir}"/>
+ </svn>
</target>
<target name="build" depends="getcode" description="Build the jboss-head project">
More information about the jboss-svn-commits
mailing list