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

Unified Diff: third_party/protobuf/src/README.md

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: owners Created 4 years, 7 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
« no previous file with comments | « third_party/protobuf/src/Makefile.am ('k') | third_party/protobuf/src/google/protobuf/any.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/src/README.md
diff --git a/third_party/protobuf/README.md b/third_party/protobuf/src/README.md
similarity index 84%
copy from third_party/protobuf/README.md
copy to third_party/protobuf/src/README.md
index a974d30185f5249658711306c1f96c54c59b349a..63d6e24cceffa47150e74ba32731e17e8d2a28fa 100644
--- a/third_party/protobuf/README.md
+++ b/third_party/protobuf/src/README.md
@@ -10,6 +10,23 @@ https://developers.google.com/protocol-buffers/
C++ Installation - Unix
-----------------------
+To build protobuf from source, the following tools are needed:
+
+ * autoconf
+ * automake
+ * libtool
+ * curl (used to download gmock)
+ * make
+ * g++
+ * unzip
+
+On Ubuntu, you can install them with:
+
+ $ sudo apt-get install autoconf automake libtool curl make g++ unzip
+
+On other platforms, please use the corresponding package managing tool to
+install them before proceeding.
+
If you get the source from github, you need to generate the configure script
first:
@@ -28,15 +45,17 @@ Buffer compiler (protoc) execute the following:
$ ./configure
$ make
$ make check
- $ make install
+ $ sudo make install
+ $ sudo ldconfig # refresh shared library cache.
If "make check" fails, you can still install, but it is likely that
some features of this library will not work correctly on your system.
Proceed at your own risk.
-"make install" may require superuser privileges.
+For advanced usage information on configure and make, please refer to the
+autoconf documentation:
-For advanced usage information on configure and make, see INSTALL.txt.
+ http://www.gnu.org/software/autoconf/manual/autoconf.html#Running-configure-Scripts
**Hint on install location**
@@ -156,9 +175,18 @@ For advanced usage information on configure and make, see INSTALL.txt.
C++ Installation - Windows
--------------------------
-If you are using Microsoft Visual C++, see cmake/README.md.
+If you only need the protoc binary, you can download it from the release
+page:
+
+ https://github.com/google/protobuf/releases
-If you are using Cygwin or MinGW, follow the Unix installation
+In the downloads section, download the zip file protoc-$VERSION-win32.zip.
+It contains the protoc binary as well as public proto files of protobuf
+library.
+
+To build from source using Microsoft Visual C++, see [cmake/README.md](../cmake/README.md).
+
+To build from source using Cygwin or MinGW, follow the Unix installation
instructions, above.
Binary Compatibility Warning
@@ -175,15 +203,6 @@ static libraries only using:
./configure --disable-shared
-Java and Python Installation
-----------------------------
-
-The Java and Python runtime libraries for Protocol Buffers are located
-in the java and python directories. See the README file in each
-directory for more information on how to compile and install them.
-Note that both of them require you to first install the Protocol
-Buffer compiler (protoc), which is part of the C++ package.
-
Usage
-----
« no previous file with comments | « third_party/protobuf/src/Makefile.am ('k') | third_party/protobuf/src/google/protobuf/any.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698