commit: f01a3fc4702d1efa2ffe8e4f9ceb74aa6b67fb91 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Thu Sep 22 11:15:33 2022 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Oct 3 04:05:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f01a3fc4
java-pkg-simple.eclass: allow JAVA_MAIN_CLASS _and_ MANIFEST.MF The eclass did not handle JAVA_MAIN_CLASS if there was also a given META-INF/MANIFEST.MF. This change allows adding JAVA_AUTOMATIC_MODULE_NAME and/or JAVA_MAIN_CLASS to the MANIFEST.MF file if it exists or creates one if not. Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> eclass/java-pkg-simple.eclass | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 6f7324240e34..6e38a07f66e8 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -415,21 +415,22 @@ java-pkg-simple_src_compile() { fi # package + [[ ! -d ${classes}/META-INF ]] && mkdir ${classes}/META-INF + if [[ -v JAVA_AUTOMATIC_MODULE_NAME ]]; then + echo "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_NAME}" \ + >> ${classes}/META-INF/MANIFEST.MF || die "adding module name failed" + fi + if [[ -v JAVA_MAIN_CLASS ]]; then + echo "Main-Class: ${JAVA_MAIN_CLASS}" \ + >> ${classes}/META-INF/MANIFEST.MF || die "adding main class failed" + fi local jar_args if [[ -e ${classes}/META-INF/MANIFEST.MF ]]; then jar_args="cfm ${JAVA_JAR_FILENAME} ${classes}/META-INF/MANIFEST.MF" - elif [[ ${JAVA_MAIN_CLASS} ]]; then - jar_args="cfe ${JAVA_JAR_FILENAME} ${JAVA_MAIN_CLASS}" else jar_args="cf ${JAVA_JAR_FILENAME}" fi jar ${jar_args} -C ${classes} . || die "jar failed" - if [[ -v JAVA_AUTOMATIC_MODULE_NAME ]]; then - cat > "${T}/add-to-MANIFEST.MF" <<< "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_NAME}" \ - || die "add-to-MANIFEST.MF failed" - jar ufmv ${JAVA_JAR_FILENAME} "${T}/add-to-MANIFEST.MF" \ - || die "updating MANIFEST.MF failed" - fi } # @FUNCTION: java-pkg-simple_src_install