Move antlr3 to contrib/

24 files changed, 57 insertions, 583 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1cdb522c0..58821836c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,6 @@ enable_testing()
 # Can't set it in cuda.cmake because of CMake policy subdirectory stack rules
 cmake_policy(SET CMP0104 OLD)
 
-include(cmake/antlr.cmake)
 include(cmake/archive.cmake)
 include(cmake/bison.cmake)
 include(cmake/common.cmake)
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index f75ebe1857..7eaae4f728 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -5002,9 +5002,7 @@ macro ASM_PREINCLUDE(PREINCLUDES...) {
 ###
 ### Macro to invoke ANTLR3 generator (general case)
 macro RUN_ANTLR(IN[], IN_NOPARSE[], OUT[], OUT_NOAUTO[], OUTPUT_INCLUDES[], INDUCED_DEPS[], CWD="", Args...) {
-    PEERDIR(build/external_resources/antlr3 build/platform/java/jdk $JDK_RESOURCE_PEERDIR)
-    .CMD=$_RUN_JAVA(-jar $ANTLR3_RESOURCE_GLOBAL/antlr-3.5.2-complete-no-st3.jar $Args IN $IN IN_NOPARSE $IN_NOPARSE OUT $OUT OUT_NOAUTO $OUT_NOAUTO OUTPUT_INCLUDES $OUTPUT_INCLUDES INDUCED_DEPS $INDUCED_DEPS ${pre=CWD :CWD})
-    .SEM=run_antlr OUTPUT ${output:OUT} ${output;noauto:OUT_NOAUTO} DEPENDS ${input:IN} ${pre=WORKING_DIRECTORY :CWD} ANTLER_ARGS $Args
+    _RUN_JAVA(-jar ${input:"contrib/java/antlr/antlr3/antlr.jar"} $Args IN $IN IN_NOPARSE $IN_NOPARSE OUT $OUT OUT_NOAUTO $OUT_NOAUTO OUTPUT_INCLUDES $OUTPUT_INCLUDES INDUCED_DEPS $INDUCED_DEPS ${pre=CWD :CWD})
 }
 
 ### @usage: RUN_ANTLR4(Args...)
diff --git a/cmake/antlr.cmake b/cmake/antlr.cmake
deleted file mode 100644
index d203fd9c88..0000000000
--- a/cmake/antlr.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
-function(ensure_antlr)
-    if(NOT ANTLR3_EXECUTABLE)
-        find_program(ANTLR3_EXECUTABLE
-                     NAMES antlr3)
-        if (NOT ANTLR3_EXECUTABLE)
-            message(FATAL_ERROR "Unable to find antlr3 program. Please install antlr3 and make sure executable file present in the $PATH env.")
-        endif()
-    endif()
-endfunction()
-
-function(run_antlr)
-    ensure_antlr()
-    set(options "")
-    set(oneValueArgs WORKING_DIRECTORY)
-    set(multiValueArgs OUTPUT DEPENDS ANTLER_ARGS)
-    cmake_parse_arguments(
-        RUN_ANTLR
-         "${options}"
-         "${oneValueArgs}"
-         "${multiValueArgs}"
-         ${ARGN}
-    )
-
-    add_custom_command(
-        OUTPUT ${RUN_ANTLR_OUTPUT}
-        COMMAND ${ANTLR3_EXECUTABLE} ${RUN_ANTLR_ANTLER_ARGS}
-        WORKING_DIRECTORY ${RUN_ANTLR_WORKING_DIRECTORY}
-        DEPENDS ${RUN_ANTLR_DEPENDS}
-    )
-
-endfunction()
diff --git a/contrib/java/antlr/antlr3/antlr.jar b/contrib/java/antlr/antlr3/antlr.jar
new file mode 100644
index 0000000000..20c7667a8e
--- /dev/null
+++ b/contrib/java/antlr/antlr3/antlr.jar
diff --git a/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.darwin-x86_64.txt
index 65d2f12e2a..aca29abde4 100644
--- a/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.darwin-x86_64.txt
@@ -23,10 +23,6 @@ set(
   NJsonPathGenerated
 )
 set(
-  ANTLR_PACKAGE_NAME
-  NJsonPathGenerated
-)
-set(
   LEXER_PARSER_NAMESPACE
   NALP
 )
@@ -34,6 +30,10 @@ set(
   PROTOBUF_HEADER_PATH
   ydb/library/yql/parser/proto_ast/gen/jsonpath
 )
+set(
+  ANTLR_PACKAGE_NAME
+  NJsonPathGenerated
+)
 
 add_library(proto_ast-gen-jsonpath)
 target_compile_options(proto_ast-gen-jsonpath PRIVATE
@@ -55,48 +55,13 @@ target_sources(proto_ast-gen-jsonpath PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathParser.cpp
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathLexer.cpp
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathParser.proto
-  DEPENDS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/jsonpath/JsonPath.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/protobuf/protobuf.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath
-  ANTLER_ARGS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/jsonpath/JsonPath.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath
-  -language
-  protobuf
-)
-configure_file(
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/protobuf/protobuf.stg
-)
 configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/Cpp/Cpp.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/Cpp/Cpp.stg
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathParser.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathLexer.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathParser.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathLexer.h
-  DEPENDS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/jsonpath/JsonPath.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/Cpp/Cpp.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath
-  ANTLER_ARGS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/jsonpath/JsonPath.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath
+configure_file(
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/protobuf/protobuf.stg
 )
 target_proto_addincls(proto_ast-gen-jsonpath
   ./
diff --git a/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.linux-aarch64.txt b/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.linux-aarch64.txt
index 9b5df75f59..e2508a2518 100644
--- a/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.linux-aarch64.txt
@@ -23,10 +23,6 @@ set(
   NJsonPathGenerated
 )
 set(
-  ANTLR_PACKAGE_NAME
-  NJsonPathGenerated
-)
-set(
   LEXER_PARSER_NAMESPACE
   NALP
 )
@@ -34,6 +30,10 @@ set(
   PROTOBUF_HEADER_PATH
   ydb/library/yql/parser/proto_ast/gen/jsonpath
 )
+set(
+  ANTLR_PACKAGE_NAME
+  NJsonPathGenerated
+)
 
 add_library(proto_ast-gen-jsonpath)
 target_compile_options(proto_ast-gen-jsonpath PRIVATE
@@ -56,48 +56,13 @@ target_sources(proto_ast-gen-jsonpath PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathParser.cpp
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathLexer.cpp
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathParser.proto
-  DEPENDS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/jsonpath/JsonPath.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/protobuf/protobuf.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath
-  ANTLER_ARGS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/jsonpath/JsonPath.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath
-  -language
-  protobuf
-)
-configure_file(
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/protobuf/protobuf.stg
-)
 configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/Cpp/Cpp.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/Cpp/Cpp.stg
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathParser.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathLexer.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathParser.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathLexer.h
-  DEPENDS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/jsonpath/JsonPath.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/Cpp/Cpp.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath
-  ANTLER_ARGS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/jsonpath/JsonPath.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath
+configure_file(
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/protobuf/protobuf.stg
 )
 target_proto_addincls(proto_ast-gen-jsonpath
   ./
diff --git a/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.linux-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.linux-x86_64.txt
index 9b5df75f59..e2508a2518 100644
--- a/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.linux-x86_64.txt
@@ -23,10 +23,6 @@ set(
   NJsonPathGenerated
 )
 set(
-  ANTLR_PACKAGE_NAME
-  NJsonPathGenerated
-)
-set(
   LEXER_PARSER_NAMESPACE
   NALP
 )
@@ -34,6 +30,10 @@ set(
   PROTOBUF_HEADER_PATH
   ydb/library/yql/parser/proto_ast/gen/jsonpath
 )
+set(
+  ANTLR_PACKAGE_NAME
+  NJsonPathGenerated
+)
 
 add_library(proto_ast-gen-jsonpath)
 target_compile_options(proto_ast-gen-jsonpath PRIVATE
@@ -56,48 +56,13 @@ target_sources(proto_ast-gen-jsonpath PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathParser.cpp
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathLexer.cpp
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathParser.proto
-  DEPENDS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/jsonpath/JsonPath.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/protobuf/protobuf.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath
-  ANTLER_ARGS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/jsonpath/JsonPath.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath
-  -language
-  protobuf
-)
-configure_file(
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/protobuf/protobuf.stg
-)
 configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/Cpp/Cpp.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/Cpp/Cpp.stg
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathParser.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathLexer.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathParser.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathLexer.h
-  DEPENDS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/jsonpath/JsonPath.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/Cpp/Cpp.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath
-  ANTLER_ARGS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/jsonpath/JsonPath.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath
+configure_file(
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/protobuf/protobuf.stg
 )
 target_proto_addincls(proto_ast-gen-jsonpath
   ./
diff --git a/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.windows-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.windows-x86_64.txt
index 65d2f12e2a..aca29abde4 100644
--- a/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.windows-x86_64.txt
@@ -23,10 +23,6 @@ set(
   NJsonPathGenerated
 )
 set(
-  ANTLR_PACKAGE_NAME
-  NJsonPathGenerated
-)
-set(
   LEXER_PARSER_NAMESPACE
   NALP
 )
@@ -34,6 +30,10 @@ set(
   PROTOBUF_HEADER_PATH
   ydb/library/yql/parser/proto_ast/gen/jsonpath
 )
+set(
+  ANTLR_PACKAGE_NAME
+  NJsonPathGenerated
+)
 
 add_library(proto_ast-gen-jsonpath)
 target_compile_options(proto_ast-gen-jsonpath PRIVATE
@@ -55,48 +55,13 @@ target_sources(proto_ast-gen-jsonpath PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathParser.cpp
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathLexer.cpp
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathParser.proto
-  DEPENDS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/jsonpath/JsonPath.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/protobuf/protobuf.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath
-  ANTLER_ARGS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/jsonpath/JsonPath.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath
-  -language
-  protobuf
-)
-configure_file(
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/protobuf/protobuf.stg
-)
 configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/Cpp/Cpp.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/Cpp/Cpp.stg
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathParser.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathLexer.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathParser.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathLexer.h
-  DEPENDS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/jsonpath/JsonPath.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/Cpp/Cpp.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath
-  ANTLER_ARGS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/jsonpath/JsonPath.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath
+configure_file(
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/protobuf/protobuf.stg
 )
 target_proto_addincls(proto_ast-gen-jsonpath
   ./
diff --git a/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.darwin-x86_64.txt
index e46562c7d8..4c4dd8edb8 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.darwin-x86_64.txt
@@ -23,10 +23,6 @@ set(
   NSQLGenerated
 )
 set(
-  ANTLR_PACKAGE_NAME
-  NSQLGenerated
-)
-set(
   LEXER_PARSER_NAMESPACE
   NALP
 )
@@ -34,6 +30,10 @@ set(
   PROTOBUF_HEADER_PATH
   ydb/library/yql/parser/proto_ast/gen/v0
 )
+set(
+  ANTLR_PACKAGE_NAME
+  NSQLGenerated
+)
 
 add_library(proto_ast-gen-v0)
 target_compile_options(proto_ast-gen-v0 PRIVATE
@@ -55,48 +55,13 @@ target_sources(proto_ast-gen-v0 PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLParser.cpp
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLLexer.cpp
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLParser.proto
-  DEPENDS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/protobuf/protobuf.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0
-  ANTLER_ARGS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0
-  -language
-  protobuf
-)
-configure_file(
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/protobuf/protobuf.stg
-)
 configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/Cpp/Cpp.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/Cpp/Cpp.stg
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLParser.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLLexer.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLParser.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLLexer.h
-  DEPENDS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/Cpp/Cpp.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0
-  ANTLER_ARGS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0
+configure_file(
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/protobuf/protobuf.stg
 )
 target_proto_addincls(proto_ast-gen-v0
   ./
diff --git a/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.linux-aarch64.txt b/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.linux-aarch64.txt
index 906f81b5e4..beda8efc76 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.linux-aarch64.txt
@@ -23,10 +23,6 @@ set(
   NSQLGenerated
 )
 set(
-  ANTLR_PACKAGE_NAME
-  NSQLGenerated
-)
-set(
   LEXER_PARSER_NAMESPACE
   NALP
 )
@@ -34,6 +30,10 @@ set(
   PROTOBUF_HEADER_PATH
   ydb/library/yql/parser/proto_ast/gen/v0
 )
+set(
+  ANTLR_PACKAGE_NAME
+  NSQLGenerated
+)
 
 add_library(proto_ast-gen-v0)
 target_compile_options(proto_ast-gen-v0 PRIVATE
@@ -56,48 +56,13 @@ target_sources(proto_ast-gen-v0 PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLParser.cpp
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLLexer.cpp
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLParser.proto
-  DEPENDS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/protobuf/protobuf.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0
-  ANTLER_ARGS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0
-  -language
-  protobuf
-)
-configure_file(
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/protobuf/protobuf.stg
-)
 configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/Cpp/Cpp.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/Cpp/Cpp.stg
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLParser.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLLexer.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLParser.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLLexer.h
-  DEPENDS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/Cpp/Cpp.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0
-  ANTLER_ARGS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0
+configure_file(
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/protobuf/protobuf.stg
 )
 target_proto_addincls(proto_ast-gen-v0
   ./
diff --git a/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.linux-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.linux-x86_64.txt
index 906f81b5e4..beda8efc76 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.linux-x86_64.txt
@@ -23,10 +23,6 @@ set(
   NSQLGenerated
 )
 set(
-  ANTLR_PACKAGE_NAME
-  NSQLGenerated
-)
-set(
   LEXER_PARSER_NAMESPACE
   NALP
 )
@@ -34,6 +30,10 @@ set(
   PROTOBUF_HEADER_PATH
   ydb/library/yql/parser/proto_ast/gen/v0
 )
+set(
+  ANTLR_PACKAGE_NAME
+  NSQLGenerated
+)
 
 add_library(proto_ast-gen-v0)
 target_compile_options(proto_ast-gen-v0 PRIVATE
@@ -56,48 +56,13 @@ target_sources(proto_ast-gen-v0 PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLParser.cpp
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLLexer.cpp
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLParser.proto
-  DEPENDS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/protobuf/protobuf.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0
-  ANTLER_ARGS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0
-  -language
-  protobuf
-)
-configure_file(
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/protobuf/protobuf.stg
-)
 configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/Cpp/Cpp.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/Cpp/Cpp.stg
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLParser.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLLexer.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLParser.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLLexer.h
-  DEPENDS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/Cpp/Cpp.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0
-  ANTLER_ARGS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0
+configure_file(
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/protobuf/protobuf.stg
 )
 target_proto_addincls(proto_ast-gen-v0
   ./
diff --git a/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.windows-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.windows-x86_64.txt
index e46562c7d8..4c4dd8edb8 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.windows-x86_64.txt
@@ -23,10 +23,6 @@ set(
   NSQLGenerated
 )
 set(
-  ANTLR_PACKAGE_NAME
-  NSQLGenerated
-)
-set(
   LEXER_PARSER_NAMESPACE
   NALP
 )
@@ -34,6 +30,10 @@ set(
   PROTOBUF_HEADER_PATH
   ydb/library/yql/parser/proto_ast/gen/v0
 )
+set(
+  ANTLR_PACKAGE_NAME
+  NSQLGenerated
+)
 
 add_library(proto_ast-gen-v0)
 target_compile_options(proto_ast-gen-v0 PRIVATE
@@ -55,48 +55,13 @@ target_sources(proto_ast-gen-v0 PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLParser.cpp
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLLexer.cpp
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLParser.proto
-  DEPENDS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/protobuf/protobuf.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0
-  ANTLER_ARGS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0
-  -language
-  protobuf
-)
-configure_file(
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/protobuf/protobuf.stg
-)
 configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/Cpp/Cpp.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/Cpp/Cpp.stg
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLParser.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLLexer.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLParser.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLLexer.h
-  DEPENDS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/Cpp/Cpp.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0
-  ANTLER_ARGS
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0
+configure_file(
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/protobuf/protobuf.stg
 )
 target_proto_addincls(proto_ast-gen-v0
   ./
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.darwin-x86_64.txt
index 02b893de3b..2c12c9fe33 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.darwin-x86_64.txt
@@ -39,24 +39,6 @@ configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/Cpp/Cpp.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/org/antlr/codegen/templates/Cpp/Cpp.stg
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1Parser.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1Lexer.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1Parser.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1Lexer.h
-  DEPENDS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/org/antlr/codegen/templates/Cpp/Cpp.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1
-  ANTLER_ARGS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1
-)
 set(GRAMMAR_STRING_CORE_SINGLE "~(QUOTE_SINGLE | BACKSLASH) | (BACKSLASH .)")
 set(GRAMMAR_STRING_CORE_DOUBLE "~(QUOTE_DOUBLE | BACKSLASH) | (BACKSLASH .)")
 set(GRAMMAR_MULTILINE_COMMENT_CORE       ".")
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux-aarch64.txt b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux-aarch64.txt
index d1fd41654f..db5d31f9fd 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux-aarch64.txt
@@ -40,24 +40,6 @@ configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/Cpp/Cpp.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/org/antlr/codegen/templates/Cpp/Cpp.stg
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1Parser.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1Lexer.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1Parser.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1Lexer.h
-  DEPENDS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/org/antlr/codegen/templates/Cpp/Cpp.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1
-  ANTLER_ARGS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1
-)
 set(GRAMMAR_STRING_CORE_SINGLE "~(QUOTE_SINGLE | BACKSLASH) | (BACKSLASH .)")
 set(GRAMMAR_STRING_CORE_DOUBLE "~(QUOTE_DOUBLE | BACKSLASH) | (BACKSLASH .)")
 set(GRAMMAR_MULTILINE_COMMENT_CORE       ".")
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux-x86_64.txt
index d1fd41654f..db5d31f9fd 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux-x86_64.txt
@@ -40,24 +40,6 @@ configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/Cpp/Cpp.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/org/antlr/codegen/templates/Cpp/Cpp.stg
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1Parser.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1Lexer.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1Parser.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1Lexer.h
-  DEPENDS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/org/antlr/codegen/templates/Cpp/Cpp.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1
-  ANTLER_ARGS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1
-)
 set(GRAMMAR_STRING_CORE_SINGLE "~(QUOTE_SINGLE | BACKSLASH) | (BACKSLASH .)")
 set(GRAMMAR_STRING_CORE_DOUBLE "~(QUOTE_DOUBLE | BACKSLASH) | (BACKSLASH .)")
 set(GRAMMAR_MULTILINE_COMMENT_CORE       ".")
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.windows-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.windows-x86_64.txt
index 02b893de3b..2c12c9fe33 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.windows-x86_64.txt
@@ -39,24 +39,6 @@ configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/Cpp/Cpp.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/org/antlr/codegen/templates/Cpp/Cpp.stg
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1Parser.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1Lexer.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1Parser.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1Lexer.h
-  DEPENDS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/org/antlr/codegen/templates/Cpp/Cpp.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1
-  ANTLER_ARGS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1
-)
 set(GRAMMAR_STRING_CORE_SINGLE "~(QUOTE_SINGLE | BACKSLASH) | (BACKSLASH .)")
 set(GRAMMAR_STRING_CORE_DOUBLE "~(QUOTE_DOUBLE | BACKSLASH) | (BACKSLASH .)")
 set(GRAMMAR_MULTILINE_COMMENT_CORE       ".")
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.darwin-x86_64.txt
index 7ce8f04bcf..209d5b7252 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.darwin-x86_64.txt
@@ -39,24 +39,6 @@ configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/Cpp/Cpp.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/org/antlr/codegen/templates/Cpp/Cpp.stg
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1Parser.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1Lexer.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1Parser.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1Lexer.h
-  DEPENDS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/org/antlr/codegen/templates/Cpp/Cpp.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi
-  ANTLER_ARGS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi
-)
 set(GRAMMAR_STRING_CORE_SINGLE "~QUOTE_SINGLE | (QUOTE_SINGLE QUOTE_SINGLE)")
 set(GRAMMAR_STRING_CORE_DOUBLE "~QUOTE_DOUBLE | (QUOTE_DOUBLE QUOTE_DOUBLE)")
 set(GRAMMAR_MULTILINE_COMMENT_CORE       "MULTILINE_COMMENT | .")
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux-aarch64.txt b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux-aarch64.txt
index b0255d7b59..b1e4095af1 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux-aarch64.txt
@@ -40,24 +40,6 @@ configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/Cpp/Cpp.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/org/antlr/codegen/templates/Cpp/Cpp.stg
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1Parser.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1Lexer.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1Parser.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1Lexer.h
-  DEPENDS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/org/antlr/codegen/templates/Cpp/Cpp.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi
-  ANTLER_ARGS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi
-)
 set(GRAMMAR_STRING_CORE_SINGLE "~QUOTE_SINGLE | (QUOTE_SINGLE QUOTE_SINGLE)")
 set(GRAMMAR_STRING_CORE_DOUBLE "~QUOTE_DOUBLE | (QUOTE_DOUBLE QUOTE_DOUBLE)")
 set(GRAMMAR_MULTILINE_COMMENT_CORE       "MULTILINE_COMMENT | .")
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux-x86_64.txt
index b0255d7b59..b1e4095af1 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux-x86_64.txt
@@ -40,24 +40,6 @@ configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/Cpp/Cpp.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/org/antlr/codegen/templates/Cpp/Cpp.stg
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1Parser.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1Lexer.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1Parser.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1Lexer.h
-  DEPENDS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/org/antlr/codegen/templates/Cpp/Cpp.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi
-  ANTLER_ARGS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi
-)
 set(GRAMMAR_STRING_CORE_SINGLE "~QUOTE_SINGLE | (QUOTE_SINGLE QUOTE_SINGLE)")
 set(GRAMMAR_STRING_CORE_DOUBLE "~QUOTE_DOUBLE | (QUOTE_DOUBLE QUOTE_DOUBLE)")
 set(GRAMMAR_MULTILINE_COMMENT_CORE       "MULTILINE_COMMENT | .")
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.windows-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.windows-x86_64.txt
index 7ce8f04bcf..209d5b7252 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.windows-x86_64.txt
@@ -39,24 +39,6 @@ configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/Cpp/Cpp.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/org/antlr/codegen/templates/Cpp/Cpp.stg
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1Parser.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1Lexer.cpp
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1Parser.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1Lexer.h
-  DEPENDS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/org/antlr/codegen/templates/Cpp/Cpp.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi
-  ANTLER_ARGS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi
-)
 set(GRAMMAR_STRING_CORE_SINGLE "~QUOTE_SINGLE | (QUOTE_SINGLE QUOTE_SINGLE)")
 set(GRAMMAR_STRING_CORE_DOUBLE "~QUOTE_DOUBLE | (QUOTE_DOUBLE QUOTE_DOUBLE)")
 set(GRAMMAR_MULTILINE_COMMENT_CORE       "MULTILINE_COMMENT | .")
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.darwin-x86_64.txt
index 6e54b1e340..91428705f0 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.darwin-x86_64.txt
@@ -35,23 +35,6 @@ target_link_libraries(proto_ast-gen-v1_proto PUBLIC
 target_proto_messages(proto_ast-gen-v1_proto PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1Parser.proto
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1Parser.proto
-  DEPENDS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/org/antlr/codegen/templates/protobuf/protobuf.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto
-  ANTLER_ARGS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto
-  -language
-  protobuf
-)
 configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/org/antlr/codegen/templates/protobuf/protobuf.stg
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux-aarch64.txt b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux-aarch64.txt
index f9c920556c..4e78d08b90 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux-aarch64.txt
@@ -36,23 +36,6 @@ target_link_libraries(proto_ast-gen-v1_proto PUBLIC
 target_proto_messages(proto_ast-gen-v1_proto PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1Parser.proto
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1Parser.proto
-  DEPENDS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/org/antlr/codegen/templates/protobuf/protobuf.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto
-  ANTLER_ARGS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto
-  -language
-  protobuf
-)
 configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/org/antlr/codegen/templates/protobuf/protobuf.stg
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux-x86_64.txt
index f9c920556c..4e78d08b90 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux-x86_64.txt
@@ -36,23 +36,6 @@ target_link_libraries(proto_ast-gen-v1_proto PUBLIC
 target_proto_messages(proto_ast-gen-v1_proto PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1Parser.proto
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1Parser.proto
-  DEPENDS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/org/antlr/codegen/templates/protobuf/protobuf.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto
-  ANTLER_ARGS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto
-  -language
-  protobuf
-)
 configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/org/antlr/codegen/templates/protobuf/protobuf.stg
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.windows-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.windows-x86_64.txt
index 6e54b1e340..91428705f0 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.windows-x86_64.txt
@@ -35,23 +35,6 @@ target_link_libraries(proto_ast-gen-v1_proto PUBLIC
 target_proto_messages(proto_ast-gen-v1_proto PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1Parser.proto
 )
-run_antlr(
-  OUTPUT
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1Parser.proto
-  DEPENDS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1.g
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/org/antlr/codegen/templates/protobuf/protobuf.stg
-  WORKING_DIRECTORY
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto
-  ANTLER_ARGS
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1.g
-  -lib
-  .
-  -fo
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto
-  -language
-  protobuf
-)
 configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/org/antlr/codegen/templates/protobuf/protobuf.stg