1 |
commit: 9982eb3cbf850fe6985fb29017f2161489cae07a |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 2 21:53:49 2019 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 2 21:53:49 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=9982eb3c |
7 |
|
8 |
replacing ebuild name and version with variables |
9 |
|
10 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
11 |
|
12 |
.../gentoo/java/ebuilder/maven/MavenEbuilder.java | 24 +++++++++++++++++----- |
13 |
1 file changed, 19 insertions(+), 5 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 ffb6e66..2194b80 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 |
@@ -226,6 +226,16 @@ public class MavenEbuilder { |
20 |
return result; |
21 |
} |
22 |
|
23 |
+ private String replaceWithVars(final String string, final Config config) { |
24 |
+ final String pString |
25 |
+ = config.getEbuildName() + '-' + config.getEbuildVersion(); |
26 |
+ |
27 |
+ return string. |
28 |
+ replace(pString, "${P}"). |
29 |
+ replace(config.getEbuildName(), "${PN}"). |
30 |
+ replace(config.getEbuildVersion(), "${PV}"); |
31 |
+ } |
32 |
+ |
33 |
/** |
34 |
* Writes command that was used to create skeleton of the ebuild. |
35 |
* |
36 |
@@ -551,7 +561,8 @@ public class MavenEbuilder { |
37 |
writer.println('"'); |
38 |
|
39 |
writer.print("SRC_URI=\""); |
40 |
- writer.print(config.getDownloadUri()); |
41 |
+ writer.print( |
42 |
+ replaceWithVars(config.getDownloadUri().toString(), config)); |
43 |
writer.println('"'); |
44 |
|
45 |
writer.print("LICENSE=\""); |
46 |
@@ -653,7 +664,9 @@ public class MavenEbuilder { |
47 |
writer.print(':'); |
48 |
} |
49 |
|
50 |
- writer.print(config.getWorkdir().relativize(resources)); |
51 |
+ writer.print(replaceWithVars( |
52 |
+ config.getWorkdir().relativize(resources).toString(), |
53 |
+ config)); |
54 |
} |
55 |
|
56 |
writer.println('"'); |
57 |
@@ -661,8 +674,8 @@ public class MavenEbuilder { |
58 |
|
59 |
if (mavenProject.hasTests()) { |
60 |
writer.print("JAVA_TEST_SRC_DIR=\""); |
61 |
- writer.print(config.getWorkdir().relativize( |
62 |
- mavenProject.getTestSourceDirectory())); |
63 |
+ writer.print(replaceWithVars(config.getWorkdir().relativize( |
64 |
+ mavenProject.getTestSourceDirectory()).toString(), config)); |
65 |
writer.println('"'); |
66 |
|
67 |
if (mavenProject.hasTestResources()) { |
68 |
@@ -678,7 +691,8 @@ public class MavenEbuilder { |
69 |
writer.print(':'); |
70 |
} |
71 |
|
72 |
- writer.print(config.getWorkdir().relativize(resources)); |
73 |
+ writer.print(replaceWithVars(config.getWorkdir(). |
74 |
+ relativize(resources).toString(), config)); |
75 |
} |
76 |
|
77 |
writer.println('"'); |