[jboss-svn-commits] JBL Code SVN: r12916 - in labs/jbossesb/trunk/product: rosetta and 1 other directory.

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

Author: kevin.conner at jboss.com
Date: 2007-06-28 06:38:41 -0400 (Thu, 28 Jun 2007)
New Revision: 12916

Modified:
   labs/jbossesb/trunk/product/build.xml
   labs/jbossesb/trunk/product/rosetta/build.xml
Log:
Updated build files

Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml	2007-06-28 08:54:52 UTC (rev 12915)
+++ labs/jbossesb/trunk/product/build.xml	2007-06-28 10:38:41 UTC (rev 12916)
@@ -126,17 +126,19 @@
 
     <!-- Test targets -->
 
-    <target name="esb.test">
+    <target name="esb.test" depends="org.jboss.esb.test.configure-default, org.jboss.esb.test"/>
+	
+	<target name="org.jboss.esb.test.configure-default">
         <property name="tests.to.run" value="*" />
-        <antcall target="org.jboss.esb.test" />
     </target>
 
-    <target name="esb.testx">
+    <target name="esb.testx" depends="org.jboss.esb.test.configure-tests, org.jboss.esb.test"/>
+	
+	<target name="org.jboss.esb.test.configure-tests">
         <input addproperty="tests.to.run" message="Enter the name of the class(es) to be tested.  Wildcards Supported.  No need to specify the 'UnitTest' suffix:" />
-        <antcall target="org.jboss.esb.test" />
     </target>
 
-    <target name="org.jboss.esb.test" depends="jar">
+    <target name="org.jboss.esb.test" depends="org.jboss.esb.jar">
         <echo message="Testing of modules, using unit and functional tests"/>
         <ant dir="rosetta" target="org.jboss.esb.rosetta.test"/>
     	<ant dir="services" target="test"/>
@@ -275,7 +277,7 @@
 
 	<!-- produce a product distribution -->
 	
-	<target name="org.jboss.esb.dist" depends="install, org.jboss.esb.javadocs, tools">
+	<target name="org.jboss.esb.dist" depends="org.jboss.esb.install, org.jboss.esb.javadocs, org.jboss.esb.tools">
 
 		<echo message="Installation directory : ${org.jboss.esb.installationdirectory}"/>
 
@@ -360,6 +362,11 @@
 						<exclude name="**/*.odg"/>
 					</fileset>
 				</copy>
+		
+		<ant antfile="build-distr.xml" target="dist" />
+		<copy todir="${org.jboss.esb.internal.jar.dest}">
+			<fileset dir="build" includes="jbossesb.sar/**"/>
+		</copy>
 	</target>
 	
 	<!-- Build the tools into the main dist -->
@@ -399,15 +406,11 @@
  		<runant target="org.jboss.esb.install"/>
 	</target>
 	
-	<target name="dist" depends="tools" description="produces a product distribution">
- 		<runant target="org.jboss.esb.dist"/>
-		<ant antfile="build-distr.xml" target="dist" />
-		<copy todir="${org.jboss.esb.internal.jar.dest}">
-		    <fileset dir="build" includes="jbossesb.sar/**"/>
-                </copy>
+	<target name="dist" description="produces a product distribution">
+		<runant target="org.jboss.esb.dist"/>
 	</target>
-
-        <target name="artifacts" depends="dist">
+	
+        <target name="artifacts" depends="dist" description="Create disitribution artifacts for JBoss ESB">
                 <zip zipfile="${org.jboss.esb.internal.dest}/jbossesb.zip" basedir="${org.jboss.esb.internal.dest}/jbossesb"/>
                 <zip zipfile="${org.jboss.esb.internal.dest}/${esb.server.name}.zip" basedir="${org.jboss.esb.internal.dest}/${esb.server.name}"/>
 	</target>
@@ -452,6 +455,9 @@
 		<ant dir="rosetta" target="instr-report"/>
 	</target>
 
-	<target name="default" depends="dist,test" description="will run the 'dist' and 'test' targets"/>
-
+	<target name="default" description="will run the 'dist' and 'test' targets">
+		<runant target="org.jboss.esb.default"/>
+	</target>
+	
+	<target name="org.jboss.esb.default" depends="org.jboss.esb.dist, esb.test"/>
 </project>

Modified: labs/jbossesb/trunk/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/build.xml	2007-06-28 08:54:52 UTC (rev 12915)
+++ labs/jbossesb/trunk/product/rosetta/build.xml	2007-06-28 10:38:41 UTC (rev 12916)
@@ -44,12 +44,7 @@
     	<delete dir="${org.jboss.esb.rosetta.classes.dir}"/>
     </target>
 
-    <target name="org.jboss.esb.rosetta.compile">
-		<!-- generate config model -->
-        <antcall target="generate-config-model"/>
-        <!-- Compile common -->
-        <antcall target="org.jboss.esb.rosetta.internal.compile"/>
-        <!-- Compile common tests -->
+    <target name="org.jboss.esb.rosetta.compile" depends="generate-config-model, org.jboss.esb.rosetta.internal.compile">
         <ant inheritAll="true" dir="tests" target="org.jboss.esb.rosetta.tests.compile"/>
     </target>