[jboss-svn-commits] JBL Code SVN: r25777 - in labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task: module and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: pgier
Date: 2009-03-22 22:42:49 -0400 (Sun, 22 Mar 2009)
New Revision: 25777

Modified:
   labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Ant.java
   labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ExecuteModules.java
Log:
[JBBUILD-521] Don't look for build.xml if externalBuild setting is true.

Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Ant.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Ant.java	2009-03-22 19:55:58 UTC (rev 25776)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Ant.java	2009-03-23 02:42:49 UTC (rev 25777)
@@ -90,6 +90,8 @@
    protected boolean inheritAll = true;
    
    protected Project project;
+   
+   public static final String DEFAULT_ANT_BUILD_FILE = "build.xml";
 
    public void init() {
       project = new Project();
@@ -184,13 +186,13 @@
    public File getBuildFile() throws BuildException {
       String filename = antFile;
       if (filename == null) {
-         filename = "build.xml";
+         filename = DEFAULT_ANT_BUILD_FILE;
       }
       else {
          filename = ResolveProperties.subst(filename, getProject());
       }
 
-      File file = new File("build.xml");
+      File file = new File( filename );
       if (!file.isAbsolute()) {
          filename = (new File(dir, filename)).getAbsolutePath();
          file = new File(filename);
@@ -227,7 +229,7 @@
          }
 
          if (antFile == null) {
-            antFile = "build.xml";
+            antFile = DEFAULT_ANT_BUILD_FILE;
          }
          else {
             antFile = ResolveProperties.subst(antFile, getProject());

Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ExecuteModules.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ExecuteModules.java	2009-03-22 19:55:58 UTC (rev 25776)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ExecuteModules.java	2009-03-23 02:42:49 UTC (rev 25777)
@@ -317,7 +317,10 @@
       // see if this is a valid ant file
       try
       {
-         ant.getBuildFile();
+         if ( ! externalBuild ) 
+         {
+            ant.getBuildFile();
+         }
       }
       catch (BuildException e)
       {
@@ -336,7 +339,7 @@
          throw e;
       }
 
-      runHooks(beforeHooks);
+      runHooks( beforeHooks );
 
       ant.addBuildListener(listener);
 
@@ -402,16 +405,6 @@
          runner.run();
       }
 
-      // shit this sucks
-      // jason: this will not work in ant 1.5
-      // props.remove(moduleProperty);
-      // props.remove(targetProperty);
-
-      // iter = properties.iterator();
-      // while (iter.hasNext()) {
-      // Property a = (Property)iter.next();
-      // props.remove(a.getName());
-      // }
    }
 
    protected void printMessages(List messages)