From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E35F7138359 for ; Fri, 24 Jul 2020 06:41:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24B3AE0826; Fri, 24 Jul 2020 06:41:34 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0F9EAE0826 for ; Fri, 24 Jul 2020 06:41:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 21DE634F1A2 for ; Fri, 24 Jul 2020 06:41:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 900372EC for ; Fri, 24 Jul 2020 06:41:31 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1595160745.2079ef593386ada75e3afc6750e11a2165896569.fordfrog@gentoo> Subject: [gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/ X-VCS-Repository: proj/java-ebuilder X-VCS-Files: src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java X-VCS-Directories: src/main/java/org/gentoo/java/ebuilder/maven/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 2079ef593386ada75e3afc6750e11a2165896569 X-VCS-Branch: master Date: Fri, 24 Jul 2020 06:41:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 685bd01b-64ce-463a-9c53-bf5b89a77814 X-Archives-Hash: 57f495daf8566242455a9563ccfff899 commit: 2079ef593386ada75e3afc6750e11a2165896569 Author: zongyu gmail com> AuthorDate: Sun Jul 19 12:12:25 2020 +0000 Commit: Miroslav Šulc gentoo 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 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}");