GNU bug report logs - #36605
[PATCH 0/2] Add pngquant

Previous Next

Full log

Message #53 received at 36605 <at> debbugs.gnu.org (full text, mbox):

From: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
To: 36605 <at> debbugs.gnu.org
Subject: [PATCH 02/12] guix: ant-build-system: use abs path as basedir
Date: Thu, 11 Jul 2019 22:26:24 +0200

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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.