summaryrefslogtreecommitdiff
path: root/gnu/packages/java.scm
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-09-14 14:48:46 +0200
committerMarius Bakke <marius@gnu.org>2022-09-16 18:42:21 +0200
commit6ce5a6c2e34d5053fcd02883059ea16ca2ad5a75 (patch)
tree7837d30cb9b841ee8e88fb69921ca85eab9a9b1e /gnu/packages/java.scm
parentfa0efe133e5ba0313054699e6ee45a55f348ec3e (diff)
gnu: antlr4: Update to 4.10.1.
* gnu/packages/java.scm (java-antlr4-runtime): Update to 4.10.1. [source](patches): Remove obsolete patch. (java-antlr4-runtime-cpp): Add #:configure-flags. (antlr4)[arguments]: Don't run tests from removed directory. Enable one test; exclude one file. * gnu/packages/fontutils.scm (python-afdko)[arguments]: Add phase to build with the C++ 17 standard.
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 91a729b7ad..c25a330c2a 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -8701,7 +8701,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
@@ -8710,10 +8710,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"
@@ -8743,6 +8742,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
@@ -8771,10 +8772,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"
@@ -8792,9 +8795,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
@@ -8808,7 +8809,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))