diff options
| author | Eric Anderson <ejona@google.com> | 2016-07-25 12:42:59 -0700 |
|---|---|---|
| committer | Eric Anderson <ejona@google.com> | 2016-07-29 09:31:15 -0700 |
| commit | 5e1e88357c6141a49095110d483a11ab777a0a4f (patch) | |
| tree | 9df461066bea15592b591aa27c85ba45ef04906a /COMPILING.md | |
| parent | fccc282f25a596d3b4a886a67ca9ae0f25d5e54e (diff) | |
| download | grpc-grpc-java-5e1e88357c6141a49095110d483a11ab777a0a4f.tar.gz | |
Update protobuf to 3.0.0
Fixes #2086
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 f9cecca18..497adb711 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-3. +The codegen plugin is C++ code and requires protobuf 3.0.0. For Linux, Mac and MinGW: ``` $ git clone https://github.com/google/protobuf.git $ cd protobuf -$ git checkout v3.0.0-beta-3 +$ git checkout v3.0.0 $ ./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-3\src ^ - -PvcProtobufLibs=C:\path\to\protobuf-3.0.0-beta-3\vsprojects\Release ^ + -PvcProtobufInclude=C:\path\to\protobuf-3.0.0\src ^ + -PvcProtobufLibs=C:\path\to\protobuf-3.0.0\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-3\\src -vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0-beta-3\\vsprojects\\Release +vcProtobufInclude=C:\\path\\to\\protobuf-3.0.0\\src +vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0\\vsprojects\\Release targetArch=x86_32 ``` |