You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jl...@apache.org on 2013/12/07 09:07:27 UTC
svn commit: r1548806 -
/ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/LoadModule.java
Author: jlboudart
Date: Sat Dec 7 08:07:26 2013
New Revision: 1548806
URL: http://svn.apache.org/r1548806
Log:
IvyInfo should be invoked BEFORE loading plugins/buildtypes if a module.ivy is found
Modified:
ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/LoadModule.java
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/LoadModule.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/LoadModule.java?rev=1548806&r1=1548805&r2=1548806&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/LoadModule.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/LoadModule.java Sat Dec 7 08:07:26 2013
@@ -104,12 +104,21 @@ public class LoadModule extends Abstract
public void execute() throws BuildException {
if (buildModule != null && buildModule.exists()) {
+
// make sure it's not a directory (this falls into the ultra
// paranoid lets check everything category
if (buildModule.isDirectory()) {
throw new BuildException("What? buildModule: " + buildModule + " is a dir!");
}
+
+ IvyInfo info = new IvyInfo();
+ info.setFile(buildModule);
+ // Not sure we should bound IvyInfo to easyantIvyInstance
+ info.setSettingsRef(IvyInstanceHelper.buildEasyAntIvyReference(getProject()));
+ initTask(info).execute();
+ getProject().setName(getProject().getProperty("ivy.module"));
+
// load override buildFile before buildModule to allow target/extension-point
// override
File f = new File(buildModule.getParent(), EasyAntConstants.DEFAULT_OVERRIDE_BUILD_FILE);
@@ -120,13 +129,6 @@ public class LoadModule extends Abstract
log("Loading build module : " + buildModule.getAbsolutePath());
loadBuildModule(buildModule);
-
- IvyInfo info = new IvyInfo();
- info.setFile(buildModule);
- // Not sure we should bound IvyInfo to easyantIvyInstance
- info.setSettingsRef(IvyInstanceHelper.buildEasyAntIvyReference(getProject()));
- initTask(info).execute();
- getProject().setName(getProject().getProperty("ivy.module"));
}
if (buildFile != null && buildFile.exists()) {