From patchwork Tue Jul 16 20:10:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 14692 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0669117233; Tue, 16 Jul 2019 21:11:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C7E9217231 for ; Tue, 16 Jul 2019 21:11:08 +0100 (BST) Received: from localhost ([::1]:52098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnTn1-0002Fz-Ky for patchwork@mira.cbaines.net; Tue, 16 Jul 2019 16:11:07 -0400 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 X-Loop: help-debbugs@gnu.org 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-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Jul 2019 20:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36695 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36695@debbugs.gnu.org Received: via spool by 36695-submit@debbugs.gnu.org id=B36695.156330782423239 (code B ref 36695); Tue, 16 Jul 2019 20:11:02 +0000 Received: (at 36695) by debbugs.gnu.org; 16 Jul 2019 20:10:24 +0000 Received: from localhost ([127.0.0.1]:51199 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hnTmK-00062k-H0 for submit@debbugs.gnu.org; Tue, 16 Jul 2019 16:10:24 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:60262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hnTmJ-00062c-FH for 36695@debbugs.gnu.org; Tue, 16 Jul 2019 16:10:23 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45pBMy2rbKz1rJCR for <36695@debbugs.gnu.org>; Tue, 16 Jul 2019 22:10:22 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45pBMy1BQKz1qsvW for <36695@debbugs.gnu.org>; Tue, 16 Jul 2019 22:10:22 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id ONqmBxWB1XGT for <36695@debbugs.gnu.org>; Tue, 16 Jul 2019 22:10:20 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-49-35.dynamic.mnet-online.de [188.174.49.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36695@debbugs.gnu.org>; Tue, 16 Jul 2019 22:10:20 +0200 (CEST) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id 6BFAC6013B for <36695@debbugs.gnu.org>; Tue, 16 Jul 2019 22:10:24 +0200 (CEST) From: Hartmut Goebel Date: Tue, 16 Jul 2019 22:10:18 +0200 Message-Id: <20190716201020.3303-1-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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}")) From patchwork Tue Jul 16 20:10:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 14691 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A559317233; Tue, 16 Jul 2019 21:11:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7179917231 for ; Tue, 16 Jul 2019 21:11:08 +0100 (BST) Received: from localhost ([::1]:52102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnTn2-0002IN-2F for patchwork@mira.cbaines.net; Tue, 16 Jul 2019 16:11:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33231) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnTmy-0002FV-Tn 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-0001P3-UT for guix-patches@gnu.org; Tue, 16 Jul 2019 16:11:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42384) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnTmx-0001Oe-Lm 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 1hnTmx-00064S-E8 for guix-patches@gnu.org; Tue, 16 Jul 2019 16:11:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36695] [PATCH 2/3] guix: ant-build-system: Put dummy project-name into default build.xml. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Jul 2019 20:11:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36695 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36695@debbugs.gnu.org Received: via spool by 36695-submit@debbugs.gnu.org id=B36695.156330782823261 (code B ref 36695); Tue, 16 Jul 2019 20:11:03 +0000 Received: (at 36695) by debbugs.gnu.org; 16 Jul 2019 20:10:28 +0000 Received: from localhost ([127.0.0.1]:51202 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hnTmN-000635-OZ for submit@debbugs.gnu.org; Tue, 16 Jul 2019 16:10:27 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:42465) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hnTmK-00062j-Cr for 36695@debbugs.gnu.org; Tue, 16 Jul 2019 16:10:24 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45pBMz73B9z1rTYM for <36695@debbugs.gnu.org>; Tue, 16 Jul 2019 22:10:23 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45pBMz4G6xz1qsvT for <36695@debbugs.gnu.org>; Tue, 16 Jul 2019 22:10:23 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id jpO_lkidwgbc for <36695@debbugs.gnu.org>; Tue, 16 Jul 2019 22:10:22 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-49-35.dynamic.mnet-online.de [188.174.49.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36695@debbugs.gnu.org>; Tue, 16 Jul 2019 22:10:22 +0200 (CEST) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id 9627C601F4 for <36695@debbugs.gnu.org>; Tue, 16 Jul 2019 22:10:24 +0200 (CEST) From: Hartmut Goebel Date: Tue, 16 Jul 2019 22:10:19 +0200 Message-Id: <20190716201020.3303-2-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190716201020.3303-1-h.goebel@crazy-compilers.com> References: <20190716201020.3303-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Without this, ant reported error messages like Target "tests" does not exist in the project "null". Simple using the jar-name is a good compromise. * guix/build/ant-build-system.scm (default-build.xml): Add attribute to sxml expression. --- guix/build/ant-build-system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index a0dd6f0fb4..49549c1b4b 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -43,7 +43,8 @@ (call-with-output-file "build.xml" (lambda (port) (sxml->xml - `(project (@ (basedir ".")) + `(project (@ (basedir ".") + (name ,jar-name)) (property (@ (name "classes.dir") (value "${basedir}/build/classes"))) (property (@ (name "manifest.dir") From patchwork Tue Jul 16 20:10:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 14693 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 54B6817233; Tue, 16 Jul 2019 21:11:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 19D8317231 for ; Tue, 16 Jul 2019 21:11:10 +0100 (BST) Received: from localhost ([::1]:52104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnTn3-0002Mw-PT for patchwork@mira.cbaines.net; Tue, 16 Jul 2019 16:11:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33236) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnTmz-0002Fb-7L for guix-patches@gnu.org; Tue, 16 Jul 2019 16:11:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnTmy-0001Pd-9P for guix-patches@gnu.org; Tue, 16 Jul 2019 16:11:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42385) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnTmy-0001PP-5h for guix-patches@gnu.org; Tue, 16 Jul 2019 16:11:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hnTmx-00064a-WC for guix-patches@gnu.org; Tue, 16 Jul 2019 16:11:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36695] [PATCH 3/3] guix: ant-build-system: Use absolute path as base-dir. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Jul 2019 20:11:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36695 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36695@debbugs.gnu.org Received: via spool by 36695-submit@debbugs.gnu.org id=B36695.156330782923268 (code B ref 36695); Tue, 16 Jul 2019 20:11:03 +0000 Received: (at 36695) by debbugs.gnu.org; 16 Jul 2019 20:10:29 +0000 Received: from localhost ([127.0.0.1]:51204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hnTmO-000638-Vw for submit@debbugs.gnu.org; Tue, 16 Jul 2019 16:10:29 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:59211) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hnTmL-00062x-Bl for 36695@debbugs.gnu.org; Tue, 16 Jul 2019 16:10:25 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45pBN06nwDz1rTYs for <36695@debbugs.gnu.org>; Tue, 16 Jul 2019 22:10:24 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45pBN06cLfz1qsvT for <36695@debbugs.gnu.org>; Tue, 16 Jul 2019 22:10:24 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 9u9bDgsZoTLj for <36695@debbugs.gnu.org>; Tue, 16 Jul 2019 22:10:24 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-49-35.dynamic.mnet-online.de [188.174.49.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36695@debbugs.gnu.org>; Tue, 16 Jul 2019 22:10:24 +0200 (CEST) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id B6758603A0 for <36695@debbugs.gnu.org>; Tue, 16 Jul 2019 22:10:24 +0200 (CEST) From: Hartmut Goebel Date: Tue, 16 Jul 2019 22:10:20 +0200 Message-Id: <20190716201020.3303-3-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190716201020.3303-1-h.goebel@crazy-compilers.com> References: <20190716201020.3303-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This allows to chdir into some sub-project prior to building. * guix/build/ant-build-system.scm (default-build.xml): Add parameter. (configure): Pass current directory as base-dir to default-build.xml. --- guix/build/ant-build-system.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index 49549c1b4b..3fe7808db5 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -36,6 +36,7 @@ ;; Code: (define* (default-build.xml jar-name prefix #:optional + (base-dir ".") (source-dir ".") (test-dir "./test") (main-class #f) (test-include '("**/*Test.java")) (test-exclude '("**/Abstract*Test.java"))) @@ -43,7 +44,7 @@ (call-with-output-file "build.xml" (lambda (port) (sxml->xml - `(project (@ (basedir ".") + `(project (@ (basedir ,base-dir) (name ,jar-name)) (property (@ (name "classes.dir") (value "${basedir}/build/classes"))) @@ -162,6 +163,7 @@ to the default GNU unpack strategy." (default-build.xml jar-name (string-append (assoc-ref outputs "out") "/share/java") + (getcwd) source-dir test-dir main-class test-include test-exclude)) (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) (setenv "CLASSPATH" (generate-classpath inputs))