aboutsummaryrefslogtreecommitdiff
path: root/COMPILING.md
diff options
context:
space:
mode:
authorEric Anderson <ejona@google.com>2016-05-23 12:05:41 -0700
committerEric Anderson <ejona@google.com>2016-06-28 08:58:13 -0700
commitdbef1af29a72db1ef262ee9f2ecbff8d470aa4a0 (patch)
tree598b86c5b0996267f24e2a46608a84fe7cb9fea2 /COMPILING.md
parentfe5b7e3e9bfb232742ae04f66cf6b906da1375be (diff)
downloadgrpc-grpc-java-dbef1af29a72db1ef262ee9f2ecbff8d470aa4a0.tar.gz
Bump protobuf dependency to 3.0.0-beta-3
This allows us to play with zero-copy and proto3 support for lite. Unfortunately, it introduced some warnings, so deprecated warnings are now ignored for benchmarks and interop-testing.
Diffstat (limited to 'COMPILING.md')
-rw-r--r--COMPILING.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/COMPILING.md b/COMPILING.md
index 9fd225712..f9cecca18 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-2.
+The codegen plugin is C++ code and requires protobuf 3.0.0-beta-3.
For Linux, Mac and MinGW:
```
$ git clone https://github.com/google/protobuf.git
$ cd protobuf
-$ git checkout v3.0.0-beta-2
+$ git checkout v3.0.0-beta-3
$ ./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-2\src ^
- -PvcProtobufLibs=C:\path\to\protobuf-3.0.0-beta-2\vsprojects\Release ^
+ -PvcProtobufInclude=C:\path\to\protobuf-3.0.0-beta-3\src ^
+ -PvcProtobufLibs=C:\path\to\protobuf-3.0.0-beta-3\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-2\\src
-vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0-beta-2\\vsprojects\\Release
+vcProtobufInclude=C:\\path\\to\\protobuf-3.0.0-beta-3\\src
+vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0-beta-3\\vsprojects\\Release
targetArch=x86_32
```