nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: javacc: Use snippet to delete bundled jars. 

* gnu/packages/java.scm (javacc-4)[source](snippet, modules): New fields.
[arguments]: Remove 'delete-bundled-libs' phase and add 'delete-tests'
phase.
* gnu/packages/java.scm (javacc)[source](snippet, modules): New fields.
[arguments]: Remove 'delete-bundled-libs' phase.
This commit is contained in:
Alex Vong 2018-05-25 07:43:42 +08:00 committed by Danny Milosavljevic
parent 53fb0476ec
commit 6662d65f96
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gnu/packages/java.scm
View File

@ -1960,7 +1960,10 @@ designs.")
(file-name (string-append "javacc-" version "-checkout")) (file-name (string-append "javacc-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"07ysav7j8r1c6h8qxrgqk6lwdp74ly0ad1935lragxml0qqc3ka0")))) "07ysav7j8r1c6h8qxrgqk6lwdp74ly0ad1935lragxml0qqc3ka0"))
(modules '((guix build utils)))
;; delete bundled jars
(snippet '(begin (delete-file-recursively "lib") #t))))
(build-system ant-build-system) (build-system ant-build-system)
;; Tests fail with ;; Tests fail with
;; /tmp/guix-build-javacc-4.1.drv-0/source/test/javacodeLA/build.xml:60: ;; /tmp/guix-build-javacc-4.1.drv-0/source/test/javacodeLA/build.xml:60:
@ -1969,9 +1972,18 @@ designs.")
`(#:tests? #f `(#:tests? #f
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'delete-bundled-libs ;; Delete tests to avoid build failure (we don't run them anyway).
(add-after 'unpack 'delete-tests
(lambda _ (lambda _
(delete-file-recursively "lib") #t)) (for-each delete-file
'("src/org/javacc/JavaCCTestCase.java"
"src/org/javacc/parser/ExpansionTest.java"
"src/org/javacc/parser/OptionsTest.java"
"src/org/javacc/jjtree/JJTreeOptionsTest.java"))
(for-each delete-file-recursively
'("src/org/javacc/parser/test"
"src/org/javacc/jjdoc/test"))
#t))
(replace 'install (install-jars "bin/lib"))))) (replace 'install (install-jars "bin/lib")))))
(home-page "https://javacc.org/") (home-page "https://javacc.org/")
(synopsis "Java parser generator") (synopsis "Java parser generator")
@ -1995,14 +2007,14 @@ debugging, etc.")
(file-name (string-append "javacc-" version ".tar.gz")) (file-name (string-append "javacc-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf")))) "111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf"))
(modules '((guix build utils)))
;; delete bundled jars
(snippet '(begin (delete-file-recursively "lib") #t))))
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'delete-bundled-libs
(lambda _
(delete-file-recursively "lib") #t))
(replace 'install (install-jars "target"))))))) (replace 'install (install-jars "target")))))))
;; This is the last 3.x release of ECJ ;; This is the last 3.x release of ECJ