ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-18 04:37:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ecj-javac-wrapper: Use G-Expression.

Browse source 
* gnu/packages/java.scm (ecj-javac-wrapper)[arguments]: Use a gexp to remove
references to %outputs and %build-inputs.
[native-inputs]: Use label-less style.
This commit is contained in:
Ricardo Wurmus 2021-12-18 17:28:08 +01:00
parent 8a47f274fc
commit de48029bb3
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 55 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
gnu/packages/java.scm
View file

@ -506,64 +506,62 @@ (define ecj-javac-wrapper
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let* ((bin (string-append (assoc-ref %outputs "out") "/bin"))
(target (string-append bin "/javac"))
(guile (string-append (assoc-ref %build-inputs "guile")
"/bin/guile"))
(ecj (string-append (assoc-ref %build-inputs "ecj-bootstrap")
"/share/java/ecj-bootstrap.jar"))
(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 "/glibj.zip:"
jvmlib "/tools.zip"))))
(mkdir-p bin)
(with-output-to-file target
(lambda _
(format #t "#!~a --no-auto-compile\n!#\n" guile)
(write
`(begin (use-modules (ice-9 match)
(ice-9 receive)
(ice-9 hash-table)
(srfi srfi-1)
(srfi srfi-26))
(define defaults
'(("-bootclasspath" ,bootcp)
("-source" "1.5")
("-target" "1.5")
("-cp" ".")))
(define (main args)
(let ((classpath (getenv "CLASSPATH")))
(setenv "CLASSPATH"
(string-join (list ,ecj (or classpath ""))
":")))
(receive (vm-args other-args)
;; Separate VM arguments from arguments to ECJ.
(partition (cut string-prefix? "-J" <>)
(fold (lambda (default acc)
(if (member (first default) acc)
acc (append default acc)))
args defaults))
(apply system* ,java
(append
;; Remove "-J" prefix
(map (cut string-drop <> 2) vm-args)
'("org.eclipse.jdt.internal.compiler.batch.Main")
(cons "-nowarn" other-args)))))
;; Entry point
(let ((args (cdr (command-line))))
(if (null? args)
(format (current-error-port) "javac: no arguments given!\n")
(main args)))))))
(chmod target #o755)))))
,#~(begin
(use-modules (guix build utils))
(let* ((bin (string-append #$output "/bin"))
(target (string-append bin "/javac"))
(guile (string-append (assoc-ref %build-inputs "guile")
"/bin/guile"))
(ecj (string-append #$(this-package-native-input "ecj-bootstrap")
"/share/java/ecj-bootstrap.jar"))
(java (string-append #$(this-package-native-input "jamvm")
"/bin/jamvm"))
(bootcp (let ((jvmlib (string-append
#$(this-package-native-input "classpath")
"/share/classpath")))
(string-append jvmlib "/glibj.zip:"
jvmlib "/tools.zip"))))
(mkdir-p bin)
(with-output-to-file target
(lambda _
(format #t "#!~a --no-auto-compile\n!#\n" guile)
(write
`(begin (use-modules (ice-9 match)
(ice-9 receive)
(ice-9 hash-table)
(srfi srfi-1)
(srfi srfi-26))
(define defaults
'(("-bootclasspath" ,bootcp)
("-source" "1.5")
("-target" "1.5")
("-cp" ".")))
(define (main args)
(let ((classpath (getenv "CLASSPATH")))
(setenv "CLASSPATH"
(string-join (list ,ecj (or classpath ""))
":")))
(receive (vm-args other-args)
;; Separate VM arguments from arguments to ECJ.
(partition (cut string-prefix? "-J" <>)
(fold (lambda (default acc)
(if (member (first default) acc)
acc (append default acc)))
args defaults))
(apply system* ,java
(append
;; Remove "-J" prefix
(map (cut string-drop <> 2) vm-args)
'("org.eclipse.jdt.internal.compiler.batch.Main")
(cons "-nowarn" other-args)))))
;; Entry point
(let ((args (cdr (command-line))))
(if (null? args)
(format (current-error-port) "javac: no arguments given!\n")
(main args)))))))
(chmod target #o755)))))
(native-inputs
`(("guile" ,guile-3.0)
("ecj-bootstrap" ,ecj-bootstrap)
("jamvm" ,jamvm-1-bootstrap)
("classpath" ,classpath-bootstrap)))
(list guile-3.0 ecj-bootstrap jamvm-1-bootstrap 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.")))