diff options
| author | Bo Yang <teboring@google.com> | 2016-12-27 11:10:37 -0800 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2016-12-28 10:56:57 -0800 |
| commit | e230283f75da104b78a9c34be719adaac80d9428 (patch) | |
| tree | ceb5fab52699ff6f482064aa3d782966c50ed769 | |
| parent | 117f7716414bb0826ad4b78d9b27f30e6f8e2e24 (diff) | |
| download | protobuf-e230283f75da104b78a9c34be719adaac80d9428.tar.gz protobuf-e230283f75da104b78a9c34be719adaac80d9428.tar.bz2 protobuf-e230283f75da104b78a9c34be719adaac80d9428.zip | |
Add new js file in extra dist.
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rwxr-xr-x | python/setup.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 4ece5217..0afbcdb4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -819,6 +819,7 @@ js_EXTRA_DIST= \ js/binary/decoder.js \ js/binary/decoder_test.js \ js/binary/encoder.js \ + js/binary/message_test.js \ js/binary/proto_test.js \ js/binary/reader.js \ js/binary/reader_test.js \ diff --git a/python/setup.py b/python/setup.py index 1683674e..64e318f1 100755 --- a/python/setup.py +++ b/python/setup.py @@ -191,10 +191,10 @@ if __name__ == '__main__': extra_compile_args.append('-Wno-shorten-64-to-32') v, _, _ = platform.mac_ver() - if not v: + if v: v = float('.'.join(v.split('.')[:2])) if v >= 10.12: - extra_compile_args=['-std=c++11'], + extra_compile_args.append('-std=c++11') if warnings_as_errors in sys.argv: extra_compile_args.append('-Werror') |