From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: guix-devel@gnu.org
Subject: [PATCH 02/12] guix: ant-build-system: use abs path as basedir
Date: Fri, 9 Sep 2016 16:51:02 +0200 [thread overview]
Message-ID: <1473432672-21007-3-git-send-email-h.goebel@crazy-compilers.com> (raw)
In-Reply-To: <1473432672-21007-1-git-send-email-h.goebel@crazy-compilers.com>
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
next prev parent reply other threads:[~2016-09-09 14:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-09 14:51 [PATCH 00/12] Java build-system and some packages Hartmut Goebel
2016-09-09 14:51 ` [PATCH 01/12] guix: ant-bulild-sytem: allow specifying the source directory Hartmut Goebel
2016-09-09 14:51 ` Hartmut Goebel [this message]
2016-09-09 14:51 ` [PATCH 03/12] guix: Add java-utils Hartmut Goebel
2016-09-09 14:51 ` [PATCH 04/12] gnu: Add java-plexus-utils Hartmut Goebel
2016-09-09 14:51 ` [PATCH 05/12] gnu: Add java-plexus-interpolation Hartmut Goebel
2016-09-09 14:51 ` [PATCH 06/12] gnu: Add java-commons-cli Hartmut Goebel
2016-09-09 14:51 ` [PATCH 07/12] gnu: Add java-commons-codec Hartmut Goebel
2016-09-09 14:51 ` [PATCH 08/12] gnu: Add java-commons-daemon Hartmut Goebel
2016-09-09 14:51 ` [PATCH 09/12] gnu: Add java-commons-io Hartmut Goebel
2016-09-09 14:51 ` [PATCH 10/12] gnu: Add java-commons-lang Hartmut Goebel
2016-09-09 14:51 ` [PATCH 11/12] gnu: Add java-commons-lang3 Hartmut Goebel
2016-09-09 14:51 ` [PATCH 12/12] gnu: Add java-commons-bcel Hartmut Goebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1473432672-21007-3-git-send-email-h.goebel@crazy-compilers.com \
--to=h.goebel@crazy-compilers.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).