diff options
| author | wisberg <wisberg> | 2002-12-18 19:44:26 +0000 |
|---|---|---|
| committer | wisberg <wisberg> | 2002-12-18 19:44:26 +0000 |
| commit | 5a7bc25b4b40774f99915448efdcc2adab626a4e (patch) | |
| tree | d995f672b998463eced163d86ec849f90df28cf8 /build | |
| parent | a70485b9dcb5d8be91a4bb2437e41502841835f6 (diff) | |
| download | aspectj-5a7bc25b4b40774f99915448efdcc2adab626a4e.tar.gz aspectj-5a7bc25b4b40774f99915448efdcc2adab626a4e.zip | |
do build.xml builds only for modules, not products, and continue normally if they fail.
Diffstat (limited to 'build')
| -rw-r--r-- | build/src/org/aspectj/internal/tools/ant/taskdefs/BuildModule.java | 21 |
1 files 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(), |