Ydb stable 22-4-2122.4.21

x-stable-origin-commit: e89099581237299a132feafb5b58af59ebd0468a

10 files changed, 23 insertions, 129 deletions

diff --git a/contrib/tools/protoc/CMakeLists.txt b/contrib/tools/protoc/CMakeLists.txt
new file mode 100644
index 0000000000..5b078f6e25
--- /dev/null
+++ b/contrib/tools/protoc/CMakeLists.txt
@@ -0,0 +1,10 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(bin)
+add_subdirectory(plugins)
diff --git a/contrib/tools/protoc/bin/CMakeLists.txt b/contrib/tools/protoc/bin/CMakeLists.txt
index fc7b1ee73c..dbfe6fa2c4 100644
--- a/contrib/tools/protoc/bin/CMakeLists.txt
+++ b/contrib/tools/protoc/bin/CMakeLists.txt
@@ -8,6 +8,6 @@
 
 if (APPLE)
   include(CMakeLists.darwin.txt)
-elseif (UNIX AND NOT APPLE)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE)
   include(CMakeLists.linux.txt)
 endif()
diff --git a/contrib/tools/protoc/bin/ya.make b/contrib/tools/protoc/bin/ya.make
deleted file mode 100644
index f9e74f5e4c..0000000000
--- a/contrib/tools/protoc/bin/ya.make
+++ /dev/null
@@ -1,26 +0,0 @@
-PROGRAM(protoc)
-
-OWNER(
-    velavokr
-    g:contrib
-    g:cpp-contrib
-)
-
-LICENSE(BSD-3-Clause)
-
-NO_COMPILER_WARNINGS()
-
-PEERDIR(
-    contrib/libs/protoc
-)
-SRCDIR(
-    contrib/libs/protoc
-)
-
-SRCS(
-    src/google/protobuf/compiler/main.cc
-)
-
-INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/ya.make.induced_deps)
-
-END()
diff --git a/contrib/tools/protoc/plugins/CMakeLists.txt b/contrib/tools/protoc/plugins/CMakeLists.txt
new file mode 100644
index 0000000000..27af5d725b
--- /dev/null
+++ b/contrib/tools/protoc/plugins/CMakeLists.txt
@@ -0,0 +1,10 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(cpp_styleguide)
+add_subdirectory(grpc_cpp)
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt
index fc7b1ee73c..dbfe6fa2c4 100644
--- a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt
@@ -8,6 +8,6 @@
 
 if (APPLE)
   include(CMakeLists.darwin.txt)
-elseif (UNIX AND NOT APPLE)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE)
   include(CMakeLists.linux.txt)
 endif()
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/bin/ya.make b/contrib/tools/protoc/plugins/cpp_styleguide/bin/ya.make
deleted file mode 100644
index e8f7558208..0000000000
--- a/contrib/tools/protoc/plugins/cpp_styleguide/bin/ya.make
+++ /dev/null
@@ -1,21 +0,0 @@
-OWNER(g:contrib)
-
-PROGRAM(cpp_styleguide)
-
-NO_COMPILER_WARNINGS()
-
-PEERDIR(
-    contrib/libs/protoc
-)
-
-SRCS(
-    cpp_styleguide.cpp
-)
-
-SRCDIR(
-    contrib/tools/protoc/plugins/cpp_styleguide
-)
-
-INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/plugins/cpp_styleguide/ya.make.induced_deps)
-
-END()
diff --git a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.txt b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.txt
index fc7b1ee73c..dbfe6fa2c4 100644
--- a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.txt
+++ b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.txt
@@ -8,6 +8,6 @@
 
 if (APPLE)
   include(CMakeLists.darwin.txt)
-elseif (UNIX AND NOT APPLE)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE)
   include(CMakeLists.linux.txt)
 endif()
diff --git a/contrib/tools/protoc/plugins/grpc_cpp/bin/ya.make b/contrib/tools/protoc/plugins/grpc_cpp/bin/ya.make
deleted file mode 100644
index f2181ce63a..0000000000
--- a/contrib/tools/protoc/plugins/grpc_cpp/bin/ya.make
+++ /dev/null
@@ -1,30 +0,0 @@
-OWNER(akastornov g:contrib g:cpp-contrib)
-
-PROGRAM(grpc_cpp)
-
-LICENSE(Apache-2.0)
-
-PEERDIR(
-    contrib/libs/grpc/src/compiler/grpc_plugin_support
-)
-
-ADDINCL(
-    contrib/libs/grpc
-    contrib/libs/grpc/include
-)
-
-NO_COMPILER_WARNINGS()
-
-CFLAGS(
-    -DGRPC_USE_ABSL=0
-)
-
-SRCDIR(contrib/libs/grpc/src/compiler)
-
-SRCS(
-    cpp_plugin.cc
-)
-
-INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/plugins/grpc_cpp/ya.make.induced_deps)
-
-END()
diff --git a/contrib/tools/protoc/plugins/grpc_java/bin/ya.make b/contrib/tools/protoc/plugins/grpc_java/bin/ya.make
deleted file mode 100644
index b5da57408c..0000000000
--- a/contrib/tools/protoc/plugins/grpc_java/bin/ya.make
+++ /dev/null
@@ -1,21 +0,0 @@
-OWNER(
-    akastornov
-    g:contrib
-)
-
-PROGRAM(grpc_java)
-
-NO_COMPILER_WARNINGS()
-
-PEERDIR(
-    contrib/libs/protoc
-)
-
-SRCDIR(contrib/libs/grpc-java/compiler/src/java_plugin/cpp)
-
-SRCS(
-    java_plugin.cpp
-    java_generator.cpp
-)
-
-END()
diff --git a/contrib/tools/protoc/plugins/grpc_python/bin/ya.make b/contrib/tools/protoc/plugins/grpc_python/bin/ya.make
deleted file mode 100644
index bd0f6a3b48..0000000000
--- a/contrib/tools/protoc/plugins/grpc_python/bin/ya.make
+++ /dev/null
@@ -1,28 +0,0 @@
-OWNER(akastornov g:contrib g:cpp-contrib)
-
-PROGRAM(grpc_python)
-
-LICENSE(Apache-2.0)
-
-PEERDIR(
-    contrib/libs/grpc/src/compiler/grpc_plugin_support
-)
-
-ADDINCL(
-    contrib/libs/grpc
-    contrib/libs/grpc/include
-)
-
-NO_COMPILER_WARNINGS()
-
-CFLAGS(
-    -DGRPC_USE_ABSL=0
-)
-
-SRCDIR(contrib/libs/grpc/src/compiler)
-
-SRCS(
-    python_plugin.cc
-)
-
-END()