03/11: gnu: ant-bootstrap: Build with JamVM 1.5.1.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository guix.

commit aa432388da01ebf3f7262e958714fa8295a9df78
Author: Ricardo Wurmus <address@hidden>
Date:   Sun Mar 25 19:28:19 2018 +0200

    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.
---
 gnu/packages/java.scm | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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