From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/
Date: Sat, 2 Nov 2019 21:54:01 +0000 (UTC) [thread overview]
Message-ID: <1572731629.9982eb3cbf850fe6985fb29017f2161489cae07a.fordfrog@gentoo> (raw)
commit: 9982eb3cbf850fe6985fb29017f2161489cae07a
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 2 21:53:49 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Nov 2 21:53:49 2019 +0000
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=9982eb3c
replacing ebuild name and version with variables
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../gentoo/java/ebuilder/maven/MavenEbuilder.java | 24 +++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
index ffb6e66..2194b80 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
@@ -226,6 +226,16 @@ public class MavenEbuilder {
return result;
}
+ private String replaceWithVars(final String string, final Config config) {
+ final String pString
+ = config.getEbuildName() + '-' + config.getEbuildVersion();
+
+ return string.
+ replace(pString, "${P}").
+ replace(config.getEbuildName(), "${PN}").
+ replace(config.getEbuildVersion(), "${PV}");
+ }
+
/**
* Writes command that was used to create skeleton of the ebuild.
*
@@ -551,7 +561,8 @@ public class MavenEbuilder {
writer.println('"');
writer.print("SRC_URI=\"");
- writer.print(config.getDownloadUri());
+ writer.print(
+ replaceWithVars(config.getDownloadUri().toString(), config));
writer.println('"');
writer.print("LICENSE=\"");
@@ -653,7 +664,9 @@ public class MavenEbuilder {
writer.print(':');
}
- writer.print(config.getWorkdir().relativize(resources));
+ writer.print(replaceWithVars(
+ config.getWorkdir().relativize(resources).toString(),
+ config));
}
writer.println('"');
@@ -661,8 +674,8 @@ public class MavenEbuilder {
if (mavenProject.hasTests()) {
writer.print("JAVA_TEST_SRC_DIR=\"");
- writer.print(config.getWorkdir().relativize(
- mavenProject.getTestSourceDirectory()));
+ writer.print(replaceWithVars(config.getWorkdir().relativize(
+ mavenProject.getTestSourceDirectory()).toString(), config));
writer.println('"');
if (mavenProject.hasTestResources()) {
@@ -678,7 +691,8 @@ public class MavenEbuilder {
writer.print(':');
}
- writer.print(config.getWorkdir().relativize(resources));
+ writer.print(replaceWithVars(config.getWorkdir().
+ relativize(resources).toString(), config));
}
writer.println('"');
next reply other threads:[~2019-11-02 21:54 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-02 21:54 Miroslav Šulc [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-12-02 16:38 [gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/ Miroslav Šulc
2021-07-01 13:13 Miroslav Šulc
2021-06-15 7:40 Miroslav Šulc
2021-06-03 8:38 Miroslav Šulc
2020-10-02 7:43 Miroslav Šulc
2020-08-30 18:22 Miroslav Šulc
2020-08-30 18:22 Miroslav Šulc
2020-08-27 17:24 Miroslav Šulc
2020-08-27 17:24 Miroslav Šulc
2020-08-18 8:11 Miroslav Šulc
2020-08-18 8:11 Miroslav Šulc
2020-08-05 14:31 Miroslav Šulc
2020-08-05 14:31 Miroslav Šulc
2020-08-05 14:31 Miroslav Šulc
2020-08-05 14:31 Miroslav Šulc
2020-08-05 14:31 Miroslav Šulc
2020-08-05 14:31 Miroslav Šulc
2020-07-24 6:41 Miroslav Šulc
2020-07-24 6:41 Miroslav Šulc
2020-07-06 10:56 Miroslav Šulc
2020-07-06 10:56 Miroslav Šulc
2020-07-06 10:56 Miroslav Šulc
2020-07-06 10:56 Miroslav Šulc
2020-07-06 10:56 Miroslav Šulc
2019-11-27 9:50 Miroslav Šulc
2019-11-27 9:50 Miroslav Šulc
2019-11-03 15:14 Miroslav Šulc
2019-11-03 12:17 Miroslav Šulc
2019-11-03 12:17 Miroslav Šulc
2019-11-03 11:26 Miroslav Šulc
2019-11-03 10:37 Miroslav Šulc
2019-11-03 10:14 Miroslav Šulc
2019-11-03 10:12 Miroslav Šulc
2019-11-03 10:12 Miroslav Šulc
2019-11-02 22:27 Miroslav Šulc
2019-11-02 21:42 Miroslav Šulc
2019-11-02 21:42 Miroslav Šulc
2019-11-01 18:43 Miroslav Šulc
2019-11-01 18:43 Miroslav Šulc
2019-11-01 18:43 Miroslav Šulc
2019-11-01 18:43 Miroslav Šulc
2019-11-01 18:43 Miroslav Šulc
2019-10-30 17:43 Miroslav Šulc
2019-10-30 17:35 Michał Górny
2019-10-30 17:35 Michał Górny
2019-10-30 17:35 Michał Górny
2019-10-30 17:35 Michał Górny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1572731629.9982eb3cbf850fe6985fb29017f2161489cae07a.fordfrog@gentoo \
--to=fordfrog@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox