03/03: gnu: javacc: Bootstrap from javacc-4 instead of bootstrap binary.

[Danny Milosavljevic]

dannym pushed a commit to branch master
in repository guix.

commit 33428d12672fefde745b313ce1f0c02ae9870e39
Author: Alex Vong <address@hidden>
Date:   Thu May 24 00:32:51 2018 +0800

    gnu: javacc: Bootstrap from javacc-4 instead of bootstrap binary.
    
    * gnu/packages/java.scm (javacc)[source](snippet): Delete bootstrap binary.
    [arguments]: Set 'bootstrap-jar' path.
    [native-inputs]: Add 'javacc-4'.
---
 gnu/packages/java.scm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index d89ba6a..f6d72ed 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2010,12 +2010,20 @@ debugging, etc.")
                 "111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf"))
               (modules '((guix build utils)))
               ;; delete bundled jars
-              (snippet '(begin (delete-file-recursively "lib") #t))))
-    (arguments
-     `(#:test-target "test"
+              (snippet '(begin (for-each delete-file-recursively
+                                         '("bootstrap" "lib"))
+                               #t))))
+    (arguments
+     `(#:make-flags ; bootstrap from javacc-4
+       (list (string-append "-Dbootstrap-jar="
+                            (assoc-ref %build-inputs "javacc")
+                            "/share/java/javacc.jar"))
+       #:test-target "test"
        #:phases
        (modify-phases %standard-phases
-         (replace 'install (install-jars "target")))))))
+         (replace 'install (install-jars "target")))))
+    (native-inputs
+     `(("javacc" ,javacc-4)))))
 
 ;; This is the last 3.x release of ECJ
 (define-public java-ecj-3