diff options
| author | Kun Zhang <zhangkun@google.com> | 2016-01-27 08:26:19 -0800 |
|---|---|---|
| committer | Kun Zhang <zhangkun@google.com> | 2016-01-27 23:32:01 -0800 |
| commit | e2ed2e8f038a2360b3d191c181e57fd0375d2a5f (patch) | |
| tree | 8c3df67e2ae7eb628b1738d7e25b55ac14ab3617 /COMPILING.md | |
| parent | b7c4e18dcd00c8099ba6869d8e87d5825c50990a (diff) | |
| download | grpc-grpc-java-e2ed2e8f038a2360b3d191c181e57fd0375d2a5f.tar.gz | |
Upgrade to protobuf-3.0.0-beta-2 and protobuf-nano-3.0.0-alpha-5
Update option name that disables protobuf tests.
Diffstat (limited to 'COMPILING.md')
| -rw-r--r-- | COMPILING.md | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/COMPILING.md b/COMPILING.md index fd7251a9c..9fd225712 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -27,13 +27,13 @@ This section is only necessary if you are making changes to the code generation. Most users only need to use `skipCodegen=true` as discussed above. ### Build Protobuf -The codegen plugin is C++ code and requires protobuf 3.0.0-beta-1. +The codegen plugin is C++ code and requires protobuf 3.0.0-beta-2. For Linux, Mac and MinGW: ``` $ git clone https://github.com/google/protobuf.git $ cd protobuf -$ git checkout v3.0.0-beta-1 +$ git checkout v3.0.0-beta-2 $ ./autogen.sh $ ./configure $ make @@ -72,16 +72,16 @@ When building on Windows and VC++, you need to specify project properties for Gradle to find protobuf: ``` .\gradlew install ^ - -PvcProtobufInclude=C:\path\to\protobuf-3.0.0-beta-1\src ^ - -PvcProtobufLibs=C:\path\to\protobuf-3.0.0-beta-1\vsprojects\Release ^ + -PvcProtobufInclude=C:\path\to\protobuf-3.0.0-beta-2\src ^ + -PvcProtobufLibs=C:\path\to\protobuf-3.0.0-beta-2\vsprojects\Release ^ -PtargetArch=x86_32 ``` Since specifying those properties every build is bothersome, you can instead create ``<project-root>\gradle.properties`` with contents like: ``` -vcProtobufInclude=C:\\path\\to\\protobuf-3.0.0-beta-1\\src -vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0-beta-1\\vsprojects\\Release +vcProtobufInclude=C:\\path\\to\\protobuf-3.0.0-beta-2\\src +vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0-beta-2\\vsprojects\\Release targetArch=x86_32 ``` |