Skip to content

P
protobuf
Commit 2842568f authored by Jisi Liu's avatar Jisi Liu
Browse files
Options

Merge pull request #860 from pherl/master 

Generate well known types for python.
parents 878b603d f6fa5c78
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 8 deletions
python/setup.py
View file @ 2842568f
......@@ -88,14 +88,6 @@ def GenerateUnittestProtos():
generate_proto("../src/google/protobuf/unittest_mset_wire_format.proto", False)
generate_proto("../src/google/protobuf/unittest_no_generic_services.proto", False)
generate_proto("../src/google/protobuf/unittest_proto3_arena.proto", False)
# Move the well-known-types proto to required when they are no longer only
# required by json format tests.
generate_proto("../src/google/protobuf/timestamp.proto", False)
generate_proto("../src/google/protobuf/duration.proto", False)
generate_proto("../src/google/protobuf/wrappers.proto", False)
generate_proto("../src/google/protobuf/struct.proto", False)
generate_proto("../src/google/protobuf/any.proto", False)
generate_proto("../src/google/protobuf/field_mask.proto", False)
generate_proto("../src/google/protobuf/util/json_format_proto3.proto", False)
generate_proto("google/protobuf/internal/descriptor_pool_test1.proto", False)
generate_proto("google/protobuf/internal/descriptor_pool_test2.proto", False)
......@@ -131,6 +123,16 @@ class build_py(_build_py):
# Generate necessary .proto file if it doesn't exist.
generate_proto("../src/google/protobuf/descriptor.proto")
generate_proto("../src/google/protobuf/compiler/plugin.proto")
generate_proto("../src/google/protobuf/any.proto")
generate_proto("../src/google/protobuf/api.proto")
generate_proto("../src/google/protobuf/duration.proto")
generate_proto("../src/google/protobuf/empty.proto")
generate_proto("../src/google/protobuf/field_mask.proto")
generate_proto("../src/google/protobuf/source_context.proto")
generate_proto("../src/google/protobuf/struct.proto")
generate_proto("../src/google/protobuf/timestamp.proto")
generate_proto("../src/google/protobuf/type.proto")
generate_proto("../src/google/protobuf/wrappers.proto")
GenerateUnittestProtos()
# Make sure google.protobuf/** are valid packages.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment