File tree Expand file tree Collapse file tree 5 files changed +28
-5
lines changed
library/yql/parser/proto_ast/gen Expand file tree Collapse file tree 5 files changed +28
-5
lines changed Original file line number Diff line number Diff line change @@ -215,7 +215,7 @@ if __name__ == "__main__":
215215 --semantic-graph \" { ydb_metadata_folder_path + '/sem.linux-aarch64.json' } \" --platforms linux-aarch64 \
216216 --semantic-graph \" { ydb_metadata_folder_path + '/sem.darwin-x86_64.json' } \" --platforms darwin-x86_64 \
217217 --semantic-graph \" { ydb_metadata_folder_path + '/sem.darwin-arm64.json' } \" --platforms darwin-arm64 \
218- --semantic-graph \" { ydb_metadata_folder_path + '/sem.windows-x86_64.json' } \" --platforms windows-x86_64"
218+ --semantic-graph \" { ydb_metadata_folder_path + '/sem.windows-x86_64.json' } \" --platforms windows-x86_64 --generator cmake "
219219# yexport_command = f"{yexport_binary_path} --export-root \"{ydb_tmp_folder_path}\" --target YDB \
220220# --semantic-graph \"{ydb_metadata_folder_path + '/sem.darwin-x86_64.json'}\" --platforms darwin-x86_64"
221221 print (f"yexport command { yexport_command } " )
Original file line number Diff line number Diff line change 11PROTO_LIBRARY()
22
3- IF (CPP_PROTO )
3+ IF (GEN_PROTO )
44 SET(antlr_output ${ARCADIA_BUILD_ROOT}/${MODDIR})
55 SET(antlr_templates ${antlr_output}/org/antlr/codegen/templates)
66 SET(jsonpath_grammar ${ARCADIA_ROOT}/ydb/library/yql/minikql/jsonpath/JsonPath.g)
@@ -23,11 +23,10 @@ IF (CPP_PROTO)
2323 CWD ${antlr_output}
2424 )
2525
26- EXCLUDE_TAGS(GO_PROTO JAVA_PROTO)
27-
2826 NO_COMPILER_WARNINGS()
2927
3028 ADDINCL(
29+ # TODO Please check RUN_ANTLR with version 3, but ADDINCL for version 4
3130 GLOBAL contrib/libs/antlr4_cpp_runtime/src
3231 )
3332
@@ -48,5 +47,6 @@ ENDIF()
4847
4948SRCS(JsonPathParser.proto)
5049
50+ EXCLUDE_TAGS(GO_PROTO JAVA_PROTO)
5151
5252END()
Original file line number Diff line number Diff line change 1+ set (GRAMMAR_STRING_CORE_SINGLE "~(QUOTE_SINGLE | BACKSLASH) | (BACKSLASH .)" )
2+ set (GRAMMAR_STRING_CORE_DOUBLE "~(QUOTE_DOUBLE | BACKSLASH) | (BACKSLASH .)" )
3+ set (GRAMMAR_MULTILINE_COMMENT_CORE "." )
4+ configure_file (
5+ ${CMAKE_SOURCE_DIR} /ydb/library/yql/sql/v0/SQL.g
6+ ${CMAKE_BINARY_DIR} /ydb/library/yql/parser/proto_ast/gen/v0/SQL.g
7+ )
8+
9+
Original file line number Diff line number Diff line change 1+ set (GRAMMAR_STRING_CORE_SINGLE "~(QUOTE_SINGLE | BACKSLASH) | (BACKSLASH .)" )
2+ set (GRAMMAR_STRING_CORE_DOUBLE "~(QUOTE_DOUBLE | BACKSLASH) | (BACKSLASH .)" )
3+ set (GRAMMAR_MULTILINE_COMMENT_CORE "." )
4+
5+ configure_file (
6+ ${CMAKE_SOURCE_DIR} /ydb/library/yql/sql/v0/SQL.g
7+ ${CMAKE_BINARY_DIR} /ydb/library/yql/parser/proto_ast/gen/v0_proto_split/SQL.g
8+ )
9+
Original file line number Diff line number Diff line change @@ -6,7 +6,12 @@ RECURSE(
66 mvp
77 public
88 services
9- tests
109 tools
1110 yql_docs
1211)
12+
13+ IF(NOT EXPORT_CMAKE)
14+ RECURSE(
15+ tests
16+ )
17+ ENDIF()
You can’t perform that action at this time.
0 commit comments