diff options
Diffstat (limited to 'python/setup.py')
| -rwxr-xr-x | python/setup.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/python/setup.py b/python/setup.py index a7bc6cd6..aa0dae0e 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,12 @@ 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/timestamp.proto") + generate_proto("../src/google/protobuf/duration.proto") + generate_proto("../src/google/protobuf/wrappers.proto") + generate_proto("../src/google/protobuf/struct.proto") + generate_proto("../src/google/protobuf/any.proto") + generate_proto("../src/google/protobuf/field_mask.proto") GenerateUnittestProtos() # Make sure google.protobuf/** are valid packages. |