Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(597)

Side by Side Diff: third_party/protobuf/README.chromium

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update README.chromium Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 Name: Protocol Buffers 1 Name: Protocol Buffers
2 Short Name: protobuf 2 Short Name: protobuf
3 URL: http://protobuf.googlecode.com/svn/trunk 3 URL: https://github.com/google/protobuf
4 License: BSD 4 License: BSD
5 License File: COPYING.txt 5 License File: LICENSE
6 Version: unknown 6 Version: 3.0.0-beta-2
7 Revision: r476
8 Security Critical: yes 7 Security Critical: yes
9 8
10 Local files (not taken from upstream): 9 Steps used to create the current version:
11 README.chromium 10 1. Pull the release from https://github.com/google/protobuf/releases
12 config.h 11 2. Use the cleanup_release.sh script to remove unnecessary files.
13 descriptor2_pb.py 12 3. Add build files (BUILD.gn, proto_library.gni, protobuf.py,
13 protobuf_lite.gypi, protobuf_nacl.gyp).
14 4. Add open-source library six.py to protobuf/third_party/six/six.py
15 5. Apply patches in patches/:
14 16
15 A protobuf.gyp file has been added for building with Chromium. 17 $ for patch in patches/*; do patch -s -p1 < $patch; done
16 18
17 This code has been patched to support unknown field retention in protobuf-lite. 19 For future releases, it will be worth looking into which patches still need
18 See r62331 for the patch. 20 to be applied.
21 5. Generate descriptor_pb2.py using something like the following steps. Make
22 sure you've regenerated your buildfiles and will build protoc from the
23 newly-modified sources above.
19 24
20 This code has been patched to ensure that files in the target protobuf_lite 25 $ cd $SRC_DIR
21 do not include headers from protobuf_full. See r173228 for the patch. 26 $ ninja -C out/Debug protoc
27 $ cd third_party/protobuf/src
28 $ ../../../out/Debug/protoc --python_out=../python google/protobuf/descriptor .proto
29 $ cd ..
22 30
23 This code has been patched to make the target protobuf_lite a component so that 31 Copy the resulting descriptor_pb2.py to protobuf/.
24 targets that depend on it can be componentized. See http://crbug.com/172800 for 32 6. Add empty __init__.py to protobuf/.
25 details, and r179806 for the patch. 33 7. Update README.chromium.
26
27 Revision 504 was cherry-picked from upstream.
28 Revision 512 was cherry-picked from upstream.
29 Revision 516 was cherry-picked from upstream.
30 Revision 517 was cherry-picked from upstream.
31 Revision 522 was cherry-picked from upstream.
32 Revision 523 was cherry-picked from upstream.
33 Revision 524 was cherry-picked from upstream.
34 Revision 573 was cherry-picked from upstream.
35 The `&file->options() != NULL &&` was removed from descriptor.cc
36 References to `vector` were changed to `std::vector` in extension_set.h
37 and unknown_field_set.h
38
39 GetEmptyString() and GoogleOnceInit() have been uninlined, for a large savings
40 in binary size.
41
42 A BUILD.gn file has been added for building with GN.
43
44 Cherry-pick pherl changes to make protobuf build on VS2015.
45
46 Cherry-pick c3cb53b (fix "sometimes-uninitialized" warning).
47
48 Cherry-pick https://github.com/google/protobuf/commit/56a90a2081379a5
49
50 Cherry-pick https://github.com/google/protobuf/commit/69d660b39ceabea
51
52 Cherry-pick https://github.com/google/protobuf/commit/a74e912a8be1274
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698