[jboss-cvs] JBossAS SVN: r70879 - branches/maven_thirdparty_temp/build.

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

Author: pgier
Date: 2008-03-14 12:29:34 -0400 (Fri, 14 Mar 2008)
New Revision: 70879

Modified:
   branches/maven_thirdparty_temp/build/build.xml
Log:
Make call to maven more flexible and platform independent (based on suggestion on jboss-dev).

Modified: branches/maven_thirdparty_temp/build/build.xml
===================================================================
--- branches/maven_thirdparty_temp/build/build.xml	2008-03-14 15:39:05 UTC (rev 70878)
+++ branches/maven_thirdparty_temp/build/build.xml	2008-03-14 16:29:34 UTC (rev 70879)
@@ -912,12 +912,35 @@
    <!-- the build                                                 -->
    <target name="createthirdparty" unless="inhibit.downloads"
       depends="check.inhibit.downloads, set.proxy">
-      <condition property="mvn.cmd" value="mvn.bat" else="mvn">
-         <os family="windows"/>
-      </condition>
-      <exec executable="${mvn.cmd}" dir="../thirdparty">
-        <arg line="package"/>
-      </exec>
+     
+      <property name="maven.dir" value="${basedir}/../tools/maven"/>
+      <macrodef name="maven">
+          <attribute name="goal" />
+          <attribute name="basedir" />
+          <element name="args" implicit="true" optional="true" />
+          <sequential>
+              <java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}">
+                  <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}" />
+                  <args />
+                  <arg line="@{goal}" />
+              </java>
+          </sequential>
+      </macrodef> 
+
+      <maven basedir="${basedir}/../thirdparty" goal="package"/>
+
    </target>
 
    <!-- check if thirdparty libraries are to be downloaded -->