File tree Expand file tree Collapse file tree 4 files changed +32
-30
lines changed Expand file tree Collapse file tree 4 files changed +32
-30
lines changed Original file line number Diff line number Diff line change 11load ("@rules_go//proto:def.bzl" , "go_proto_library" )
22load ("@rules_proto//proto:defs.bzl" , "proto_library" )
3- load ("@rules_python//python:proto.bzl" , "py_proto_library" )
43
54package (default_visibility  =  ["//visibility:public" ])
65
@@ -10,12 +9,16 @@ proto_library(
109    deps  =  ["@com_google_protobuf//:any_proto" ],
1110)
1211
13- py_proto_library (
14-     name  =  "foo_py_proto" ,
15-     deps  =  [":foo_proto" ],
16- )
12+ # See comment in examples/tools/toolchains/ 
13+ # load("@rules_python//python:proto.bzl", "py_proto_library") 
14+ # py_proto_library( 
15+ #     name = "foo_py_proto", 
16+ #     deps = [":foo_proto"], 
17+ # ) 
1718
18- # See comment in examples/tools/toolchains/BUILD.bazel 
19+ # Broken by https://github.com/protocolbuffers/protobuf/pull/19679 
20+ # which causes building C++ code from source. 
21+ # TODO: re-enable once protobuf honors the toolchain 
1922# java_proto_library( 
2023#     name = "foo_java_proto", 
2124#     deps = [":foo_proto"], 
Original file line number Diff line number Diff line change 1- java_binary (
2-     name  =  "java" ,
3-     srcs  =  ["Main.java" ],
4-     main_class  =  "Main" ,
5-     deps  =  [
6-         "//:foo_java_proto" ,
7-         "@protobuf-java//jar" ,
8-     ],
9- )
1+ # See comment in examples/BUILD.bazel 
2+ # java_binary( 
3+ #     name = "java", 
4+ #     srcs = ["Main.java"], 
5+ #     main_class = "Main", 
6+ #     deps = [ 
7+ #         "//:foo_java_proto", 
8+ #         "@protobuf-java//jar", 
9+ #     ], 
10+ # ) 
Original file line number Diff line number Diff line change 1- py_test (
2-     name  =  "message_test" ,
3-     srcs  =  ["message_test.py" ],
4-     deps  =  ["//:foo_py_proto" ],
5- )
1+ # See comment in examples/BUILD.bazel 
2+ # py_test( 
3+ #     name = "message_test", 
4+ #     srcs = ["message_test.py"], 
5+ #     deps = ["//:foo_py_proto"], 
6+ # ) 
Original file line number Diff line number Diff line change @@ -19,16 +19,13 @@ proto_lang_toolchain(
1919)
2020
2121# Same as above, but for Java 
22- # Broken by https://github.com/protocolbuffers/protobuf/pull/19679 
23- # which causes building C++ code from source. 
24- # TODO: re-enable once protobuf honors the toolchain 
25- # proto_lang_toolchain( 
26- #     name = "protoc_java_toolchain", 
27- #     command_line = "--java_out=%s", 
28- #     progress_message = "Generating Java proto_library %{label}", 
29- #     runtime = "@protobuf-java//jar", 
30- #     toolchain_type = "@rules_java//java/proto:toolchain_type", 
31- # ) 
22+ proto_lang_toolchain (
23+     name  =  "protoc_java_toolchain" ,
24+     command_line  =  "--java_out=%s" ,
25+     progress_message  =  "Generating Java proto_library %{label}" ,
26+     runtime  =  "@protobuf-java//jar" ,
27+     toolchain_type  =  "@rules_java//java/proto:toolchain_type" ,
28+ )
3229
3330################ 
3431# Setup a non-functional C++ toolchain, so we're assured that no C++ compilation 
    
 
   
 
     
   
   
          
     
  
    
     
 
    
      
     
 
     
    You can’t perform that action at this time.
  
 
    
  
     
    
      
        
     
 
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments