[jboss-cvs] JBossAS SVN: r81306 - trunk/build.

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

Author: pgier
Date: 2008-11-19 12:27:25 -0500 (Wed, 19 Nov 2008)
New Revision: 81306

Modified:
   trunk/build/build.xml
Log:
Move maven macro outside of the createthirdparty target.

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2008-11-19 17:16:28 UTC (rev 81305)
+++ trunk/build/build.xml	2008-11-19 17:27:25 UTC (rev 81306)
@@ -963,6 +963,31 @@
   <target name="help" depends="_buildmagic:help:build"
           description="Show this help message."/>
 
+  <!-- Define a macro for calling maven -->
+  <macrodef name="maven">
+      <attribute name="options"/>
+      <attribute name="goal" />
+      <attribute name="basedir" />
+      <element name="args" implicit="true" optional="true" />
+      <sequential>
+          <echo message="Calling mvn command located in ${maven.dir}"/>
+          <java classname="org.codehaus.classworlds.Launcher" fork="true" 
+                dir="@{basedir}" resultproperty="maven.result">
+              <classpath>
+                  <fileset dir="${maven.dir}/boot">
+                      <include name="*.jar" />
+                  </fileset>
+                  <fileset dir="${maven.dir}/lib">
+                      <include name="*.jar" />
+                  </fileset>
+              </classpath>
+              <sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" />
+              <sysproperty key="maven.home" value="${maven.dir}" />
+              <arg line="--batch-mode @{options} @{goal}" />
+          </java>
+      </sequential>
+  </macrodef> 
+  
    <!-- create the thirdparty folder from items in the repository -->
    <!-- then generate a new libraries.ent file and include it in  -->
    <!-- the build                                                 -->
@@ -971,34 +996,8 @@
      
       <property name="maven.dir" value="${basedir}/../tools/maven"/>
       <property name="thirdparty.maven.opts" value=""/>
-      
-      <macrodef name="maven">
-          <attribute name="goal" />
-          <attribute name="basedir" />
-          <element name="args" implicit="true" optional="true" />
-          <sequential>
-              <echo message="Calling mvn command located in ${maven.dir}"/>
-              <java classname="org.codehaus.classworlds.Launcher" fork="true" 
-                    dir="@{basedir}" resultproperty="maven.result">
-                  <classpath>
-                      <fileset dir="${maven.dir}/boot">
-                          <include name="*.jar" />
-                      </fileset>
-                      <fileset dir="${maven.dir}/lib">
-                          <include name="*.jar" />
-                      </fileset>
-                      <fileset dir="${maven.dir}/bin">
-                          <include name="*.*" />
-                      </fileset>
-                  </classpath>
-                  <sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" />
-                  <sysproperty key="maven.home" value="${maven.dir}" />
-                  <arg line="--batch-mode ${thirdparty.maven.opts} @{goal}" />
-              </java>
-          </sequential>
-      </macrodef> 
 
-      <maven basedir="${basedir}/../thirdparty" goal="package"/>
+      <maven basedir="${basedir}/../thirdparty" options="${thirdparty.maven.opts}" goal="generate-resources"/>
       
       <fail message="Unable to build thirdparty directory.  See maven output for details.">
         <condition>