Browse Source

-breakiterator has been promoted, PR 34580

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

+ 3
- 0
WHATSNEW View File

@@ -248,6 +248,9 @@ Other changes:

* <ssh> and <scp> support keyboard-interactive authentication now.

* <javadoc> now supports -breakiterator for custom doclets if Ant is
running on JSE 5.0 or higher. Bugzilla Report: 34580.

Changes from Ant 1.6.4 to Ant 1.6.5
===================================



+ 3
- 1
src/main/org/apache/tools/ant/taskdefs/Javadoc.java View File

@@ -1569,6 +1569,8 @@ public class Javadoc extends Task {
boolean javadoc4 =
!JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2) &&
!JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_3);
boolean javadoc5 = javadoc4 &&
!JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_4);

Vector packagesToDoc = new Vector();
Path sourceDirs = new Path(getProject());
@@ -1886,7 +1888,7 @@ public class Javadoc extends Task {
if (linksource && doclet == null) {
toExecute.createArgument().setValue("-linksource");
}
if (breakiterator && doclet == null) {
if (breakiterator && (doclet == null || javadoc5)) {
toExecute.createArgument().setValue("-breakiterator");
}
if (noqualifier != null && doclet == null) {


Loading…
Cancel
Save