nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: ant-bootstrap: Build with JamVM 1.5.1. 

* gnu/packages/java.scm (ant-bootstrap)[native-inputs]: Replace sablevm with
jamvm-1-bootstrap.
[arguments]: Adjust accordingly.
This commit is contained in:
Ricardo Wurmus 2018-03-25 19:28:19 +02:00
parent 063629aa3e
commit aa432388da
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/java.scm
View File

@ -312,15 +312,16 @@ JNI.")
(delete 'configure) (delete 'configure)
(replace 'build (replace 'build
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "JAVA_HOME" (setenv "JAVA_HOME" (assoc-ref inputs "jamvm"))
(string-append (assoc-ref inputs "sablevm")
"/lib/sablevm"))
(setenv "JAVACMD" (setenv "JAVACMD"
(string-append (assoc-ref inputs "sablevm") (string-append (assoc-ref inputs "jamvm")
"/bin/java-sablevm")) "/bin/jamvm"))
(setenv "JAVAC" (setenv "JAVAC"
(string-append (assoc-ref inputs "sablevm") (string-append (assoc-ref inputs "jikes")
"/bin/javac-sablevm")) "/bin/jikes"))
(setenv "CLASSPATH"
(string-append (assoc-ref inputs "jamvm")
"/lib/rt.jar"))
;; Use jikes instead of javac for <javac ...> tags in build.xml ;; Use jikes instead of javac for <javac ...> tags in build.xml
(setenv "ANT_OPTS" "-Dbuild.compiler=jikes") (setenv "ANT_OPTS" "-Dbuild.compiler=jikes")
@ -339,7 +340,7 @@ JNI.")
(delete 'install)))) (delete 'install))))
(native-inputs (native-inputs
`(("jikes" ,jikes) `(("jikes" ,jikes)
("sablevm" ,sablevm))) ("jamvm" ,jamvm-1-bootstrap)))
(home-page "http://ant.apache.org") (home-page "http://ant.apache.org")
(synopsis "Build tool for Java") (synopsis "Build tool for Java")
(description (description