diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2015-10-05 11:59:43 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-10-05 11:59:43 -0700 |
| commit | 46e8ff63cb67a6520711da5317aaaef04d0414d0 (patch) | |
| tree | 64370726fe469f8dfca7b14f8b8cb80b6cc856f6 /python/setup.py | |
| parent | 0087da9d4775f79c67362cc89c653f3a33a9bae2 (diff) | |
Down-integrate from google internal.
Diffstat (limited to 'python/setup.py')
| -rwxr-xr-x | python/setup.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/python/setup.py b/python/setup.py index 8269c4a5..a7bc6cd6 100755 --- a/python/setup.py +++ b/python/setup.py @@ -88,6 +88,15 @@ 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) generate_proto("google/protobuf/internal/factory_test1.proto", False) |