[PATCH] ant-build-system: Add unpack phase.

[PATCH] ant-build-system: Add unpack phase.

[Ricardo Wurmus]

From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>

* 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)
-- 
2.7.3

Re: [PATCH] ant-build-system: Add unpack phase.

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

> From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
>
> * guix/build/ant-build-system.scm (unpack): New procedure.
> (%standard-phases): Use it.

LGTM!

Ludo'.