From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: 36695@debbugs.gnu.org
Subject: [bug#36695] [PATCH 3/3] guix: ant-build-system: Use absolute path as base-dir.
Date: Tue, 16 Jul 2019 22:10:20 +0200 [thread overview]
Message-ID: <20190716201020.3303-3-h.goebel@crazy-compilers.com> (raw)
In-Reply-To: <20190716201020.3303-1-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 | 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
next prev parent reply other threads:[~2019-07-16 20:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-16 20:08 [bug#36695] [PATCH 0/3] Enhancemante for the ant-build-system Hartmut Goebel
2019-07-16 20:10 ` [bug#36695] [PATCH 1/3] guix: ant-build-system: Use ant-task "jar" instead of executing "jar" Hartmut Goebel
2019-07-16 20:10 ` [bug#36695] [PATCH 2/3] guix: ant-build-system: Put dummy project-name into default build.xml Hartmut Goebel
2019-07-16 20:10 ` Hartmut Goebel [this message]
2019-07-17 8:17 ` [bug#36695] [PATCH 3/3] guix: ant-build-system: Use absolute path as base-dir Julien Lepiller
2019-07-19 10:43 ` Hartmut Goebel
2019-07-19 10:56 ` Julien Lepiller
2019-07-19 11:04 ` Hartmut Goebel
2019-07-19 10:57 ` Julien Lepiller
[not found] ` <handler.36695.B.156330772723013.ack@debbugs.gnu.org>
2019-07-25 8:26 ` bug#36695: [PATCH 0/3] Enhancemants for the ant-build-system 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=20190716201020.3303-3-h.goebel@crazy-compilers.com \
--to=h.goebel@crazy-compilers.com \
--cc=36695@debbugs.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).