[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/11: gnu: ecj-javac-wrapper: Do not use sablevm.
From: |
Ricardo Wurmus |
Subject: |
06/11: gnu: ecj-javac-wrapper: Do not use sablevm. |
Date: |
Sun, 25 Mar 2018 15:42:40 -0400 (EDT) |
rekado pushed a commit to branch rhel6
in repository guix.
commit f0c4f9b8baa3e36e0de57684baac5c383500973e
Author: Ricardo Wurmus <address@hidden>
Date: Sun Mar 25 20:54:15 2018 +0200
gnu: ecj-javac-wrapper: Do not use sablevm.
* gnu/packages/java.scm (ecj-javac-wrapper)[native-inputs]: Remove sablevm
and
sablevm-classpath; add jamvm-1-bootstrap and classpath-bootstrap.
[arguments]: Simplify builder now that only jamvm is used.
---
gnu/packages/java.scm | 39 ++++++++++++++-------------------------
1 file changed, 14 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index ea657b8..1c4dd61 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -431,7 +431,7 @@ requirement for all GNU Classpath releases after version
0.93.")
(arguments
`(#:modules ((guix build utils))
#:builder
- (let ((backend 'sablevm))
+ (begin
(use-modules (guix build utils))
(let* ((bin (string-append (assoc-ref %outputs "out") "/bin"))
(target (string-append bin "/javac"))
@@ -439,24 +439,12 @@ requirement for all GNU Classpath releases after version
0.93.")
"/bin/guile"))
(ecj (string-append (assoc-ref %build-inputs
"ecj-bootstrap")
"/share/java/ecj-bootstrap.jar"))
- (java (case backend
- ((sablevm)
- (string-append (assoc-ref %build-inputs "sablevm")
- "/lib/sablevm/bin/java"))
- ((jamvm)
- (string-append (assoc-ref %build-inputs "jamvm")
- "/bin/jamvm"))))
- (bootcp (case backend
- ((sablevm)
- (let ((jvmlib (string-append
- (assoc-ref %build-inputs
"sablevm-classpath")
- "/lib/sablevm")))
- (string-append jvmlib "/jre/lib/rt.jar")))
- ((jamvm)
- (let ((jvmlib (string-append (assoc-ref
%build-inputs "classpath")
- "/share/classpath")))
- (string-append jvmlib "/lib/glibj.zip:"
- jvmlib "/lib/tools.zip"))))))
+ (java (string-append (assoc-ref %build-inputs "jamvm")
+ "/bin/jamvm"))
+ (bootcp (let ((jvmlib (string-append (assoc-ref %build-inputs
"classpath")
+ "/share/classpath")))
+ (string-append jvmlib "/lib/glibj.zip:"
+ jvmlib "/lib/tools.zip"))))
(mkdir-p bin)
(with-output-to-file target
(lambda _
@@ -475,10 +463,11 @@ requirement for all GNU Classpath releases after version
0.93.")
(define (main args)
(let ((classpath (getenv "CLASSPATH")))
(setenv "CLASSPATH"
- (string-append ,ecj
- (if classpath
- (string-append ":"
classpath)
- ""))))
+ (string-join (list ,ecj
+ ,(string-append
(assoc-ref %build-inputs "jamvm")
+
"/lib/rt.jar")
+ (or classpath ""))
+ ":")))
(receive (vm-args other-args)
;; Separate VM arguments from arguments to ECJ.
(partition (cut string-prefix? "-J" <>)
@@ -502,8 +491,8 @@ requirement for all GNU Classpath releases after version
0.93.")
(native-inputs
`(("guile" ,guile-2.2)
("ecj-bootstrap" ,ecj-bootstrap)
- ("sablevm" ,sablevm)
- ("sablevm-classpath" ,sablevm-classpath)))
+ ("jamvm" ,jamvm-1-bootstrap)
+ ("classpath" ,classpath-bootstrap)))
(description "This package provides a wrapper around the @dfn{Eclipse
compiler for Java} (ecj) with a command line interface that is compatible with
the standard javac executable.")))
- branch rhel6 updated (de9ceb4 -> 208a1d9), Ricardo Wurmus, 2018/03/25
- 02/11: gnu: Add jamvm-1-bootstrap., Ricardo Wurmus, 2018/03/25
- 03/11: gnu: ant-bootstrap: Build with JamVM 1.5.1., Ricardo Wurmus, 2018/03/25
- 04/11: gnu: ant-bootstrap: Update to 1.8.4., Ricardo Wurmus, 2018/03/25
- 06/11: gnu: ecj-javac-wrapper: Do not use sablevm.,
Ricardo Wurmus <=
- 01/11: gnu: Add classpath-bootstrap., Ricardo Wurmus, 2018/03/25
- 05/11: gnu: ecj-bootstrap: Build with JamVM 1.5.1 and jikes., Ricardo Wurmus, 2018/03/25
- 08/11: gnu: Remove jamvm-bootstrap., Ricardo Wurmus, 2018/03/25
- 09/11: gnu: classpath-jamvm-wrappers: Use classpath-0.99., Ricardo Wurmus, 2018/03/25
- 07/11: gnu: Replace classpath-on-sablevm with classpath-0.99., Ricardo Wurmus, 2018/03/25
- 11/11: gnu: Remove sablevm and sablevm-classpath, update comments., Ricardo Wurmus, 2018/03/25
- 10/11: gnu: Remove ecj-javac-on-jamvm-wrapper., Ricardo Wurmus, 2018/03/25