onkelbeh
/
GentooRepository
mirror of https://github.com/gentoo-mirror/gentoo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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@pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
Volkmar W. Pogatzki 2022-09-22 13:15:33 +02:00 committed by Miroslav Šulc
parent 0a2ba88a44
commit f01a3fc470
No known key found for this signature in database
GPG Key ID: 65D0F770B26B469C
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
eclass/java-pkg-simple.eclass
View File

@ -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