Browse Source

do build.xml builds only for modules, not products, and continue normally if they fail.

tags/V_1_1_b2
wisberg 21 years ago
parent
commit
5a7bc25b4b
1 changed files with 15 additions and 6 deletions
  1. 15
    6
      build/src/org/aspectj/internal/tools/ant/taskdefs/BuildModule.java

+ 15
- 6
build/src/org/aspectj/internal/tools/ant/taskdefs/BuildModule.java View File

@@ -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(),

Loading…
Cancel
Save