Browse Source

v2
40d1f0a9f746bb174ebd93119c192ba825d8545c

pg 11 months ago
parent
commit
e777f6fe50
3 changed files with 23 additions and 1 deletions
  1. 1 1
      build/conf/proto.conf
  2. 6 0
      contrib/tools/protoc/plugins/ya.make
  3. 16 0
      contrib/tools/protoc/ya.make

+ 1 - 1
build/conf/proto.conf

@@ -1,6 +1,6 @@
 # tag:tool-specific tag:proto
 PROTOC=${tool:"contrib/tools/protoc"}
-when ($PYTHON2) {
+when ($PYTHON2 == "yes") {
     PROTOC=${tool:"contrib/tools/protoc_old"}
 }
 JAVA_PROTOC=${tool:"contrib/tools/protoc"}

+ 6 - 0
contrib/tools/protoc/plugins/ya.make

@@ -0,0 +1,6 @@
+RECURSE(
+    cpp_styleguide
+    grpc_cpp
+    grpc_java
+    grpc_python
+)

+ 16 - 0
contrib/tools/protoc/ya.make

@@ -0,0 +1,16 @@
+# WARN:
+#   The Piglet sync service (abc:cc-piglet) relies on prebuiltness of protoc.
+#   DO NOT REMOVE ya.make.prebuilt.
+
+IF (USE_PREBUILT_TOOLS)
+    INCLUDE(ya.make.prebuilt)
+ENDIF()
+
+IF (NOT PREBUILT)
+    INCLUDE(bin/ya.make)
+ENDIF()
+
+RECURSE(
+    bin
+    plugins
+)