[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/12] guix: ant-build-system: use abs path as basedir
From: |
Hartmut Goebel |
Subject: |
[PATCH 02/12] guix: ant-build-system: use abs path as basedir |
Date: |
Fri, 9 Sep 2016 16:51:02 +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
- [PATCH 00/12] Java build-system and some packages, Hartmut Goebel, 2016/09/09
- [PATCH 01/12] guix: ant-bulild-sytem: allow specifying the source directory., Hartmut Goebel, 2016/09/09
- [PATCH 02/12] guix: ant-build-system: use abs path as basedir,
Hartmut Goebel <=
- [PATCH 03/12] guix: Add java-utils., Hartmut Goebel, 2016/09/09
- [PATCH 04/12] gnu: Add java-plexus-utils., Hartmut Goebel, 2016/09/09
- [PATCH 05/12] gnu: Add java-plexus-interpolation., Hartmut Goebel, 2016/09/09
- [PATCH 06/12] gnu: Add java-commons-cli., Hartmut Goebel, 2016/09/09
- [PATCH 07/12] gnu: Add java-commons-codec., Hartmut Goebel, 2016/09/09
- [PATCH 08/12] gnu: Add java-commons-daemon., Hartmut Goebel, 2016/09/09
- [PATCH 09/12] gnu: Add java-commons-io., Hartmut Goebel, 2016/09/09
- [PATCH 10/12] gnu: Add java-commons-lang., Hartmut Goebel, 2016/09/09
- [PATCH 11/12] gnu: Add java-commons-lang3., Hartmut Goebel, 2016/09/09
- [PATCH 12/12] gnu: Add java-commons-bcel., Hartmut Goebel, 2016/09/09