AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

merge 2.6.0 to trunk

Browse Source
This commit is contained in:
jieluo@google.com 2014-08-25 23:26:40 +00:00
parent 1eba9d9c74
commit a21bf2e646
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/README.txt
View File

@ -48,8 +48,8 @@ Installation
$ python setup.py build $ python setup.py build
$ python setup.py google_test $ python setup.py google_test
if you want to test c++ implementation, run: If you want to test c++ implementation, run:
$ python setup.py test $ python setup.py test --cpp_implementation
If some tests fail, this library may not work correctly on your If some tests fail, this library may not work correctly on your
system. Continue at your own risk. system. Continue at your own risk.
@ -66,7 +66,7 @@ Installation
$ python setup.py install $ python setup.py install
or: or:
$ python setup.py install --nocpp_implementation $ python setup.py install --cpp_implementation
This step may require superuser privileges. This step may require superuser privileges.
NOTE: To use C++ implementation, you need to install C++ protobuf runtime NOTE: To use C++ implementation, you need to install C++ protobuf runtime
@ -84,8 +84,6 @@ web at:
C++ Implementation C++ Implementation
================== ==================
WARNING: This is EXPERIMENTAL and only available for CPython platforms.
The C++ implementation for Python messages is built as a Python extension to The C++ implementation for Python messages is built as a Python extension to
improve the overall protobuf Python performance. improve the overall protobuf Python performance.

5
python/setup.py
View File

@ -138,10 +138,9 @@ class build_py(_build_py):
if __name__ == '__main__': if __name__ == '__main__':
ext_module_list = [] ext_module_list = []
nocpp = '--nocpp_implementation' cpp_impl = '--cpp_implementation'
if nocpp in sys.argv: if cpp_impl in sys.argv:
sys.argv.remove(cpp_impl) sys.argv.remove(cpp_impl)
else:
# C++ implementation extension # C++ implementation extension
ext_module_list.append(Extension( ext_module_list.append(Extension(
"google.protobuf.pyext._message", "google.protobuf.pyext._message",