[gentoo-commits] repo/gentoo:master commit in: eclass/

[Patrice Clement]

commit:     564186683734ca85f9e4c685919a407c76151e91
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 14:33:56 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 14:33:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56418668

java-utils-2.eclass: Also improve java-pkg_do{javadoc,jar,src} logging.

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 eclass/java-utils-2.eclass | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 8914f95..15e4db0 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -364,6 +364,15 @@ java-pkg_dojar() {
                fi
        done
 
+       # Extra logging if enabled.
+       if [[ -n ${JAVA_PKG_DEBUG} ]]; then
+               einfo "Verbose logging for \"${FUNCNAME}\" function"
+               einfo "Jar file(s) destination: ${JAVA_PKG_JARDEST}"
+               einfo "Jar file(s) created: ${@}"
+               einfo "Complete command:"
+               einfo "${FUNCNAME} ${@}"
+       fi
+
        java-pkg_do_write_
 }
 
@@ -642,7 +651,6 @@ java-pkg_dojavadoc() {
        fi
 
        # Actual installation
-
        java-pkg_dohtml -r "${dir_to_install}"
 
        # Let's make a symlink to the directory we have everything else under
@@ -652,6 +660,15 @@ java-pkg_dojavadoc() {
                debug-print "symlinking ${dest}/{api,${symlink}}"
                dosym ${dest}/{api,${symlink}} || die
        fi
+
+       # Extra logging if enabled.
+       if [[ -n ${JAVA_PKG_DEBUG} ]]; then
+               einfo "Verbose logging for \"${FUNCNAME}\" function"
+               einfo "Documentation destination: ${dest}"
+               einfo "Directory to install: ${dir_to_install}"
+               einfo "Complete command:"
+               einfo "${FUNCNAME} ${@}"
+       fi
 }
 
 # @FUNCTION: java-pkg_dosrc
@@ -711,6 +728,17 @@ java-pkg_dosrc() {
                doins ${zip_path} || die "Failed to install source"
 
        JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}"
+
+       # Extra logging if enabled.
+       if [[ -n ${JAVA_PKG_DEBUG} ]]; then
+               einfo "Verbose logging for \"${FUNCNAME}\" function"
+               einfo "Zip filename created: ${zip_name}"
+               einfo "Zip file destination: ${JAVA_PKG_SOURCESPATH}"
+               einfo "Directories zipped: ${@}"
+               einfo "Complete command:"
+               einfo "${FUNCNAME} ${@}"
+       fi
+
        java-pkg_do_write_
 }