continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r354767 - in /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum: DefaultContinuum.java execution/ant/AntBuildExecutor.java
Date Wed, 07 Dec 2005 15:23:13 GMT
Author: evenisse
Date: Wed Dec  7 07:23:06 2005
New Revision: 354767

URL: http://svn.apache.org/viewcvs?rev=354767&view=rev
Log:
PR: CONTINUUM-487
Submitted by: Nick Gonzalez

Allow for specifying the location of the Ant build file

Modified:
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=354767&r1=354766&r2=354767&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
Wed Dec  7 07:23:06 2005
@@ -599,6 +599,8 @@
 
                 bd.setDefaultForProject( true );
 
+                bd.setGoals( "" );
+
                 bd.setArguments( "" );
 
                 bd.setBuildFile( "build.xml" );

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java?rev=354767&r1=354766&r2=354767&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java
Wed Dec  7 07:23:06 2005
@@ -63,8 +63,16 @@
         // TODO: get from installation
 //        String executable = project.getExecutable();
         String executable = "ant";
+        
+        String arguments = "";
+        
+        String buildFile = buildDefinition.getBuildFile();
 
-        String arguments = StringUtils.clean( buildDefinition.getArguments() ) + " " +
+        if (!StringUtils.isEmpty(buildFile)) {
+            arguments = "-f " + buildFile + " ";
+        }
+
+        arguments += StringUtils.clean( buildDefinition.getArguments() ) + " " +
             StringUtils.clean( buildDefinition.getGoals() );
 
         return executeShellCommand( project, executable, arguments, buildOutput );



Mime
View raw message