1 |
commit: 22348c9c8ef160aab32ed4231cd45279ec56cdd2 |
2 |
Author: zongyu <zzy2529420793 <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Aug 3 02:37:54 2020 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 3 02:40:52 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=22348c9c |
7 |
|
8 |
add default{Desciption,Homepage} |
9 |
|
10 |
Signed-off-by: zongyu <zzy2529420793 <AT> gmail.com> |
11 |
|
12 |
.../gentoo/java/ebuilder/maven/MavenEbuilder.java | 33 ++++++++++++++++------ |
13 |
1 file changed, 25 insertions(+), 8 deletions(-) |
14 |
|
15 |
diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java |
16 |
index 646fc13..1fde760 100644 |
17 |
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java |
18 |
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java |
19 |
@@ -18,6 +18,17 @@ import org.gentoo.java.ebuilder.Config; |
20 |
*/ |
21 |
public class MavenEbuilder { |
22 |
|
23 |
+ /** |
24 |
+ * The fallback description if no description is found in pom.xml. |
25 |
+ */ |
26 |
+ private static final String defaultDescription = "${MAVEN_ID}"; |
27 |
+ |
28 |
+ /** |
29 |
+ * The fallback homepage if no homepage is found in pom.xml. |
30 |
+ */ |
31 |
+ private static final String defaultHomepage |
32 |
+ = "https://wiki.gentoo.org/wiki/No_homepage"; |
33 |
+ |
34 |
/** |
35 |
* EAPI version. |
36 |
*/ |
37 |
@@ -694,10 +705,22 @@ public class MavenEbuilder { |
38 |
final MavenProject mavenProject, final PrintWriter writer) { |
39 |
writer.println(); |
40 |
|
41 |
+ // write MAVEN_ID ahead of DESCRIPTION, |
42 |
+ // becase defaultDescription need ${MAVEN_ID} |
43 |
+ writer.print("MAVEN_ID=\""); |
44 |
+ writer.print(mavenProject.getGroupId()); |
45 |
+ writer.print(':'); |
46 |
+ writer.print(mavenProject.getArtifactId()); |
47 |
+ writer.print(':'); |
48 |
+ writer.print(mavenProject.getVersion()); |
49 |
+ writer.println('"'); |
50 |
+ |
51 |
writer.print("DESCRIPTION=\""); |
52 |
|
53 |
if (mavenProject.getDescription() != null) { |
54 |
writer.print(mavenProject.getDescription().replace("\"", "\\\"")); |
55 |
+ } else { |
56 |
+ writer.print(defaultDescription); |
57 |
} |
58 |
|
59 |
writer.println('"'); |
60 |
@@ -706,6 +729,8 @@ public class MavenEbuilder { |
61 |
|
62 |
if (mavenProject.getHomepage() != null) { |
63 |
writer.print(mavenProject.getHomepage()); |
64 |
+ } else { |
65 |
+ writer.print(defaultHomepage); |
66 |
} |
67 |
|
68 |
writer.println('"'); |
69 |
@@ -736,14 +761,6 @@ public class MavenEbuilder { |
70 |
writer.print("KEYWORDS=\""); |
71 |
writer.print(config.getKeywords()); |
72 |
writer.println('"'); |
73 |
- |
74 |
- writer.print("MAVEN_ID=\""); |
75 |
- writer.print(mavenProject.getGroupId()); |
76 |
- writer.print(':'); |
77 |
- writer.print(mavenProject.getArtifactId()); |
78 |
- writer.print(':'); |
79 |
- writer.print(mavenProject.getVersion()); |
80 |
- writer.println('"'); |
81 |
} |
82 |
|
83 |
/** |