diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2015-10-20 20:58:06 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2015-10-20 20:58:06 +0000 |
| commit | 1b7c8eabafac7b25cd4de87fd307bb9a3dba05bf (patch) | |
| tree | 173939055dafae316abe868a2bc09ebc18f37353 /eclass/java-utils-2.eclass | |
| parent | java-utils-2.eclass: Also improve java-pkg_do{javadoc,jar,src} logging. (diff) | |
| download | gentoo-1b7c8eabafac7b25cd4de87fd307bb9a3dba05bf.tar.gz gentoo-1b7c8eabafac7b25cd4de87fd307bb9a3dba05bf.tar.bz2 gentoo-1b7c8eabafac7b25cd4de87fd307bb9a3dba05bf.zip | |
java-utils-2.eclass: Remove eend calls. Remove javadoc_executable variable.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'eclass/java-utils-2.eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 15e4db05992f..deab51da4a8c 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -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 |