From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:33217) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnTmy-0002FU-6Q for guix-patches@gnu.org; Tue, 16 Jul 2019 16:11:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnTmx-0001OK-6b for guix-patches@gnu.org; Tue, 16 Jul 2019 16:11:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42383) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnTmx-0001OA-2c for guix-patches@gnu.org; Tue, 16 Jul 2019 16:11:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hnTmw-00064L-HV for guix-patches@gnu.org; Tue, 16 Jul 2019 16:11:02 -0400 Subject: [bug#36695] [PATCH 1/3] guix: ant-build-system: Use ant-task "jar" instead of executing "jar". References: <20190716200839.3035-1-h.goebel@crazy-compilers.com> In-Reply-To: <20190716200839.3035-1-h.goebel@crazy-compilers.com> Resent-Message-ID: From: Hartmut Goebel Date: Tue, 16 Jul 2019 22:10:18 +0200 Message-Id: <20190716201020.3303-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36695@debbugs.gnu.org * guix/build/ant-build-system.scm (default-build.xml): Change XML for target "jar" to use ant-task "jar" instead of "exec". --- guix/build/ant-build-system.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index d79a2d55ed..a0dd6f0fb4 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -118,10 +118,9 @@ (target (@ (name "jar") (depends "compile, manifest")) (mkdir (@ (dir "${jar.dir}"))) - (exec (@ (executable "jar")) - (arg (@ (line ,(string-append "-cmf ${manifest.file} " - "${jar.dir}/" jar-name - " -C ${classes.dir} .")))))) + (jar (@ (destfile ,(string-append "${jar.dir}/" jar-name)) + (manifest "${manifest.file}") + (basedir "${classes.dir}")))) (target (@ (name "install")) (copy (@ (todir "${dist.dir}")) -- 2.21.0