From 5a7bc25b4b40774f99915448efdcc2adab626a4e Mon Sep 17 00:00:00 2001
From: wisberg <wisberg>
Date: Wed, 18 Dec 2002 19:44:26 +0000
Subject: [PATCH] do build.xml builds only for modules, not products, and
 continue normally if they fail.

---
 .../tools/ant/taskdefs/BuildModule.java       | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/BuildModule.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/BuildModule.java
index a0f56f1d6..5853559c9 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/BuildModule.java
+++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/BuildModule.java
@@ -121,12 +121,21 @@ public class BuildModule extends Task { // quickie hack...
         final boolean failonerror = buildSpec.failonerror;
         Builder builder = null;
         try  {
-            File buildScript = new File(buildSpec.moduleDir, "build.xml");  // XXXFileLiteral
-            if (buildScript.canRead()) {
-                if (!buildByScript(buildSpec, buildScript)) {
-                    log("unable to build " + buildSpec + " using script: " + buildScript);
-                }
-            } else {
+			// try using script first if not a product
+            boolean built = false;
+			if (null == buildSpec.productDir) { 
+	            File buildScript = new File(buildSpec.moduleDir, "build.xml");  // XXXFileLiteral
+	            if (buildScript.canRead()) {
+	                built = buildByScript(buildSpec, buildScript);
+	                if (!built) {
+	                    log("unable to build " 
+	                    	+ buildSpec 
+	                    	+ " using script: " 
+	                    	+ buildScript.getAbsolutePath());
+	                }
+	            } 
+			}
+            if (!built) {
                 builder = AntBuilder.getBuilder(
                     buildSpec.buildConfig, 
                     getProject(), 
-- 
2.39.5