gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-04 04:57:07 -08:00
Code Issues Projects Releases Wiki Activity

java-utils-2.eclass: Remove eend calls. Remove javadoc_executable variable.

Browse Source 
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
This commit is contained in:
Patrice Clement
2015-10-20 20:58:06 +00:00
parent 5641866837
commit 1b7c8eabaf
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eclass/java-utils-2.eclass
+3 -7
View File
@@ -2049,7 +2049,6 @@ ejavac() {
ebegin "Compiling"
${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
eend $?
}
# @FUNCTION: ejavadoc
@@ -2060,8 +2059,6 @@ ejavac() {
ejavadoc() {
debug-print-function ${FUNCNAME} $*
# TODO: create a java-pkg_get-javadoc function
local javadoc_executable=javadoc
local javadoc_args=""
if java-pkg_is-vm-version-ge "1.8" ; then
@@ -2070,15 +2067,14 @@ ejavadoc() {
if [[ -n ${JAVA_PKG_DEBUG} ]]; then
einfo "Verbose logging for \"${FUNCNAME}\" function"
einfo "Javadoc executable: ${javadoc_executable}"
einfo "Javadoc executable: javadoc"
einfo "Extra arguments: ${javadoc_args}"
einfo "Complete command:"
einfo "${javadoc_executable} ${javadoc_args} ${@}"
einfo "javadoc ${javadoc_args} ${@}"
fi
ebegin "Generating JavaDoc"
${javadoc_executable} ${javadoc_args} "${@}" || die "ejavadoc failed"
eend $?
javadoc ${javadoc_args} "${@}" || die "ejavadoc failed"
}
# @FUNCTION: java-pkg_filter-compiler