diff options
| author | Eric Anderson <ejona@google.com> | 2016-09-27 17:15:12 -0700 |
|---|---|---|
| committer | Eric Anderson <ejona@google.com> | 2016-09-29 10:25:31 -0700 |
| commit | b1d72e5c3ecaad3351b95d74657c99e484cd496c (patch) | |
| tree | 41ddae96a97ef016c5aa4af05a46494b405fa830 /COMPILING.md | |
| parent | 34812835a80f1255d47edcdccdd625a81078ba86 (diff) | |
| download | grpc-grpc-java-b1d72e5c3ecaad3351b95d74657c99e484cd496c.tar.gz | |
all: Bump protobuf to 3.0.2, to fix protoc in CI
protoc no longer builds in 3.0.0 because auto-download of the gmock zip
now fails. 3.0.2 has a fix to autogen:
https://github.com/google/protobuf/commit/bba446bbf2ac7b0b9923d4eb07d5acd0665a8cf0
All that was strictly necessary was to update .travis.yml and
buildscripts/, but it helps our sanity to keep the rest of the protobuf
versions in sync. Lite is left on its existing version, because it did
not see a bump of neither the java library nor the protoc plugin.
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 497adb711..10935a8b3 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. +The codegen plugin is C++ code and requires protobuf 3.0.0 or later. For Linux, Mac and MinGW: ``` $ git clone https://github.com/google/protobuf.git $ cd protobuf -$ git checkout v3.0.0 +$ git checkout v3.0.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\src ^ - -PvcProtobufLibs=C:\path\to\protobuf-3.0.0\vsprojects\Release ^ + -PvcProtobufInclude=C:\path\to\protobuf-3.0.2\src ^ + -PvcProtobufLibs=C:\path\to\protobuf-3.0.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\\src -vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0\\vsprojects\\Release +vcProtobufInclude=C:\\path\\to\\protobuf-3.0.2\\src +vcProtobufLibs=C:\\path\\to\\protobuf-3.0.2\\vsprojects\\Release targetArch=x86_32 ``` |