gnu: ant: Move after bootstrap packages.
* gnu/packages/java.scm (ant): Move package.master
Ricardo Wurmus
parent
e7a5d73ea9
commit
5c7952fbf4
|
|
@ -701,53 +701,6 @@ the standard javac executable. The tool runs on JamVM instead of SableVM.")))
|
||||||
("jamvm" ,jamvm)
|
("jamvm" ,jamvm)
|
||||||
("classpath" ,classpath-devel)))))
|
("classpath" ,classpath-devel)))))
|
||||||
|
|
||||||
(define-public ant
|
|
||||||
(package (inherit ant-bootstrap)
|
|
||||||
(name "ant")
|
|
||||||
;; The 1.9.x series is the last that can be built with GCJ. The 1.10.x
|
|
||||||
;; series requires Java 8.
|
|
||||||
(version "1.9.9")
|
|
||||||
(source (origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (string-append "mirror://apache/ant/source/apache-ant-"
|
|
||||||
version "-src.tar.gz"))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1k28mka0m3isy9yr8gz84kz1f3f879rwaxrd44vdn9xbfwvwk86n"))
|
|
||||||
(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 _
|
|
||||||
(setenv "JAVA_HOME" (string-append (assoc-ref %build-inputs "gcj")
|
|
||||||
"/lib/jvm"))
|
|
||||||
;; 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
|
|
||||||
`(("gcj" ,gcj)))))
|
|
||||||
|
|
||||||
;; The bootstrap JDK consisting of jamvm, classpath-devel,
|
;; The bootstrap JDK consisting of jamvm, classpath-devel,
|
||||||
;; ecj-javac-on-jamvm-wrapper-final cannot build Icedtea 2.x directly, because
|
;; ecj-javac-on-jamvm-wrapper-final cannot build Icedtea 2.x directly, because
|
||||||
;; it's written in Java 7. It can, however, build the unmaintained Icedtea
|
;; it's written in Java 7. It can, however, build the unmaintained Icedtea
|
||||||
|
|
@ -1692,6 +1645,53 @@ IcedTea build harness.")
|
||||||
(define-public icedtea icedtea-7)
|
(define-public icedtea icedtea-7)
|
||||||
|
|
||||||
|
|
||||||
|
(define-public ant
|
||||||
|
(package (inherit ant-bootstrap)
|
||||||
|
(name "ant")
|
||||||
|
;; The 1.9.x series is the last that can be built with GCJ. The 1.10.x
|
||||||
|
;; series requires Java 8.
|
||||||
|
(version "1.9.9")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "mirror://apache/ant/source/apache-ant-"
|
||||||
|
version "-src.tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1k28mka0m3isy9yr8gz84kz1f3f879rwaxrd44vdn9xbfwvwk86n"))
|
||||||
|
(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 _
|
||||||
|
(setenv "JAVA_HOME" (string-append (assoc-ref %build-inputs "gcj")
|
||||||
|
"/lib/jvm"))
|
||||||
|
;; 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
|
||||||
|
`(("gcj" ,gcj)))))
|
||||||
|
|
||||||
(define-public clojure
|
(define-public clojure
|
||||||
(let* ((remove-archives '(begin
|
(let* ((remove-archives '(begin
|
||||||
(for-each delete-file
|
(for-each delete-file
|
||||||
|
|
|
||||||
Reference in New Issue