[ant] 15/16: Don't use the javadoc --ignore-source-errors option when using a custom doclet (Closes: #893547)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ant.

commit 34d8e87da94a2f643712e0a008d8030f67d73b87
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 29 09:33:06 2018 +0200

    Don't use the javadoc --ignore-source-errors option when using a custom doclet (Closes: #893547)
---
 debian/changelog                                       |  2 ++
 debian/patches/0013-auto-adjust-target.patch           |  7 +------
 debian/patches/0015-javadoc-ignore-source-errors.patch | 17 +++++++++++++++++
 debian/patches/series                                  |  1 +
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f3f8fa3..cc2ec8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ant (1.10.3-1) UNRELEASED; urgency=medium
     - Changed the source/target level to 1.8 when building Ant
     - Build the new optional ant-xz module
     - Require Java 8 or higher to run Ant
+  * Don't use the javadoc --ignore-source-errors option when using
+    a custom doclet (Closes: #893547)
   * Adjust the source/target level to 1.7 in anticipation of the 1.6 removal
     in Java 11
   * Added activation.jar to the build classpath to fix the empty ant-javamail
diff --git a/debian/patches/0013-auto-adjust-target.patch b/debian/patches/0013-auto-adjust-target.patch
index 48f70ab..b9f4dc8 100644
--- a/debian/patches/0013-auto-adjust-target.patch
+++ b/debian/patches/0013-auto-adjust-target.patch
@@ -39,17 +39,12 @@ Forwarded: no
          if (hasPath(src)) {
 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
 +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
-@@ -2174,7 +2174,12 @@
+@@ -2174,7 +2174,7 @@
              : getProject().getProperty(MagicNames.BUILD_JAVAC_SOURCE);
          if (sourceArg != null) {
              toExecute.createArgument().setValue("-source");
 -            toExecute.createArgument().setValue(sourceArg);
 +            toExecute.createArgument().setValue(LanguageLevel.adjust(sourceArg, "javadoc -source", this));
-+        }
-+
-+        if (LanguageLevel.isDebianBuild() && !LanguageLevel.isPreJava9()) {
-+            toExecute.createArgument().setValue("--ignore-source-errors");
-+            log("Debian build on Java >=9: Adding --ignore-source-errors.");
          }
  
          if (linksource && doclet == null) {
diff --git a/debian/patches/0015-javadoc-ignore-source-errors.patch b/debian/patches/0015-javadoc-ignore-source-errors.patch
new file mode 100644
index 0000000..e9259e4
--- /dev/null
+++ b/debian/patches/0015-javadoc-ignore-source-errors.patch
@@ -0,0 +1,17 @@
+Description: Ignore source errors when using the default doclet with Java 9
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
++++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+@@ -2177,6 +2177,11 @@
+             toExecute.createArgument().setValue(LanguageLevel.adjust(sourceArg, "javadoc -source", this));
+         }
+ 
++        if (doclet == null && LanguageLevel.isDebianBuild() && !LanguageLevel.isPreJava9()) {
++            toExecute.createArgument().setValue("--ignore-source-errors");
++            log("Debian build on Java 9+ detected: Adding the --ignore-source-errors option");
++        }
++
+         if (linksource && doclet == null) {
+             toExecute.createArgument().setValue("-linksource");
+         }
diff --git a/debian/patches/series b/debian/patches/series
index 95b89c4..549813c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,5 @@
 0010-reproducible-javadoc-task.patch
 0011-reproducible-propertyfile-task.patch
 0013-auto-adjust-target.patch
+0015-javadoc-ignore-source-errors.patch
 0014-remove-java-activation-module.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ant.git