bodewig 2002/11/08 08:07:55
Modified: . WHATSNEW
src/main/org/apache/tools/ant/taskdefs Javadoc.java
Log:
-source is a javadoc option, not one of the standard doclet.
PR: 13747
Revision Changes Path
1.315 +2 -0 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- WHATSNEW 8 Nov 2002 15:40:54 -0000 1.314
+++ WHATSNEW 8 Nov 2002 16:07:55 -0000 1.315
@@ -45,6 +45,8 @@
* <concat> would cause an exception if a <filelist> pointed to files
that do not exist.
+* <javadoc> will now pass -source to custom doclets as well.
+
Other changes:
--------------
1.104 +7 -9
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- Javadoc.java 31 Oct 2002 15:12:51 -0000 1.103
+++ Javadoc.java 8 Nov 2002 16:07:55 -0000 1.104
@@ -1462,12 +1462,15 @@
/**
* Enables the -source switch, will be ignored if javadoc is not
- * the 1.4 version or a different doclet than the standard doclet
- * is used.
+ * the 1.4 version.
*
* @since Ant 1.5
*/
public void setSource(String source) {
+ if (!javadoc4) {
+ log ("-source option not supported on JavaDoc < 1.4",
+ Project.MSG_VERBOSE);
+ }
this.source = source;
}
@@ -1751,13 +1754,8 @@
}
if (source != null) {
- if (doclet != null) {
- log("ignoring source option for custom doclet",
- Project.MSG_WARN);
- } else {
- toExecute.createArgument().setValue("-source");
- toExecute.createArgument().setValue(source);
- }
+ toExecute.createArgument().setValue("-source");
+ toExecute.createArgument().setValue(source);
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
