From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#36695] [PATCH 3/3] guix: ant-build-system: Use absolute path as base-dir. Resent-Message-ID: From: Hartmut Goebel Date: Tue, 16 Jul 2019 22:10:20 +0200 Message-Id: <20190716201020.3303-3-h.goebel@crazy-compilers.com> In-Reply-To: <20190716201020.3303-1-h.goebel@crazy-compilers.com> References: <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 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)) -- 2.21.0