incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlboud...@apache.org
Subject svn commit: r1425743 - in /incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core: EasyAntEngine.java ant/MetaBuildExecutor.java
Date Tue, 25 Dec 2012 13:52:37 GMT
Author: jlboudart
Date: Tue Dec 25 13:52:37 2012
New Revision: 1425743

URL: http://svn.apache.org/viewvc?rev=1425743&view=rev
Log:
Fix display of subbuild result in multimodule

Modified:
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/MetaBuildExecutor.java

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java?rev=1425743&r1=1425742&r2=1425743&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java
(original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java
Tue Dec 25 13:52:37 2012
@@ -448,7 +448,7 @@ public class EasyAntEngine {
     }
 
     public void loadSystemPlugins(Project project, boolean isRootProject) {
-        if (configuration.getSystemPlugins().size() > 0) {
+        if (isRootProject && configuration.getSystemPlugins().size() > 0) {
             project.log("Loading System Plugins...");
         }
         for (PluginDescriptor systemPlugin : configuration.getSystemPlugins()) {

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/MetaBuildExecutor.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/MetaBuildExecutor.java?rev=1425743&r1=1425742&r2=1425743&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/MetaBuildExecutor.java
(original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/MetaBuildExecutor.java
Tue Dec 25 13:52:37 2012
@@ -77,26 +77,27 @@ public class MetaBuildExecutor extends D
         super.executeTargets(project, preTargetsToRun.toArray(new String[] {}));
 
         printSubBuildsInOrder(project);
-
-        // delegate to the ea:submodule task to execute the list of targets on
-        // all modules in the build list
-        SubModule subModule = new SubModule();
-        subModule.setTaskName("meta:submodule");
-        subModule.setProject(project);
-
-        Boolean useBuildRepository = project.getProperty(EasyAntMagicNames.USE_BUILD_REPOSITORY)
!= null ? Boolean
-                .parseBoolean(project.getProperty(EasyAntMagicNames.USE_BUILD_REPOSITORY))
: true;
-        subModule.setUseBuildRepository(useBuildRepository);
-
-        subModule.setBuildpathRef(new Reference(project, "build-path"));
-        subModule.setTargets(new TargetList(targets));
-        subModule.execute();
-
-        // now call the default executor to include any extra targets defined in
-        // the root module.ant
-        super.executeTargets(project, postTargetsToRun.toArray(new String[] {}));
-
-        printExecutionSubBuildsExecutionTimes(project);
+        try {
+            // delegate to the ea:submodule task to execute the list of targets on
+            // all modules in the build list
+            SubModule subModule = new SubModule();
+            subModule.setTaskName("meta:submodule");
+            subModule.setProject(project);
+
+            Boolean useBuildRepository = project.getProperty(EasyAntMagicNames.USE_BUILD_REPOSITORY)
!= null ? Boolean
+                    .parseBoolean(project.getProperty(EasyAntMagicNames.USE_BUILD_REPOSITORY))
: true;
+            subModule.setUseBuildRepository(useBuildRepository);
+
+            subModule.setBuildpathRef(new Reference(project, "build-path"));
+            subModule.setTargets(new TargetList(targets));
+            subModule.execute();
+
+            // now call the default executor to include any extra targets defined in
+            // the root module.ant
+            super.executeTargets(project, postTargetsToRun.toArray(new String[] {}));
+        } finally {
+            printExecutionSubBuildsExecutionTimes(project);
+        }
     }
 
     /*



Mime
View raw message