aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/java.scm
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-09-16 19:11:43 +0200
committerMarius Bakke <marius@gnu.org>2022-09-16 19:11:43 +0200
commit7e0f2728a46b8f96b875a7199655bd63ad6a9fff (patch)
treebc86385f3ef3f788eed795764ff40c71595dcf2b /gnu/packages/java.scm
parentaf53cf42b7391d3af4fa303233afb87700eccd5f (diff)
parent706e6c3c8f9aa19c6ec22d4bbd77d09624dbf671 (diff)
downloadguix-7e0f2728a46b8f96b875a7199655bd63ad6a9fff.tar
guix-7e0f2728a46b8f96b875a7199655bd63ad6a9fff.tar.gz
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/java.scm')
-rw-r--r--gnu/packages/java.scm20
1 files changed, 10 insertions, 10 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 8b3b172ae9..f467c473d7 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -8717,7 +8717,7 @@ actual rendering.")
(define-public java-antlr4-runtime
(package
(name "java-antlr4-runtime")
- (version "4.8")
+ (version "4.10.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -8726,10 +8726,9 @@ actual rendering.")
(file-name (git-file-name name version))
(sha256
(base32
- "1qal3add26qxskm85nk7r758arladn5rcyjinmhlhznmpbbv9j8m"))
+ "0ldvd9jm4nrivaw7i7wh1q40q6xgzmzirsywiakbhg8sppagqlv7"))
(patches
- (search-patches "java-antlr4-Add-standalone-generator.patch"
- "java-antlr4-fix-code-too-large.java"))))
+ (search-patches "java-antlr4-Add-standalone-generator.patch"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "java-antlr4-runtime.jar"
@@ -8759,6 +8758,8 @@ sources by ANTLR.")
;; TODO: try to run the tests under
;; runtime-testsuite/test/org/antlr/v4/test/runtime/cpp with antlr4.
#:tests? #f ;no CMake test target
+ ;; TODO: Building the tests wants to download googletest.
+ #:configure-flags #~'("-DANTLR_BUILD_CPP_TESTS=OFF")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'chdir
@@ -8787,10 +8788,12 @@ generated sources by ANTLR.")))
(arguments
`(#:jar-name "antlr4.jar"
#:source-dir "tool/src"
- #:test-dir "tool-testsuite/test:runtime-testsuite/test:runtime-testsuite/annotations/src"
+ #:test-dir "tool-testsuite/test:runtime-testsuite/test"
#:test-include (list "**/Test*.java")
#:test-exclude (list
- ;; no runnable method
+ ;; These have no runnable methods and fail because
+ ;; test-include above is too broad.
+ "**/TestContext.java"
"**/TestOutputReading.java"
;; no @Test methods
"**/TestParserErrors.java"
@@ -8808,9 +8811,7 @@ generated sources by ANTLR.")))
"**/TestFullContextParsing.java"
"**/TestCompositeLexers.java"
;; Null pointer exception
- "**/TestCompositeGrammars.java"
- ;; Wrong assumption on emoji
- "**/TestUnicodeData.java")
+ "**/TestCompositeGrammars.java")
#:phases
(modify-phases %standard-phases
(add-before 'build 'fix-build.xml
@@ -8824,7 +8825,6 @@ generated sources by ANTLR.")))
(add-after 'bin-install 'check
(lambda _
(invoke "ant" "compile-tests")
- (invoke "ant" "check" "-Dtest.home=runtime-testsuite/annotations/src")
(invoke "ant" "check" "-Dtest.home=runtime-testsuite/test")
(invoke "ant" "check" "-Dtest.home=tool-testsuite/test")
#t))