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: Fri, 24 Jul 2020 06:41:31 +0000 (UTC) [thread overview]
Message-ID: <1595160745.2079ef593386ada75e3afc6750e11a2165896569.fordfrog@gentoo> (raw)
commit: 2079ef593386ada75e3afc6750e11a2165896569
Author: zongyu <zzy2529420793 <AT> gmail <DOT> com>
AuthorDate: Sun Jul 19 12:12:25 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 12:12:25 2020 +0000
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=2079ef59
rename source code file to ${P}-sources.[extension]
Signed-off-by: zongyu <zzy2529420793 <AT> gmail.com>
src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java | 6 +++---
1 file changed, 3 insertions(+), 3 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 da3a01b..38a8bf8 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
@@ -31,7 +31,7 @@ public class MavenEbuilder {
* Pattern for checking whether download tarball name matches expected name.
*/
private static final Pattern PATTERN_TARBALL_NAME
- = Pattern.compile("^.*/\\$\\{P\\}((?:\\.tar)\\.\\S+|(?:\\.jar))$");
+ = Pattern.compile("^.*/\\$\\{P\\}-sources.((?:\\.tar)\\.\\S+|(?:\\.jar))$");
/**
* Generates ebuild from the collected information at the specified path.
@@ -232,7 +232,7 @@ public class MavenEbuilder {
return srcUri;
}
- return srcUri + " -> " + "${P}" + matcher.group(1);
+ return srcUri + " -> " + "${P}-sources" + matcher.group(1);
}
/**
@@ -876,7 +876,7 @@ public class MavenEbuilder {
writer.println();
writer.println("src_unpack() {");
writer.println("\tmkdir -p ${S}/${JAVA_SRC_DIR}");
- writer.println("\tunzip ${DISTDIR}/${P}.jar -d ${S}/${JAVA_SRC_DIR} || die");
+ writer.println("\tunzip ${DISTDIR}/${P}-sources.jar -d ${S}/${JAVA_SRC_DIR} || die");
if (mavenProject.hasTests()) {
writer.println("\tmkdir -p ${JAVA_TEST_SRC_DIR}");
next reply other threads:[~2020-07-24 6:41 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-24 6:41 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-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:54 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=1595160745.2079ef593386ada75e3afc6750e11a2165896569.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