[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
31/31: ant-build-system: Add unpack phase.
From: |
Ricardo Wurmus |
Subject: |
31/31: ant-build-system: Add unpack phase. |
Date: |
Fri, 20 May 2016 13:27:24 +0000 (UTC) |
rekado pushed a commit to branch master
in repository guix.
commit 932f2b70a6a5eee15b1508d7aae7f8a7fdb0e23a
Author: Ricardo Wurmus <address@hidden>
Date: Tue May 10 15:50:28 2016 +0200
ant-build-system: Add unpack phase.
* guix/build/ant-build-system.scm (unpack): New procedure.
(%standard-phases): Use it.
---
guix/build/ant-build-system.scm | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm
index 27277af..6dc19ff 100644
--- a/guix/build/ant-build-system.scm
+++ b/guix/build/ant-build-system.scm
@@ -86,6 +86,17 @@ INPUTS."
(find-files dir "\\.*jar$")))
inputs)) ":"))
+(define* (unpack #:key source #:allow-other-keys)
+ "Unpack the jar archive SOURCE. When SOURCE is not a jar archive fall back
+to the default GNU unpack strategy."
+ (if (string-suffix? ".jar" source)
+ (begin
+ (mkdir "src")
+ (with-directory-excursion "src"
+ (zero? (system* "jar" "-xf" source))))
+ ;; Use GNU unpack strategy for things that aren't jar archives.
+ ((assq-ref gnu:%standard-phases 'unpack) #:source source)))
+
(define* (configure #:key inputs outputs (jar-name #f)
#:allow-other-keys)
(when jar-name
@@ -151,6 +162,7 @@ repack them. This is necessary to ensure that archives are
reproducible."
(define %standard-phases
(modify-phases gnu:%standard-phases
+ (replace 'unpack unpack)
(replace 'configure configure)
(replace 'build build)
(replace 'check check)
- 29/31: gnu: Add gcc-objc++-4.9., (continued)
- 29/31: gnu: Add gcc-objc++-4.9., Ricardo Wurmus, 2016/05/20
- 03/31: gnu: r-annotationdbi: Update to 1.34.2., Ricardo Wurmus, 2016/05/20
- 22/31: gnu: r-plotly: Update to 3.6.0., Ricardo Wurmus, 2016/05/20
- 21/31: gnu: r-matrixstats: Update to 0.50.2., Ricardo Wurmus, 2016/05/20
- 26/31: gnu: r-rcpparmadillo: Update to 0.6.700.6.0., Ricardo Wurmus, 2016/05/20
- 16/31: gnu: r-git2r: Update to 0.15.0., Ricardo Wurmus, 2016/05/20
- 07/31: gnu: r-rcpp: Update to 0.12.5., Ricardo Wurmus, 2016/05/20
- 18/31: gnu: r-plotrix: Update to 3.6-2., Ricardo Wurmus, 2016/05/20
- 27/31: gnu: Add gcc-objc-4.9., Ricardo Wurmus, 2016/05/20
- 28/31: gnu: Add default gcc-objc., Ricardo Wurmus, 2016/05/20
- 31/31: ant-build-system: Add unpack phase.,
Ricardo Wurmus <=
- 09/31: gnu: r-bh: Update to 1.60.0-2., Ricardo Wurmus, 2016/05/20
- 19/31: gnu: r-rmarkdown: Update to 0.9.6., Ricardo Wurmus, 2016/05/20
- 04/31: gnu: r-biocparallel: Update to 1.6.2., Ricardo Wurmus, 2016/05/20
- 05/31: gnu: r-summarizedexperiment: Update to 1.2.2., Ricardo Wurmus, 2016/05/20
- 06/31: gnu: r-genomicfeatures: Update to 1.24.2., Ricardo Wurmus, 2016/05/20