|
Lines 73-78
Link Here
|
| 73 |
private boolean inheritAll = false; |
73 |
private boolean inheritAll = false; |
| 74 |
private boolean inheritRefs = false; |
74 |
private boolean inheritRefs = false; |
| 75 |
private boolean failOnError = true; |
75 |
private boolean failOnError = true; |
|
|
76 |
private String errorProperty = null; |
| 76 |
private String output = null; |
77 |
private String output = null; |
| 77 |
|
78 |
|
| 78 |
private Vector properties = new Vector(); |
79 |
private Vector properties = new Vector(); |
|
Lines 288-293
Link Here
|
| 288 |
try { |
289 |
try { |
| 289 |
ant.execute(); |
290 |
ant.execute(); |
| 290 |
} catch (BuildException e) { |
291 |
} catch (BuildException e) { |
|
|
292 |
if (errorProperty != null) { |
| 293 |
getProject().setNewProperty(errorProperty, "true"); |
| 294 |
} |
| 291 |
if (failOnError) { |
295 |
if (failOnError) { |
| 292 |
throw e; |
296 |
throw e; |
| 293 |
} |
297 |
} |
|
Lines 295-300
Link Here
|
| 295 |
+ "' of: " + antfilename + "\n" |
299 |
+ "' of: " + antfilename + "\n" |
| 296 |
+ e.getMessage(), Project.MSG_WARN); |
300 |
+ e.getMessage(), Project.MSG_WARN); |
| 297 |
} catch (Throwable e) { |
301 |
} catch (Throwable e) { |
|
|
302 |
if (errorProperty != null) { |
| 303 |
getProject().setNewProperty(errorProperty, "true"); |
| 304 |
} |
| 298 |
if (failOnError) { |
305 |
if (failOnError) { |
| 299 |
throw new BuildException(e); |
306 |
throw new BuildException(e); |
| 300 |
} |
307 |
} |
|
Lines 343-348
Link Here
|
| 343 |
} |
350 |
} |
| 344 |
|
351 |
|
| 345 |
/** |
352 |
/** |
|
|
353 |
* Property to set to "true" if there is a error in a sub-build. |
| 354 |
* |
| 355 |
* @param propertyName the name of the property to set in the |
| 356 |
* event of an error. |
| 357 |
* |
| 358 |
* @since Ant 1.7? |
| 359 |
*/ |
| 360 |
public void setErrorProperty(String propertyName) { |
| 361 |
this.errorProperty = propertyName; |
| 362 |
} |
| 363 |
|
| 364 |
/** |
| 346 |
* The target to call on the different sub-builds. Set to "" to execute |
365 |
* The target to call on the different sub-builds. Set to "" to execute |
| 347 |
* the default target. |
366 |
* the default target. |
| 348 |
* @param target the target |
367 |
* @param target the target |