1 |
For adding Main-class and/or Automatic-module-name to MANIFEST.MF it |
2 |
seems better to use "jar" functionality at the end of compilation. |
3 |
This does the necessary checks and issues warnings in case of duplicate |
4 |
entries. |
5 |
|
6 |
Closes: https://bugs.gentoo.org/874924 |
7 |
Signed-off-by: Volkmar W. Pogatzki <gentoo@××××××××.net> |
8 |
--- |
9 |
eclass/java-pkg-simple.eclass | 21 ++++++++++++--------- |
10 |
1 file changed, 12 insertions(+), 9 deletions(-) |
11 |
|
12 |
diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass |
13 |
index 7a9582393dd..5f691571e53 100644 |
14 |
--- a/eclass/java-pkg-simple.eclass |
15 |
+++ b/eclass/java-pkg-simple.eclass |
16 |
@@ -415,15 +415,6 @@ java-pkg-simple_src_compile() { |
17 |
fi |
18 |
|
19 |
# package |
20 |
- [[ ! -d ${classes}/META-INF ]] && mkdir ${classes}/META-INF |
21 |
- if [[ -v JAVA_AUTOMATIC_MODULE_NAME ]]; then |
22 |
- echo "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_NAME}" \ |
23 |
- >> ${classes}/META-INF/MANIFEST.MF || die "adding module name failed" |
24 |
- fi |
25 |
- if [[ -v JAVA_MAIN_CLASS ]]; then |
26 |
- echo "Main-Class: ${JAVA_MAIN_CLASS}" \ |
27 |
- >> ${classes}/META-INF/MANIFEST.MF || die "adding main class failed" |
28 |
- fi |
29 |
local jar_args |
30 |
if [[ -e ${classes}/META-INF/MANIFEST.MF ]]; then |
31 |
jar_args="cfm ${JAVA_JAR_FILENAME} ${classes}/META-INF/MANIFEST.MF" |
32 |
@@ -431,6 +422,18 @@ java-pkg-simple_src_compile() { |
33 |
jar_args="cf ${JAVA_JAR_FILENAME}" |
34 |
fi |
35 |
jar ${jar_args} -C ${classes} . || die "jar failed" |
36 |
+ if [[ -v JAVA_AUTOMATIC_MODULE_NAME ]]; then |
37 |
+ echo "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_NAME}" \ |
38 |
+ >> "${T}/add-to-MANIFEST.MF" || die "adding module name failed" |
39 |
+ fi |
40 |
+ if [[ -v JAVA_MAIN_CLASS ]]; then |
41 |
+ echo "Main-Class: ${JAVA_MAIN_CLASS}" \ |
42 |
+ >> "${T}/add-to-MANIFEST.MF" || die "adding main class failed" |
43 |
+ fi |
44 |
+ if [[ -e ${T}/add-to-MANIFEST.MF ]]; then |
45 |
+ jar ufmv ${JAVA_JAR_FILENAME} "${T}/add-to-MANIFEST.MF" \ |
46 |
+ || die "updating MANIFEST.MF failed" |
47 |
+ fi |
48 |
} |
49 |
|
50 |
# @FUNCTION: java-pkg-simple_src_install |
51 |
-- |
52 |
2.35.1 |