AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Change default value of protoc on xx_proto_library rules.

Browse Source
This commit is contained in:
Jisi Liu 2015-10-20 15:00:13 -07:00
parent 7b948cc7c5
commit 04658a3c24
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
BUILD
View File

@ -18,8 +18,13 @@ COPTS = [
# Bazel should provide portable link_opts for pthread. # Bazel should provide portable link_opts for pthread.
LINK_OPTS = ["-lpthread"] LINK_OPTS = ["-lpthread"]
load("protobuf", "cc_proto_library", "py_proto_library", "copied_srcs", load(
"internal_protobuf_py_tests") "protobuf",
"cc_proto_library",
"py_proto_library",
"copied_srcs",
"internal_protobuf_py_tests",
)
cc_library( cc_library(
name = "protobuf_lite", name = "protobuf_lite",
@ -151,6 +156,7 @@ cc_proto_library(
include = "src", include = "src",
cc_libs = [":protobuf"], cc_libs = [":protobuf"],
internal_bootstrap_hack = 1, internal_bootstrap_hack = 1,
protoc = ":protoc",
) )
################################################################################ ################################################################################
@ -327,6 +333,7 @@ cc_proto_library(
name = "cc_test_protos", name = "cc_test_protos",
srcs = LITE_TEST_PROTOS + TEST_PROTOS, srcs = LITE_TEST_PROTOS + TEST_PROTOS,
include = "src", include = "src",
protoc = ":protoc",
deps = [":cc_wkt_protos"], deps = [":cc_wkt_protos"],
) )
@ -497,6 +504,7 @@ py_proto_library(
name = "python_proto", name = "python_proto",
srcs = WELL_KNOWN_PROTOS, srcs = WELL_KNOWN_PROTOS,
include = "src", include = "src",
protoc = ":protoc",
py_extra_srcs = [":python_srcs"], py_extra_srcs = [":python_srcs"],
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
) )
@ -516,6 +524,7 @@ py_proto_library(
name = "python_common_test_protos", name = "python_common_test_protos",
srcs = LITE_TEST_PROTOS + TEST_PROTOS, srcs = LITE_TEST_PROTOS + TEST_PROTOS,
include = "src", include = "src",
protoc = ":protoc",
deps = [":python_proto"], deps = [":python_proto"],
) )
@ -523,6 +532,7 @@ py_proto_library(
name = "python_specific_test_protos", name = "python_specific_test_protos",
srcs = glob(["python/google/protobuf/internal/*.proto"]), srcs = glob(["python/google/protobuf/internal/*.proto"]),
include = "python", include = "python",
protoc = ":protoc",
deps = [":python_common_test_protos"], deps = [":python_common_test_protos"],
) )

4
protobuf.bzl
View File

@ -95,7 +95,7 @@ def cc_proto_library(
deps=[], deps=[],
cc_libs=[], cc_libs=[],
include=None, include=None,
protoc=":protoc", protoc="//google/protobuf:protoc",
internal_bootstrap_hack=False, internal_bootstrap_hack=False,
**kargs): **kargs):
"""Bazel rule to create a C++ protobuf library from proto source files """Bazel rule to create a C++ protobuf library from proto source files
@ -192,7 +192,7 @@ def py_proto_library(
py_libs=[], py_libs=[],
py_extra_srcs=[], py_extra_srcs=[],
include=None, include=None,
protoc=":protoc", protoc="//google/protobuf:protoc",
**kargs): **kargs):
"""Bazel rule to create a Python protobuf library from proto source files """Bazel rule to create a Python protobuf library from proto source files