diff options
| author | Jisi Liu <liujisi@google.com> | 2015-10-07 07:46:35 -0700 |
|---|---|---|
| committer | Jisi Liu <liujisi@google.com> | 2015-10-07 07:46:35 -0700 |
| commit | 2842568f8d6759d34c0e48b428395851011597d2 (patch) | |
| tree | 29c7aebc48e0334ceff355e3b1caf40e619477d9 | |
| parent | 878b603d328697a027264c3f195df9b5981a4129 (diff) | |
| parent | f6fa5c78829c8369523a844f3ef682353594680b (diff) | |
| download | protobuf-2842568f8d6759d34c0e48b428395851011597d2.tar.gz protobuf-2842568f8d6759d34c0e48b428395851011597d2.tar.bz2 protobuf-2842568f8d6759d34c0e48b428395851011597d2.zip | |
Merge pull request #860 from pherl/master
Generate well known types for python.
| -rwxr-xr-x | python/setup.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/python/setup.py b/python/setup.py index a7bc6cd6..cda56867 100755 --- a/python/setup.py +++ b/python/setup.py @@ -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. |