peterreilly 2005/03/07 01:38:01
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
SubAnt.java
docs/manual/CoreTasks Tag: ANT_16_BRANCH subant.html
. Tag: ANT_16_BRANCH WHATSNEW CONTRIBUTORS
Log:
sync
Revision Changes Path
No revision
No revision
1.9.2.10 +27 -0 ant/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
Index: SubAnt.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/SubAnt.java,v
retrieving revision 1.9.2.9
retrieving revision 1.9.2.10
diff -u -r1.9.2.9 -r1.9.2.10
--- SubAnt.java 1 Dec 2004 14:04:36 -0000 1.9.2.9
+++ SubAnt.java 7 Mar 2005 09:38:00 -0000 1.9.2.10
@@ -65,6 +65,7 @@
private String target = null;
private String antfile = "build.xml";
private File genericantfile = null;
+ private boolean verbose = false;
private boolean inheritAll = false;
private boolean inheritRefs = false;
private boolean failOnError = true;
@@ -180,11 +181,16 @@
BuildException buildException = null;
for (int i = 0; i < count; ++i) {
File file = null;
+ String subdirPath = null;
Throwable thrownException = null;
try {
File directory = null;
file = new File(filenames[i]);
if (file.isDirectory()) {
+ if (verbose) {
+ subdirPath = file.getPath();
+ log("Entering directory: " + subdirPath + "\n",
Project.MSG_INFO);
+ }
if (genericantfile != null) {
directory = file;
file = genericantfile;
@@ -193,13 +199,22 @@
}
}
execute(file, directory);
+ if (verbose && subdirPath != null) {
+ log("Leaving directory: " + subdirPath + "\n",
Project.MSG_INFO);
+ }
} catch (RuntimeException ex) {
if (!(getProject().isKeepGoingMode())) {
+ if (verbose && subdirPath != null) {
+ log("Leaving directory: " + subdirPath + "\n",
Project.MSG_INFO);
+ }
throw ex; // throw further
}
thrownException = ex;
} catch (Throwable ex) {
if (!(getProject().isKeepGoingMode())) {
+ if (verbose && subdirPath != null) {
+ log("Leaving directory: " + subdirPath + "\n",
Project.MSG_INFO);
+ }
throw new BuildException(ex);
}
thrownException = ex;
@@ -223,6 +238,9 @@
new BuildException(thrownException);
}
}
+ if (verbose && subdirPath != null) {
+ log("Leaving directory: " + subdirPath + "\n",
Project.MSG_INFO);
+ }
}
}
// check if one of the builds failed in keep going mode
@@ -324,6 +342,15 @@
}
/**
+ * Enable/ disable verbose log messages showing when each sub-build path
is entered/ exited.
+ * The default value is "false".
+ * @param on true to enable verbose mode, false otherwise (default).
+ */
+ public void setVerbose(boolean on) {
+ this.verbose = on;
+ }
+
+ /**
* Corresponds to <code><ant></code>'s
* <code>output</code> attribute.
*
No revision
No revision
1.7.2.7 +18 -3 ant/docs/manual/CoreTasks/subant.html
Index: subant.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/subant.html,v
retrieving revision 1.7.2.6
retrieving revision 1.7.2.7
diff -u -r1.7.2.6 -r1.7.2.7
--- subant.html 19 Nov 2004 09:10:00 -0000 1.7.2.6
+++ subant.html 7 Mar 2005 09:38:00 -0000 1.7.2.7
@@ -129,7 +129,7 @@
<td bgcolor="#eeeeee" valign="top" align="left">
<font color="#000000" size="-1"
face="arial,helvetica,sanserif">String</font>
</td>
- <td bgcolor="#eeeeee" valign="top" align="left" rowspan="9">
+ <td bgcolor="#eeeeee" valign="top" align="left" rowspan="10">
<font color="#000000" size="-1"
face="arial,helvetica,sanserif">Optional</font>
</td>
</tr>
@@ -230,6 +230,21 @@
</td>
</tr>
+ <!-- Attribute -->
+ <tr>
+ <td bgcolor="#eeeeee" valign="top" align="left">
+ <font color="#000000" size="-1"
face="arial,helvetica,sanserif">verbose</font>
+ </td>
+ <td bgcolor="#eeeeee" valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+ Enable/ disable log messages showing when each sub-build path is
entered/ exited.
+ The default value is false.</font>
+ </td>
+ <td bgcolor="#eeeeee" valign="top" align="left">
+ <font color="#000000" size="-1"
face="arial,helvetica,sanserif">boolean</font>
+ </td>
+ </tr>
+
</table>
</blockquote></td></tr>
@@ -492,7 +507,7 @@
<tr>
<td>
<div align="center"><font color="#525D76" size="-1"><em>
- Copyright © 2000-2004, The Apache Software Foundation. All
Rights Reserved.
+ Copyright © 2000-2005, The Apache Software Foundation. All
Rights Reserved.
</em></font></div>
</td>
</tr>
@@ -500,4 +515,4 @@
</table>
</body>
-</html>
\ No newline at end of file
+</html>
No revision
No revision
1.503.2.187 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.186
retrieving revision 1.503.2.187
diff -u -r1.503.2.186 -r1.503.2.187
--- WHATSNEW 3 Mar 2005 17:49:07 -0000 1.503.2.186
+++ WHATSNEW 7 Mar 2005 09:38:00 -0000 1.503.2.187
@@ -104,6 +104,9 @@
* Added isfileselected condition.
+* Added verbose="true|false" attribute to <subant>. When verbose is enabled,
+ the directory name is logged on entry and exit of the sub-build. Bugzilla
33787.
+
Fixed bugs:
-----------
1.1.2.31 +2 -0 ant/CONTRIBUTORS
Index: CONTRIBUTORS
===================================================================
RCS file: /home/cvs/ant/CONTRIBUTORS,v
retrieving revision 1.1.2.30
retrieving revision 1.1.2.31
diff -u -r1.1.2.30 -r1.1.2.31
--- CONTRIBUTORS 11 Jan 2005 18:31:12 -0000 1.1.2.30
+++ CONTRIBUTORS 7 Mar 2005 09:38:00 -0000 1.1.2.31
@@ -33,6 +33,7 @@
Craeg Strong
Craig Cottingham
Craig R. McClanahan
+Craig Ryan
Curtis White
Cyrille Morvan
Dale Anson
@@ -63,6 +64,7 @@
Erik Meade
Ernst de Haan
Frederic Lavigne
+Frank Somers
Gary S. Weaver
Gautam Guliani
Gero Vermaas
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
