diff options
author | Josh Haberman <jhaberman@gmail.com> | 2015-02-25 20:17:32 -0800 |
---|---|---|
committer | Josh Haberman <jhaberman@gmail.com> | 2015-02-25 20:17:32 -0800 |
commit | 0b70a43736fe070bee49141d493c74079ea68f97 (patch) | |
tree | 678b53cbc408c7520d893a8e0f705103c9f05608 /Makefile.am | |
parent | ada65567852b96fdb4d070c0c3f86ca7b77824f9 (diff) | |
download | protobuf-0b70a43736fe070bee49141d493c74079ea68f97.tar.gz protobuf-0b70a43736fe070bee49141d493c74079ea68f97.tar.bz2 protobuf-0b70a43736fe070bee49141d493c74079ea68f97.zip |
Fixes for Python/C++ implementation in open-source:
* Rosy hack doesn't apply (that test should be removed
for the open-source release).
* Added our own copy of parameterized.py (the open-source
version of Google Apputils doesn't contain it).
* The C++ Descriptor object didn't implement extension_ranges.
* Had to implement a hack around returning EncodeError, to
work around the module-loading behavior of the test runner.
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 1c64b710..de8ad96d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -197,7 +197,6 @@ javanano_EXTRA_DIST= python_EXTRA_DIST= \ python/google/protobuf/internal/api_implementation.cc \ python/google/protobuf/internal/api_implementation.py \ - python/google/protobuf/internal/api_implementation_default_test.py \ python/google/protobuf/internal/containers.py \ python/google/protobuf/internal/cpp_message.py \ python/google/protobuf/internal/decoder.py \ @@ -221,6 +220,7 @@ python_EXTRA_DIST= \ python/google/protobuf/internal/more_extensions.proto \ python/google/protobuf/internal/more_extensions_dynamic.proto \ python/google/protobuf/internal/more_messages.proto \ + python/google/protobuf/internal/_parameterized.py \ python/google/protobuf/internal/proto_builder_test.py \ python/google/protobuf/internal/python_message.py \ python/google/protobuf/internal/reflection_test.py \ @@ -242,16 +242,17 @@ python_EXTRA_DIST= \ python/google/protobuf/pyext/cpp_message.py \ python/google/protobuf/pyext/descriptor.h \ python/google/protobuf/pyext/descriptor.cc \ - python/google/protobuf/pyext/descriptor_cpp2_test.py \ + python/google/protobuf/pyext/descriptor_pool.h \ + python/google/protobuf/pyext/descriptor_pool.cc \ + python/google/protobuf/pyext/descriptor_containers.h \ + python/google/protobuf/pyext/descriptor_containers.cc \ python/google/protobuf/pyext/extension_dict.h \ python/google/protobuf/pyext/extension_dict.cc \ python/google/protobuf/pyext/message.h \ python/google/protobuf/pyext/message.cc \ - python/google/protobuf/pyext/message_factory_cpp2_test.py \ python/google/protobuf/pyext/proto2_api_test.proto \ python/google/protobuf/pyext/python.proto \ python/google/protobuf/pyext/python_protobuf.h \ - python/google/protobuf/pyext/reflection_cpp2_generated_test.py \ python/google/protobuf/pyext/repeated_composite_container.h \ python/google/protobuf/pyext/repeated_composite_container.cc \ python/google/protobuf/pyext/repeated_scalar_container.h \ |