• [gentoo-dev] [PATCH] java-pkg-simple.eclass: Automatic-Module-Name

    From Volkmar W. Pogatzki@21:1/5 to All on Thu Jul 14 20:30:01 2022
    Closes: https://bugs.gentoo.org/857468
    Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
    ---
    eclass/java-pkg-simple.eclass | 11 +++++++++++
    1 file changed, 11 insertions(+)

    diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 1e101a828c4..9604b41ea38 100644
    --- a/eclass/java-pkg-simple.eclass
    +++ b/eclass/java-pkg-simple.eclass
    @@ -134,6 +134,11 @@ fi
    # JAVA_MAIN_CLASS="org.gentoo.java.ebuilder.Main"
    # @CODE

    +# @ECLASS_VARIABLE: JAVA_AUTOMATIC_MODULE_MANE
    +# @DEFAULT_UNSET
    +# @DESCRIPTION:
    +# The value of Automatic-Module-Name to be added to MANIFEST.MF
    +
    # @ECLASS_VARIABLE: JAVADOC_ARGS
    # @DEFAULT_UNSET
    # @DESCRIPTION:
    @@ -418,6 +423,12 @@ java-pkg-simple_src_compile() {
    jar_args="cf ${JAVA_JAR_FILENAME}"
    fi
    jar ${jar_args} -C ${classes} . || die "jar failed"
    + if [[ ${JAVA_AUTOMATIC_MODULE_MANE} ]]; then
    + cat > "${T}/add-to-MANIFEST.MF" <<< "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_MANE}" \
    + || die "add-to-MANIFEST.MF failed"
    + jar ufmv ${JAVA_JAR_FILENAME} "${T}/add-to-MANIFEST.MF" \
    + || die "updating MANIFES
  • From Thomas Bracht Laumann Jespersen@21:1/5 to All on Thu Jul 14 20:40:01 2022
    +# @ECLASS_VARIABLE: JAVA_AUTOMATIC_MODULE_MANE

    You probably want NAME, not MANE here :-)

    + if [[ ${JAVA_AUTOMATIC_MODULE_MANE} ]]; then
    + cat > "${T}/add-to-MANIFEST.MF" <<< "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_MANE}" \

    MANE -> NAME in three places.

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)