diff options
| author | Jisi Liu <liujisi@google.com> | 2015-10-06 14:13:01 -0700 |
|---|---|---|
| committer | Jisi Liu <liujisi@google.com> | 2015-10-06 14:13:01 -0700 |
| commit | 878b603d328697a027264c3f195df9b5981a4129 (patch) | |
| tree | af429ac9c51f94bb0078caca3e75b6a590edfb30 /python/setup.py | |
| parent | 9cafa201224e6699d247e8e8193319303df38a34 (diff) | |
| parent | 5f6a1d3dbbd21b490bd5e429c7582950e29b3198 (diff) | |
| download | protobuf-878b603d328697a027264c3f195df9b5981a4129.tar.gz protobuf-878b603d328697a027264c3f195df9b5981a4129.tar.bz2 protobuf-878b603d328697a027264c3f195df9b5981a4129.zip | |
Merge pull request #849 from pherl/master
Integrate google internal changes.
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) |