chewi 15/04/04 21:04:49
Modified: ChangeLog java-pkg-simple.eclass
java-utils-2.eclass
Log:
Add ejavadoc function. Thanks to wltjr. Fixes bug #544076.
Revision Changes Path
1.1584 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1584&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1584&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1583&r2=1.1584
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1583
retrieving revision 1.1584
diff -u -r1.1583 -r1.1584
--- ChangeLog 4 Apr 2015 20:33:05 -0000 1.1583
+++ ChangeLog 4 Apr 2015 21:04:49 -0000 1.1584
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1583 2015/04/04
20:33:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1584 2015/04/04
21:04:49 chewi Exp $
+
+ 04 Apr 2015; James Le Cuirot <[email protected]> java-utils-2.eclass,
+ java-pkg-simple.eclass:
+ Add ejavadoc function. Thanks to wltjr. Fixes bug #544076.
04 Apr 2015; Sergei Trofimovich <[email protected]> haskell-cabal.eclass:
Disable building dynamic libraris by default before-ghc-7.10 (was
1.5 eclass/java-pkg-simple.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-simple.eclass?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-simple.eclass?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-simple.eclass?r1=1.4&r2=1.5
Index: java-pkg-simple.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-pkg-simple.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- java-pkg-simple.eclass 19 Mar 2015 09:57:43 -0000 1.4
+++ java-pkg-simple.eclass 4 Apr 2015 21:04:49 -0000 1.5
@@ -4,7 +4,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-simple.eclass,v 1.4
2015/03/19 09:57:43 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-simple.eclass,v 1.5
2015/04/04 21:04:49 chewi Exp $
inherit java-utils-2
@@ -139,7 +139,7 @@
if has doc ${JAVA_PKG_IUSE} && use doc; then
mkdir -p ${apidoc}
java-pkg-simple_verbose-cmd \
- javadoc -d ${apidoc} \
+ ejavadoc -d ${apidoc} \
-encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset
UTF-8 \
${classpath:+-classpath ${classpath}} ${JAVADOC_ARGS:-
-quiet} \
@${sources} || die "javadoc failed"
1.157 eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.157&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.157&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.156&r2=1.157
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- java-utils-2.eclass 9 Apr 2014 21:55:12 -0000 1.156
+++ java-utils-2.eclass 4 Apr 2015 21:04:49 -0000 1.157
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.156
2014/04/09 21:55:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.157
2015/04/04 21:04:49 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -21,7 +21,7 @@
# This eclass should not be inherited this directly from an ebuild. Instead,
# you should inherit java-pkg-2 for Java packages or java-pkg-opt-2 for
packages
# that have optional Java support. In addition you can inherit java-ant-2 for
-# Ant-based packages.
+# Ant-based packages.
inherit eutils versionator multilib
IUSE="elibc_FreeBSD"
@@ -1808,7 +1808,7 @@
# Ant wrapper function. Will use the appropriate compiler, based on
user-defined
# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
# variables:
-#
+#
# @CODE
# Variables:
# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
@@ -1964,6 +1964,23 @@
${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
}
+# @FUNCTION: ejavadoc
+# @USAGE: <javadoc_arguments>
+# @DESCRIPTION:
+# javadoc wrapper function. Will set some flags based on the VM version
+# due to strict javadoc rules in 1.8.
+ejavadoc() {
+ debug-print-function ${FUNCNAME} $*
+
+ local javadoc_args=""
+
+ if java-pkg_is-vm-version-ge "1.8" ; then
+ javadoc_args="-Xdoclint:none"
+ fi
+
+ javadoc ${javadoc_args} "${@}" || die "ejavadoc failed"
+}
+
# @FUNCTION: java-pkg_filter-compiler
# @USAGE: <compiler(s)_to_filter>
# @DESCRIPTION:
