[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
24/26: gnu: Add ant/java8.
From: |
Ricardo Wurmus |
Subject: |
24/26: gnu: Add ant/java8. |
Date: |
Mon, 22 May 2017 13:03:19 -0400 (EDT) |
rekado pushed a commit to branch master
in repository guix.
commit 8bbd0408408c43af6d40cb4935878985321077c7
Author: Ricardo Wurmus <address@hidden>
Date: Thu May 18 23:28:17 2017 +0200
gnu: Add ant/java8.
* gnu/packages/java.scm (ant/java8): New variable.
---
gnu/packages/java.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index abb2f62..19d8d67 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1692,6 +1692,51 @@ IcedTea build harness.")
(native-inputs
`(("gcj" ,gcj)))))
+(define-public ant/java8
+ (package (inherit ant-bootstrap)
+ (name "ant")
+ (version "1.10.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://apache/ant/source/apache-ant-"
+ version "-src.tar.gz"))
+ (sha256
+ (base32
+ "10p3dh77lkzzzcy32dk9azljixzadp46fggjfbvgkl8mmb8cxxv8"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (for-each delete-file
+ (find-files "lib/optional" "\\.jar$"))
+ #t))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments ant-bootstrap)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-after 'unpack 'remove-scripts
+ ;; Remove bat / cmd scripts for DOS as well as the antRun and
runant
+ ;; wrappers.
+ (lambda _
+ (for-each delete-file
+ (find-files "src/script"
+ "(.*\\.(bat|cmd)|runant.*|antRun.*)"))
+ #t))
+ (replace 'build
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
+
+ ;; Disable tests to avoid dependency on hamcrest-core, which
needs
+ ;; Ant to build. This is necessary in addition to disabling the
+ ;; "check" phase, because the dependency on "test-jar" would
always
+ ;; result in the tests to be run.
+ (substitute* "build.xml"
+ (("depends=\"jars,test-jar\"") "depends=\"jars\""))
+ (zero? (system* "bash" "bootstrap.sh"
+ (string-append "-Ddist.dir="
+ (assoc-ref outputs
"out"))))))))))
+ (native-inputs
+ `(("jdk" ,icedtea-8 "jdk")))))
+
(define-public clojure
(let* ((remove-archives '(begin
(for-each delete-file
- 02/26: gnu: Add r-deseq., (continued)
- 02/26: gnu: Add r-deseq., Ricardo Wurmus, 2017/05/22
- 07/26: gnu: Add ant-bootstrap., Ricardo Wurmus, 2017/05/22
- 12/26: gnu: Add classpath-jamvm-wrappers., Ricardo Wurmus, 2017/05/22
- 06/26: gnu: Add sablevm., Ricardo Wurmus, 2017/05/22
- 03/26: gnu: Add r-edaseq., Ricardo Wurmus, 2017/05/22
- 05/26: gnu: Add sablevm-classpath., Ricardo Wurmus, 2017/05/22
- 15/26: gnu: Add jamvm., Ricardo Wurmus, 2017/05/22
- 04/26: gnu: Add jikes., Ricardo Wurmus, 2017/05/22
- 11/26: gnu: Add jamvm-bootstrap., Ricardo Wurmus, 2017/05/22
- 16/26: gnu: Add ecj-javac-on-jamvm-wrapper-final., Ricardo Wurmus, 2017/05/22
- 24/26: gnu: Add ant/java8.,
Ricardo Wurmus <=
- 23/26: gnu: ant: Move after bootstrap packages., Ricardo Wurmus, 2017/05/22
- 22/26: gnu: ant: Delete bundled jars., Ricardo Wurmus, 2017/05/22
- 18/26: gnu: icedtea-7: Use icedtea-6 for bootstrapping., Ricardo Wurmus, 2017/05/22
- 17/26: gnu: Add icedtea-6., Ricardo Wurmus, 2017/05/22
- 26/26: gnu: Remove GCJ., Ricardo Wurmus, 2017/05/22
- 08/26: gnu: Add ecj-bootstrap., Ricardo Wurmus, 2017/05/22
- 13/26: gnu: Add ecj-javac-on-jamvm-wrapper., Ricardo Wurmus, 2017/05/22
- 19/26: gnu: java-swt: Move below the bootstrap packages., Ricardo Wurmus, 2017/05/22
- 20/26: gnu: clojure: Move below bootstrap packages., Ricardo Wurmus, 2017/05/22
- 25/26: gnu: ant: Implement in terms of ant/java8., Ricardo Wurmus, 2017/05/22