aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexSm <alex@ydb.tech>2024-09-13 15:24:00 +0200
committerGitHub <noreply@github.com>2024-09-13 15:24:00 +0200
commit6ee3d1ca96cd19db40c6d4d2d74b3668a975bfc8 (patch)
tree9426912e9c677e5cd8c7cca41cd813b9d1533433
parent2416150911027a83489a7d169ac16035c6278405 (diff)
downloadydb-6ee3d1ca96cd19db40c6d4d2d74b3668a975bfc8.tar.gz
Export by new cmake generator (#9216)
Co-authored-by: Dmitrii Dmitriev <40385868+dimdim1177@users.noreply.github.com>
-rwxr-xr-xgenerate_cmake2
-rw-r--r--ydb/library/yql/parser/proto_ast/gen/jsonpath/ya.make6
-rw-r--r--ydb/library/yql/parser/proto_ast/gen/v0/epilogue.cmake9
-rw-r--r--ydb/library/yql/parser/proto_ast/gen/v0_proto_split/epilogue.cmake9
-rw-r--r--ydb/ya.make7
5 files changed, 28 insertions, 5 deletions
diff --git a/generate_cmake b/generate_cmake
index 261937094b..de30956a92 100755
--- a/generate_cmake
+++ b/generate_cmake
@@ -215,7 +215,7 @@ if __name__ == "__main__":
--semantic-graph \"{ydb_metadata_folder_path + '/sem.linux-aarch64.json'}\" --platforms linux-aarch64 \
--semantic-graph \"{ydb_metadata_folder_path + '/sem.darwin-x86_64.json'}\" --platforms darwin-x86_64 \
--semantic-graph \"{ydb_metadata_folder_path + '/sem.darwin-arm64.json'}\" --platforms darwin-arm64 \
- --semantic-graph \"{ydb_metadata_folder_path + '/sem.windows-x86_64.json'}\" --platforms windows-x86_64"
+ --semantic-graph \"{ydb_metadata_folder_path + '/sem.windows-x86_64.json'}\" --platforms windows-x86_64 --generator cmake"
# yexport_command = f"{yexport_binary_path} --export-root \"{ydb_tmp_folder_path}\" --target YDB \
# --semantic-graph \"{ydb_metadata_folder_path + '/sem.darwin-x86_64.json'}\" --platforms darwin-x86_64"
print(f"yexport command {yexport_command}")
diff --git a/ydb/library/yql/parser/proto_ast/gen/jsonpath/ya.make b/ydb/library/yql/parser/proto_ast/gen/jsonpath/ya.make
index 5573169882..53e0c36a1d 100644
--- a/ydb/library/yql/parser/proto_ast/gen/jsonpath/ya.make
+++ b/ydb/library/yql/parser/proto_ast/gen/jsonpath/ya.make
@@ -1,6 +1,6 @@
PROTO_LIBRARY()
-IF (CPP_PROTO)
+IF (GEN_PROTO)
SET(antlr_output ${ARCADIA_BUILD_ROOT}/${MODDIR})
SET(antlr_templates ${antlr_output}/org/antlr/codegen/templates)
SET(jsonpath_grammar ${ARCADIA_ROOT}/ydb/library/yql/minikql/jsonpath/JsonPath.g)
@@ -23,11 +23,10 @@ IF (CPP_PROTO)
CWD ${antlr_output}
)
- EXCLUDE_TAGS(GO_PROTO JAVA_PROTO)
-
NO_COMPILER_WARNINGS()
ADDINCL(
+ # TODO Please check RUN_ANTLR with version 3, but ADDINCL for version 4
GLOBAL contrib/libs/antlr4_cpp_runtime/src
)
@@ -48,5 +47,6 @@ ENDIF()
SRCS(JsonPathParser.proto)
+EXCLUDE_TAGS(GO_PROTO JAVA_PROTO)
END()
diff --git a/ydb/library/yql/parser/proto_ast/gen/v0/epilogue.cmake b/ydb/library/yql/parser/proto_ast/gen/v0/epilogue.cmake
new file mode 100644
index 0000000000..2df9534c3e
--- /dev/null
+++ b/ydb/library/yql/parser/proto_ast/gen/v0/epilogue.cmake
@@ -0,0 +1,9 @@
+set(GRAMMAR_STRING_CORE_SINGLE "~(QUOTE_SINGLE | BACKSLASH) | (BACKSLASH .)")
+set(GRAMMAR_STRING_CORE_DOUBLE "~(QUOTE_DOUBLE | BACKSLASH) | (BACKSLASH .)")
+set(GRAMMAR_MULTILINE_COMMENT_CORE ".")
+configure_file(
+ ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
+ ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQL.g
+)
+
+
diff --git a/ydb/library/yql/parser/proto_ast/gen/v0_proto_split/epilogue.cmake b/ydb/library/yql/parser/proto_ast/gen/v0_proto_split/epilogue.cmake
new file mode 100644
index 0000000000..8c133faceb
--- /dev/null
+++ b/ydb/library/yql/parser/proto_ast/gen/v0_proto_split/epilogue.cmake
@@ -0,0 +1,9 @@
+set(GRAMMAR_STRING_CORE_SINGLE "~(QUOTE_SINGLE | BACKSLASH) | (BACKSLASH .)")
+set(GRAMMAR_STRING_CORE_DOUBLE "~(QUOTE_DOUBLE | BACKSLASH) | (BACKSLASH .)")
+set(GRAMMAR_MULTILINE_COMMENT_CORE ".")
+
+configure_file(
+ ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
+ ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0_proto_split/SQL.g
+)
+
diff --git a/ydb/ya.make b/ydb/ya.make
index fe6949637b..f407c18c8e 100644
--- a/ydb/ya.make
+++ b/ydb/ya.make
@@ -6,7 +6,12 @@ RECURSE(
mvp
public
services
- tests
tools
yql_docs
)
+
+IF(NOT EXPORT_CMAKE)
+ RECURSE(
+ tests
+ )
+ENDIF()