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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: third_party/protobuf/README.chromium
diff --git a/third_party/protobuf/README.chromium b/third_party/protobuf/README.chromium
index 507037960d0eb6407c29d9cf03cfd189f57c717d..9a874315b7441a6c0302b1615de39ebbf9bbe194 100644
--- a/third_party/protobuf/README.chromium
+++ b/third_party/protobuf/README.chromium
@@ -1,52 +1,33 @@
Name: Protocol Buffers
Short Name: protobuf
-URL: http://protobuf.googlecode.com/svn/trunk
+URL: https://github.com/google/protobuf
License: BSD
-License File: COPYING.txt
-Version: unknown
-Revision: r476
+License File: LICENSE
+Version: 3.0.0-beta-2
Security Critical: yes
-Local files (not taken from upstream):
-README.chromium
-config.h
-descriptor2_pb.py
-
-A protobuf.gyp file has been added for building with Chromium.
-
-This code has been patched to support unknown field retention in protobuf-lite.
-See r62331 for the patch.
-
-This code has been patched to ensure that files in the target protobuf_lite
-do not include headers from protobuf_full. See r173228 for the patch.
-
-This code has been patched to make the target protobuf_lite a component so that
-targets that depend on it can be componentized. See http://crbug.com/172800 for
-details, and r179806 for the patch.
-
-Revision 504 was cherry-picked from upstream.
-Revision 512 was cherry-picked from upstream.
-Revision 516 was cherry-picked from upstream.
-Revision 517 was cherry-picked from upstream.
-Revision 522 was cherry-picked from upstream.
-Revision 523 was cherry-picked from upstream.
-Revision 524 was cherry-picked from upstream.
-Revision 573 was cherry-picked from upstream.
-The `&file->options() != NULL &&` was removed from descriptor.cc
-References to `vector` were changed to `std::vector` in extension_set.h
-and unknown_field_set.h
-
-GetEmptyString() and GoogleOnceInit() have been uninlined, for a large savings
-in binary size.
-
-A BUILD.gn file has been added for building with GN.
-
-Cherry-pick pherl changes to make protobuf build on VS2015.
-
-Cherry-pick c3cb53b (fix "sometimes-uninitialized" warning).
-
-Cherry-pick https://github.com/google/protobuf/commit/56a90a2081379a5
-
-Cherry-pick https://github.com/google/protobuf/commit/69d660b39ceabea
-
-Cherry-pick https://github.com/google/protobuf/commit/a74e912a8be1274
+Steps used to create the current version:
+1. Pull the release from https://github.com/google/protobuf/releases
+2. Use the cleanup_release.sh script to remove unnecessary files.
+3. Add build files (BUILD.gn, proto_library.gni, protobuf.py,
+ protobuf_lite.gypi, protobuf_nacl.gyp).
+4. Add open-source library six.py to protobuf/third_party/six/six.py
+5. Apply patches in patches/:
+
+ $ for patch in patches/*; do patch -s -p1 < $patch; done
+
+ For future releases, it will be worth looking into which patches still need
+ to be applied.
+5. Generate descriptor_pb2.py using something like the following steps. Make
+ sure you've regenerated your buildfiles and will build protoc from the
+ newly-modified sources above.
+
+ $ cd $SRC_DIR
+ $ ninja -C out/Debug protoc
+ $ cd third_party/protobuf/src
+ $ ../../../out/Debug/protoc --python_out=../python google/protobuf/descriptor.proto
+ $ cd ..
+
+ Copy the resulting descriptor_pb2.py to protobuf/.
+6. Add empty __init__.py to protobuf/.
+7. Update README.chromium.

Powered by Google App Engine
This is Rietveld 408576698