portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r598847 - /portals/jetspeed-2/branches/JETSPEED-2.1.3/maven.xml
Date Wed, 28 Nov 2007 01:45:27 GMT
Author: woonsan
Date: Tue Nov 27 17:45:25 2007
New Revision: 598847

URL: http://svn.apache.org/viewvc?rev=598847&view=rev
Log:
Fixing maven.xml: `maven -Dmaven.test.skip=false allBuild' fails on windows os because <exec>
command does not allow `maven.bat'.
Added conditional <exec>'s for window users.

Modified:
    portals/jetspeed-2/branches/JETSPEED-2.1.3/maven.xml

Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/maven.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/maven.xml?rev=598847&r1=598846&r2=598847&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/maven.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/maven.xml Tue Nov 27 17:45:25 2007
@@ -123,13 +123,25 @@
           <j:set var="cmdargs" value="-o ${maven.multiproject.site.goals}"/>
         </j:otherwise>
       </j:choose>
+
+      <ant:condition property="os.windows.family">
+        <ant:os family="windows"/>
+      </ant:condition>
         
       <j:forEach var="reactorProject" items="${multiprojects}">
-
-        <!-- I don't know yet if this will work on Linux too ... -->
-        <exec dir="${reactorProject.context.getVariable('basedir')}" vmlauncher="false"
failonerror="true" executable="maven">
-          <arg line="${cmdargs}"/>
-        </exec>
+        <j:choose>
+          <j:when test="${os.windows.family}">
+            <exec dir="${reactorProject.context.getVariable('basedir')}" vmlauncher="false"
failonerror="true" executable="cmd">
+              <arg line="/c maven.bat ${cmdargs}"/>
+            </exec>
+          </j:when>
+          <j:otherwise>
+            <!-- I don't know yet if this will work on Linux too ... -->
+            <exec dir="${reactorProject.context.getVariable('basedir')}" vmlauncher="false"
failonerror="true" executable="maven">
+              <arg line="${cmdargs}"/>
+            </exec>
+          </j:otherwise>
+        </j:choose>
       </j:forEach>        
       <echo>Now building reactor projects: ${multiprojects}</echo>
     
@@ -208,7 +220,7 @@
 
       <attainGoal name="j2:portal.conf.jetspeed"/>
       <attainGoal name="j2:portal.conf.tomcat"/>
-
+      
       <j:if test="${context.getVariable('maven.test.skip') != 'true'}">
         <j:set var="online" value="${maven.mode.online}"/>
         <j:choose>
@@ -219,9 +231,24 @@
             <j:set var="cmdargs" value="-o j2:db.create.test"/>
           </j:otherwise>
         </j:choose>
-        <exec dir="${basedir}" vmlauncher="true" failonerror="true" executable="maven">
-          <arg line="${cmdargs}"/>
-        </exec>
+        
+        <ant:condition property="os.windows.family">
+          <ant:os family="windows"/>
+        </ant:condition>
+        
+        <j:choose>
+          <j:when test="${os.windows.family}">
+            <exec dir="${basedir}" vmlauncher="true" failonerror="true" executable="cmd">
+              <arg line="/c maven.bat ${cmdargs}"/>
+            </exec>
+          </j:when>
+          <j:otherwise>
+            <exec dir="${basedir}" vmlauncher="true" failonerror="true" executable="maven">
+              <arg line="${cmdargs}"/>
+            </exec>
+          </j:otherwise>
+        </j:choose>
+        
       </j:if>
 
 	  <attainGoal name="jetspeed2:schema" />



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message