futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: ecj-bootstrap: Build with JamVM 1.5.1 and jikes.

Browse Source 
* gnu/packages/java.scm (ecj-bootstrap)[native-inputs]: Replace "sablevm" with
"jikes" and "jamvm-1-bootstrap".
[arguments]: Adjust accordingly.
This commit is contained in:
Ricardo Wurmus 2018-03-25 19:34:13 +02:00
parent ff4d9fdf8c
commit 6c775dc644
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/java.scm
View File

@ -379,9 +379,12 @@ build process and its dependencies, whereas Make uses Makefile format.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "CLASSPATH" (setenv "CLASSPATH"
(string-join (string-join
(find-files (string-append (assoc-ref inputs "ant-bootstrap") (cons (string-append (assoc-ref inputs "jamvm")
"/lib") "/lib/rt.jar")
"\\.jar$") (find-files (string-append
(assoc-ref inputs "ant-bootstrap")
"/lib")
"\\.jar$"))
":")) ":"))
#t)) #t))
(replace 'build (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"))) Main-Class: org.eclipse.jdt.internal.compiler.batch.Main\n")))
;; Compile it all! ;; Compile it all!
(and (zero? (apply system* "javac-sablevm" (and (zero? (apply system* "jikes"
(find-files "." "\\.java$"))) (find-files "." "\\.java$")))
(zero? (system* "fastjar" "cvfm" (zero? (system* "fastjar" "cvfm"
"ecj-bootstrap.jar" "manifest" "."))))) "ecj-bootstrap.jar" "manifest" ".")))))
@ -410,7 +413,8 @@ Main-Class: org.eclipse.jdt.internal.compiler.batch.Main\n")))
(native-inputs (native-inputs
`(("ant-bootstrap" ,ant-bootstrap) `(("ant-bootstrap" ,ant-bootstrap)
("unzip" ,unzip) ("unzip" ,unzip)
("sablevm" ,sablevm) ("jikes" ,jikes)
("jamvm" ,jamvm-1-bootstrap)
("fastjar" ,fastjar))) ("fastjar" ,fastjar)))
(home-page "https://eclipse.org") (home-page "https://eclipse.org")
(synopsis "Eclipse Java development tools core batch compiler") (synopsis "Eclipse Java development tools core batch compiler")