[PATCH]: Add Ant.

[Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>]

[-- Attachment #1: Type: text/plain, Size: 852 bytes --]

Hi Guix,

this patch adds ant-minimal, a minimal configuration of Apache Ant.  Ant
can be configured with lots of optional libraries, but since most of
these libraries are built with Ant, I think it makes sense to provide a
minimal version.

A wart is that Ant (even in the minimal configuration) depends on
hamcrest-core, which can only be built with Ant.  The good news is that
it appears that hamcrest-core is only used for running the tests after
Ant is built.

I used the gnu-build-system instead of the trivial-build-system, because
using the trivial-build-system required me to write a lot more code in
order to unpack the tarball, patch shebangs, add tools to the PATH,
etc.  Using the gnu-build-system I only had to remove a few phases to
make it work.  Maybe we need a somewhat more powerful version of the
trivial-build-system.

~~ Ricardo


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-Ant.patch --]
[-- Type: text/x-patch, Size: 2321 bytes --]

From a8cf4bbd4a8147215a84f27e4aa6247163b4fdf4 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Fri, 30 Jan 2015 16:57:13 +0100
Subject: [PATCH] gnu: Add Ant.

* gnu/packages/java.scm (ant-minimal): New variable.
---
 gnu/packages/java.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 4a86f63..46ff798 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -48,6 +48,54 @@
   #:use-module (gnu packages zip)
   #:use-module (gnu packages texinfo))
 
+(define-public ant-minimal
+  (package
+    (name "ant")
+    (version "1.9.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://www.apache.org/dist/ant/source/apache-ant-"
+                    version "-src.tar.gz"))
+              (sha256
+               (base32
+                "09kf5s1ir0rdrclsy174bsvbdcbajza9fja490w4mmvcpkw3zpak"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (alist-cons-after
+        'unpack 'copy-hamcrest
+        (lambda _
+          (copy-file (assoc-ref %build-inputs "hamcrest-core")
+                     "lib/optional/hamcrest-core.jar"))
+        (alist-replace
+         'build
+         (lambda _
+           (setenv "JAVA_HOME"
+                   (assoc-ref %build-inputs "icedtea6"))
+           (system* "bash" "bootstrap.sh"
+                    (string-append "-Ddist.dir="
+                                   (assoc-ref %outputs "out"))))
+         (alist-delete
+          'configure
+          (alist-delete
+           'install
+           (alist-delete 'check (%standard-phases))))))))
+    (inputs
+     `(("icedtea6" ,icedtea6)
+       ("hamcrest-core"
+        ,(origin
+           (method url-fetch)
+           (uri "https://hamcrest.googlecode.com/files/hamcrest-core-1.3.jar")
+           (sha256
+            (base32
+             "1sfqqi8p5957hs9yik44an3lwpv8ln2a6sh9gbgli4vkx68yzzb6"))))))
+    (home-page "http://ant.apache.org")
+    (synopsis "Build tool for Java")
+    (description
+     "Ant is a platform-independent build tool for Java.")
+    (license license:asl2.0)))
+
 (define-public icedtea6
   (package
     (name "icedtea6")
-- 
2.1.0