Browse Source

-source is a javadoc option, not one of the standard doclet.

PR: 13747


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273524 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 22 years ago
parent
commit
aea9fac4c0
2 changed files with 9 additions and 9 deletions
  1. +2
    -0
      WHATSNEW
  2. +7
    -9
      src/main/org/apache/tools/ant/taskdefs/Javadoc.java

+ 2
- 0
WHATSNEW View File

@@ -45,6 +45,8 @@ Fixed bugs:
* <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:
--------------



+ 7
- 9
src/main/org/apache/tools/ant/taskdefs/Javadoc.java View File

@@ -1462,12 +1462,15 @@ public class Javadoc extends Task {

/**
* 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 @@ public class Javadoc extends Task {
}

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);
}
}



Loading…
Cancel
Save