[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36605] [PATCH 01/12] guix: ant-bulild-sytem: allow specifying the s
From: |
Hartmut Goebel |
Subject: |
[bug#36605] [PATCH 01/12] guix: ant-bulild-sytem: allow specifying the source directory. |
Date: |
Thu, 11 Jul 2019 22:26:23 +0200 |
* guix/build-system/ant.scm (ant-build) Add parameter src-dir.
* guix/build/ant-build-system.scm (default-build.xml): New parameter src-dir.
(configure): pass src-dir on to default-build.xml.
* doc/guix.texi (Build Systems): Add description.
---
doc/guix.texi | 3 ++-
guix/build-system/ant.scm | 2 ++
guix/build/ant-build-system.scm | 8 ++++----
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index b6ca34a..19c70ad 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -2956,7 +2956,8 @@ parameters, respectively.
When the original package does not provide a suitable Ant build file,
the parameter @code{#:jar-name} can be used to generate a minimal Ant
build file @file{build.xml} with tasks to build the specified jar
-archive.
+archive. In this case the parameter @code{#:src-dir} can be used to
+specify the source sub-directory, defaulting to ``src''.
The parameter @code{#:build-target} can be used to specify the Ant task
that should be run during the @code{build} phase. By default the
diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm
index 550f92b..cd544ad 100644
--- a/guix/build-system/ant.scm
+++ b/guix/build-system/ant.scm
@@ -98,6 +98,7 @@
(make-flags ''())
(build-target "jar")
(jar-name #f)
+ (src-dir "src")
(phases '(@ (guix build ant-build-system)
%standard-phases))
(outputs '("out"))
@@ -126,6 +127,7 @@
#:test-target ,test-target
#:build-target ,build-target
#:jar-name ,jar-name
+ #:src-dir ,src-dir
#:phases ,phases
#:outputs %outputs
#:search-paths ',(map search-path-specification->sexp
diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm
index 2cc6bb9..651150d 100644
--- a/guix/build/ant-build-system.scm
+++ b/guix/build/ant-build-system.scm
@@ -35,7 +35,7 @@
;;
;; Code:
-(define (default-build.xml jar-name prefix)
+(define (default-build.xml src-dir jar-name prefix)
"Create a simple build.xml with standard targets for Ant."
(call-with-output-file "build.xml"
(lambda (port)
@@ -59,7 +59,7 @@
(target (@ (name "compile"))
(mkdir (@ (dir "${classes.dir}")))
(javac (@ (includeantruntime "false")
- (srcdir "src")
+ (srcdir ,src-dir)
(destdir "${classes.dir}")
(classpath (@ (refid "classpath"))))))
@@ -100,9 +100,9 @@ to the default GNU unpack strategy."
((assq-ref gnu:%standard-phases 'unpack) #:source source)))
(define* (configure #:key inputs outputs (jar-name #f)
- #:allow-other-keys)
+ (src-dir "src") #:allow-other-keys)
(when jar-name
- (default-build.xml jar-name
+ (default-build.xml src-dir jar-name
(string-append (assoc-ref outputs "out")
"/share/java")))
(setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
--
2.7.4
- [bug#36605] [PATCH 2/2] gnu: Build documentation for gunicorn and gunicorn-python2., (continued)
- [bug#36605] [PATCH 2/2] gnu: Build documentation for gunicorn and gunicorn-python2., Hartmut Goebel, 2019/07/11
- [bug#36605] [PATCH 0/3] Emhancements to the ant-build-system, Hartmut Goebel, 2019/07/11
- [bug#36605] [PATCH 02/12] guix: ant-build-system: use abs path as basedir, Hartmut Goebel, 2019/07/11
- [bug#36605] [PATCH 3/3] gnu: Remove now useless #:tests? #f from java-packages., Hartmut Goebel, 2019/07/11
- [bug#36605] [PATCH 08/12] gnu: Add java-commons-daemon., Hartmut Goebel, 2019/07/11
- [bug#36605] [PATCH 06/12] gnu: Add java-commons-cli., Hartmut Goebel, 2019/07/11
- [bug#36605] [PATCH 03/12] guix: Add java-utils., Hartmut Goebel, 2019/07/11
- [bug#36605] [PATCH 04/12] gnu: Add java-plexus-utils., Hartmut Goebel, 2019/07/11
- [bug#36605] [PATCH 07/12] gnu: Add java-commons-codec., Hartmut Goebel, 2019/07/11
- [bug#36605] [PATCH 12/12] gnu: Add java-commons-bcel., Hartmut Goebel, 2019/07/11
- [bug#36605] [PATCH 01/12] guix: ant-bulild-sytem: allow specifying the source directory.,
Hartmut Goebel <=
- [bug#36605] [PATCH 00/12] Java build-system and some packages, Hartmut Goebel, 2019/07/11
- [bug#36605] [PATCH 1/6] gnu: kcoreaddons: Enable test-suite., Hartmut Goebel, 2019/07/11
- [bug#36605] [PATCH 09/12] gnu: Add java-commons-io., Hartmut Goebel, 2019/07/11
- [bug#36605] [PATCH 11/12] gnu: Add java-commons-lang3., Hartmut Goebel, 2019/07/11
- [bug#36605] [PATCH 2/6] gnu: kirigami: Enable test-suite., Hartmut Goebel, 2019/07/11
- [bug#36605] [PATCH 10/12] gnu: Add java-commons-lang., Hartmut Goebel, 2019/07/11
- [bug#36605] [PATCH 3/6] gnu: kpackage: Enable test-suite., Hartmut Goebel, 2019/07/11
- [bug#36605] [PATCH 05/12] gnu: Add java-plexus-interpolation., Hartmut Goebel, 2019/07/11
- [bug#36605] [PATCH 4/6] gnu: kemoticons: Enable test-suite., Hartmut Goebel, 2019/07/11
- [bug#36605] [PATCH 5/6] gnu: knewstuff: Enable test-suite., Hartmut Goebel, 2019/07/11