You are viewing a plain text version of this content. The canonical link for it is here.
Posted to easyant-commits@incubator.apache.org by jl...@apache.org on 2012/08/04 21:14:41 UTC
svn commit: r1369438 - in
/incubator/easyant/core/trunk/src/main/java/org/apache/easyant:
core/EasyAntEngine.java core/ant/ProjectUtils.java tasks/SubModule.java
Author: jlboudart
Date: Sat Aug 4 21:14:41 2012
New Revision: 1369438
URL: http://svn.apache.org/viewvc?rev=1369438&view=rev
Log:
Don't create temporary file, use basedir reference instead (hack to emulate mainscript for ImportTask's check on size of projectHelper.getImportTask())
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/ProjectUtils.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.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=1369438&r1=1369437&r2=1369438&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 Sat Aug 4 21:14:41 2012
@@ -450,7 +450,7 @@ public class EasyAntEngine {
project.setUserProperty(EasyAntMagicNames.EASYANT_OFFLINE, Boolean.toString(configuration.isOffline()));
ProjectHelper helper = ProjectHelper.getProjectHelper();
- File mainscript = ProjectUtils.createMainScript();
+ File mainscript = ProjectUtils.emulateMainScript(project);
Location mainscriptLocation = new Location(mainscript.getAbsolutePath());
helper.getImportStack().addElement(mainscript);
project.addReference(ProjectHelper.PROJECTHELPER_REFERENCE, helper);
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java?rev=1369438&r1=1369437&r2=1369438&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java Sat Aug 4 21:14:41 2012
@@ -54,16 +54,8 @@ public class ProjectUtils {
*
* @return a temporary file acting as a mainscript
*/
- public static File createMainScript() {
- File mainscript = new File(EasyAntConstants.EASYANT_TASK_NAME);
- try {
- mainscript = File.createTempFile(
- EasyAntConstants.EASYANT_TASK_NAME, null);
- mainscript.deleteOnExit();
- } catch (IOException e1) {
- throw new BuildException("Can't create temp file", e1);
- }
- return mainscript;
+ public static File emulateMainScript(Project project) {
+ return project.getBaseDir();
}
/**
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java?rev=1369438&r1=1369437&r2=1369438&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java Sat Aug 4 21:14:41 2012
@@ -193,7 +193,7 @@ public class SubModule extends Task {
file.getAbsolutePath());
ProjectHelper helper = ProjectHelper.getProjectHelper();
- File mainscript = ProjectUtils.createMainScript();
+ File mainscript = ProjectUtils.emulateMainScript(getProject());
Location mainscriptLocation = new Location(mainscript.getAbsolutePath());
helper.getImportStack().addElement(mainscript);
subModule.addReference(ProjectHelper.PROJECTHELPER_REFERENCE, helper);