From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:41945) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnf8V-00080r-9t for guix-patches@gnu.org; Wed, 17 Jul 2019 04:18:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnf8U-0001er-AN for guix-patches@gnu.org; Wed, 17 Jul 2019 04:18:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42660) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnf8U-0001ej-79 for guix-patches@gnu.org; Wed, 17 Jul 2019 04:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hnf8T-00063u-VI for guix-patches@gnu.org; Wed, 17 Jul 2019 04:18:02 -0400 Subject: [bug#36695] [PATCH 3/3] guix: ant-build-system: Use absolute path as base-dir. Resent-Message-ID: Date: Wed, 17 Jul 2019 10:17:06 +0200 In-Reply-To: <20190716201020.3303-3-h.goebel@crazy-compilers.com> References: <20190716201020.3303-1-h.goebel@crazy-compilers.com> <20190716201020.3303-3-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: Julien Lepiller Message-ID: <01413BEF-14AB-466F-8329-D81C0BB592FA@lepiller.eu> 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: Hartmut Goebel , 36695@debbugs.gnu.org Le 16 juillet 2019 22:10:20 GMT+02:00, Hartmut Goebel a =C3=A9crit : >This allows to chdir into some sub-project prior to building=2E > >* guix/build/ant-build-system=2Escm (default-build=2Exml): Add parameter= =2E > (configure): Pass current directory as base-dir to default-build=2Exml= =2E >--- > guix/build/ant-build-system=2Escm | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > >diff --git a/guix/build/ant-build-system=2Escm >b/guix/build/ant-build-system=2Escm >index 49549c1b4b=2E=2E3fe7808db5 100644 >--- a/guix/build/ant-build-system=2Escm >+++ b/guix/build/ant-build-system=2Escm >@@ -36,6 +36,7 @@ > ;; Code: >=20 > (define* (default-build=2Exml jar-name prefix #:optional >+ (base-dir "=2E") > (source-dir "=2E") (test-dir "=2E/test") (main-class #= f) > (test-include '("**/*Test=2Ejava")) > (test-exclude '("**/Abstract*Test=2Ejava"))) >@@ -43,7 +44,7 @@ > (call-with-output-file "build=2Exml" > (lambda (port) > (sxml->xml >- `(project (@ (basedir "=2E") >+ `(project (@ (basedir ,base-dir) > (name ,jar-name)) > (property (@ (name "classes=2Edir") > (value "${basedir}/build/classes"))) >@@ -162,6 +163,7 @@ to the default GNU unpack strategy=2E" > (default-build=2Exml 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)) I don't understand the point of that patch=2E I can already add a chdir ph= ase just after unpack to do just that=2E What does this patch give us? The other two patches lgtm, but I think they need to go to staging instead= of master, because they will cause a rebuild of every java package=2E