[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/11: gnu: ecj-bootstrap: Build with JamVM 1.5.1 and jikes.
From: |
Ricardo Wurmus |
Subject: |
05/11: gnu: ecj-bootstrap: Build with JamVM 1.5.1 and jikes. |
Date: |
Sun, 25 Mar 2018 15:42:40 -0400 (EDT) |
rekado pushed a commit to branch rhel6
in repository guix.
commit 4961eb4e007c41506173946096e3ddf072ac74da
Author: Ricardo Wurmus <address@hidden>
Date: Sun Mar 25 19:34:13 2018 +0200
gnu: ecj-bootstrap: Build with JamVM 1.5.1 and jikes.
* gnu/packages/java.scm (ecj-bootstrap)[native-inputs]: Replace "sablevm"
with
"jikes" and "jamvm-1-bootstrap".
[arguments]: Adjust accordingly.
---
gnu/packages/java.scm | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index ce8c059..ea657b8 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -379,9 +379,12 @@ build process and its dependencies, whereas Make uses
Makefile format.")
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CLASSPATH"
(string-join
- (find-files (string-append (assoc-ref inputs
"ant-bootstrap")
- "/lib")
- "\\.jar$")
+ (cons (string-append (assoc-ref inputs "jamvm")
+ "/lib/rt.jar")
+ (find-files (string-append
+ (assoc-ref inputs "ant-bootstrap")
+ "/lib")
+ "\\.jar$"))
":"))
#t))
(replace 'build
@@ -396,7 +399,7 @@ build process and its dependencies, whereas Make uses
Makefile format.")
Main-Class: org.eclipse.jdt.internal.compiler.batch.Main\n")))
;; Compile it all!
- (and (zero? (apply system* "javac-sablevm"
+ (and (zero? (apply system* "jikes"
(find-files "." "\\.java$")))
(zero? (system* "fastjar" "cvfm"
"ecj-bootstrap.jar" "manifest" ".")))))
@@ -410,7 +413,8 @@ Main-Class:
org.eclipse.jdt.internal.compiler.batch.Main\n")))
(native-inputs
`(("ant-bootstrap" ,ant-bootstrap)
("unzip" ,unzip)
- ("sablevm" ,sablevm)
+ ("jikes" ,jikes)
+ ("jamvm" ,jamvm-1-bootstrap)
("fastjar" ,fastjar)))
(home-page "https://eclipse.org")
(synopsis "Eclipse Java development tools core batch compiler")
- 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, 2018/03/25
- 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 <=
- 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