Browse Source

Use old protobuf only for py2 modules
9297b1e11cb82f887ab18e3c728f647d09ee885e

mikhnenko 10 months ago
parent
commit
90a6dfc24e

+ 1 - 1
build/conf/proto.conf

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

+ 0 - 0
contrib/tools/protoc_old/main.c


+ 0 - 16
contrib/tools/protoc_old/resources.json

@@ -1,16 +0,0 @@
-{
-    "by_platform": {
-        "darwin": {
-            "uri": "sbr:5841615385"
-        },
-        "darwin-arm64": {
-            "uri": "sbr:5841614302"
-        },
-        "linux": {
-            "uri": "sbr:5841616607"
-        },
-        "win32": {
-            "uri": "sbr:5841613390"
-        }
-    }
-}

+ 0 - 1
contrib/tools/protoc_old/ya.make

@@ -1 +0,0 @@
-INCLUDE(ya.make.prebuilt)

+ 0 - 30
contrib/tools/protoc_old/ya.make.induced_deps

@@ -1,30 +0,0 @@
-INDUCED_DEPS(cpp
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/descriptor.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/generated_message_reflection.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/io/coded_stream.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/reflection_ops.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/stubs/common.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/stubs/once.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/stubs/port.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/wire_format.h
-)
-INDUCED_DEPS(h+cpp
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/arena.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/arenastring.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/extension_set.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/generated_enum_reflection.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/generated_message_bases.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/generated_message_table_driven.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/generated_message_util.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/io/coded_stream.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/map.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/map_entry.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/map_field_inl.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/message.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/metadata_lite.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/port_def.inc
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/port_undef.inc
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/repeated_field.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/stubs/common.h
-    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/unknown_field_set.h
-)

+ 0 - 20
contrib/tools/protoc_old/ya.make.prebuilt

@@ -1,20 +0,0 @@
-SET_RESOURCE_URI_FROM_JSON(SANDBOX_RESOURCE_URI resources.json)
-
-IF (SANDBOX_RESOURCE_URI != "")
-    ENABLE(PREBUILT)
-
-    PREBUILT_PROGRAM()
-
-    DECLARE_EXTERNAL_RESOURCE(PROTOC ${SANDBOX_RESOURCE_URI})
-
-    PRIMARY_OUTPUT(${PROTOC_RESOURCE_GLOBAL}/protoc${MODULE_SUFFIX})
-
-    INCLUDE(ya.make.induced_deps)
-
-    END()
-ELSE()
-    PROGRAM(protoc)
-    SRCS(main.c)
-    INCLUDE(ya.make.induced_deps)
-    END()
-ENDIF()