[openjdk-8] 03/07: Disable doclint by default (patch imported from Fedora)

[Emmanuel Bourg]

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

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

commit fc7b97310bf20076c405593ab621f0bad2d5178d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Apr 1 14:38:37 2014 +0200

    Disable doclint by default (patch imported from Fedora)
---
 debian/patches/disable-doclint-by-default.patch | 26 +++++++++++++++++++++++++
 debian/rules                                    |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/disable-doclint-by-default.patch b/debian/patches/disable-doclint-by-default.patch
new file mode 100644
index 0000000..ff72f5c
--- /dev/null
+++ b/debian/patches/disable-doclint-by-default.patch
@@ -0,0 +1,26 @@
+Description: Disable doclint by default
+ OpenJDK 8 adds and enables doclint by default. This catches issues in
+ javadoc comments. It is too strict, breaks javadoc compilation and, in
+ general, breaks the build for old code known to build with previous
+ versions of OpenJDK.
+ .
+ See: http://blog.joda.org/2014/02/turning-off-doclint-in-jdk-8-javadoc.html
+ See: https://lists.fedoraproject.org/pipermail/java-devel/2014-February/005150.html
+Author: Andrew John Hughes <ahughes at redhat.com>
+Forwarded: no
+--- a/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
++++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
+@@ -811,10 +811,9 @@
+             doclintOpts.add(opt == null ? DocLint.XMSGS_OPTION : DocLint.XMSGS_CUSTOM_PREFIX + opt);
+         }
+ 
+-        if (doclintOpts.isEmpty()) {
+-            doclintOpts.add(DocLint.XMSGS_OPTION);
+-        } else if (doclintOpts.size() == 1
+-                && doclintOpts.get(0).equals(DocLint.XMSGS_CUSTOM_PREFIX + "none")) {
++        if (doclintOpts.isEmpty() ||
++	    (doclintOpts.size() == 1
++	     && doclintOpts.get(0).equals(DocLint.XMSGS_CUSTOM_PREFIX + "none"))) {
+             return;
+         }
+ 
diff --git a/debian/rules b/debian/rules
index f7aa7df..487c0a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -316,6 +316,7 @@ DISTRIBUTION_PATCHES += \
 	debian/patches/system-libjpeg.patch \
 	debian/patches/system-libpng.patch \
 	debian/patches/system-lcms.patch \
+	debian/patches/disable-doclint-by-default.patch \
 	debian/patches/ld-symbolic-functions-$(hotspot_version).diff \
 	debian/patches/shebang.diff \
 	debian/patches/jexec.diff \

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