From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:33012) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffn-0005o0-Hx for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlffl-00066n-RV for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58175) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlffi-00062K-Cm for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlffi-0006zB-7X for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:06 -0400 Subject: [bug#36605] [PATCH 02/12] guix: ant-build-system: use abs path as basedir Resent-Message-ID: From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:24 +0200 Message-Id: <20190711202644.32014-16-h.goebel@crazy-compilers.com> In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-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: 36605@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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index 651150d..f28182a 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -35,12 +35,12 @@ ;; ;; Code: -(define (default-build.xml src-dir jar-name prefix) +(define (default-build.xml base-dir src-dir jar-name prefix) "Create a simple build.xml with standard targets for Ant." (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"))) @@ -102,7 +102,7 @@ to the default GNU unpack strategy." (define* (configure #:key inputs outputs (jar-name #f) (src-dir "src") #:allow-other-keys) (when jar-name - (default-build.xml src-dir jar-name + (default-build.xml (getcwd) src-dir jar-name (string-append (assoc-ref outputs "out") "/share/java"))) (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) -- 2.7.4