From fd52cbe044a2da184f2f7b562b4d77917e20fb07 Mon Sep 17 00:00:00 2001 From: David Sisson Date: Mon, 21 Aug 2023 18:29:02 -0700 Subject: [PATCH 1/3] chore: Update antlr4 to version 4.13.0. --- src/substrait/textplan/parser/grammar/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/substrait/textplan/parser/grammar/CMakeLists.txt b/src/substrait/textplan/parser/grammar/CMakeLists.txt index 02430e0c..a5bc5c67 100644 --- a/src/substrait/textplan/parser/grammar/CMakeLists.txt +++ b/src/substrait/textplan/parser/grammar/CMakeLists.txt @@ -11,15 +11,15 @@ set(GRAMMAR_DIR ${CMAKE_BINARY_DIR}/src/substrait/textplan/parser/grammar) # using /MD flag for antlr4_runtime (for Visual C++ compilers only) set(ANTLR4_WITH_STATIC_CRT OFF) -set(ANTLR4_TAG 4.12.0) +set(ANTLR4_TAG 4.13.0) set(ANTLR4_ZIP_REPOSITORY - https://github.com/antlr/antlr4/archive/refs/tags/4.12.0.zip) + https://github.com/antlr/antlr4/archive/refs/tags/4.13.0.zip) include(ExternalAntlr4Cpp) include_directories(${ANTLR4_INCLUDE_DIRS}) -file(DOWNLOAD https://www.antlr.org/download/antlr-4.12.0-complete.jar +file(DOWNLOAD https://www.antlr.org/download/antlr-4.13.0-complete.jar "${GRAMMAR_DIR}/antlr.jar") set(ANTLR_EXECUTABLE "${GRAMMAR_DIR}/antlr.jar") find_package(ANTLR REQUIRED) From 19062700b9ee833341e71d1412e86ff970fc10f8 Mon Sep 17 00:00:00 2001 From: David Sisson Date: Wed, 23 Aug 2023 16:40:02 -0700 Subject: [PATCH 2/3] Now uses the ANTLR4_TAG in the filename references. --- src/substrait/textplan/parser/grammar/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/substrait/textplan/parser/grammar/CMakeLists.txt b/src/substrait/textplan/parser/grammar/CMakeLists.txt index a5bc5c67..24eb3d58 100644 --- a/src/substrait/textplan/parser/grammar/CMakeLists.txt +++ b/src/substrait/textplan/parser/grammar/CMakeLists.txt @@ -13,13 +13,13 @@ set(ANTLR4_WITH_STATIC_CRT OFF) set(ANTLR4_TAG 4.13.0) set(ANTLR4_ZIP_REPOSITORY - https://github.com/antlr/antlr4/archive/refs/tags/4.13.0.zip) + https://github.com/antlr/antlr4/archive/refs/tags/${ANTLR4_TAG}.zip) include(ExternalAntlr4Cpp) include_directories(${ANTLR4_INCLUDE_DIRS}) -file(DOWNLOAD https://www.antlr.org/download/antlr-4.13.0-complete.jar +file(DOWNLOAD https://www.antlr.org/download/${ANTLR4_TAG}-complete.jar "${GRAMMAR_DIR}/antlr.jar") set(ANTLR_EXECUTABLE "${GRAMMAR_DIR}/antlr.jar") find_package(ANTLR REQUIRED) From 3745cfba5e6f3360c2cbfc144b1653f2e77031ce Mon Sep 17 00:00:00 2001 From: David Sisson Date: Wed, 23 Aug 2023 16:48:01 -0700 Subject: [PATCH 3/3] Do not use the tag in the jar name which uses dashes instead of periods. --- src/substrait/textplan/parser/grammar/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/substrait/textplan/parser/grammar/CMakeLists.txt b/src/substrait/textplan/parser/grammar/CMakeLists.txt index 24eb3d58..e04ea81a 100644 --- a/src/substrait/textplan/parser/grammar/CMakeLists.txt +++ b/src/substrait/textplan/parser/grammar/CMakeLists.txt @@ -19,7 +19,7 @@ include(ExternalAntlr4Cpp) include_directories(${ANTLR4_INCLUDE_DIRS}) -file(DOWNLOAD https://www.antlr.org/download/${ANTLR4_TAG}-complete.jar +file(DOWNLOAD https://www.antlr.org/download/antlr-4.13.0-complete.jar "${GRAMMAR_DIR}/antlr.jar") set(ANTLR_EXECUTABLE "${GRAMMAR_DIR}/antlr.jar") find_package(ANTLR REQUIRED)