aboutsummaryrefslogtreecommitdiff
path: root/COMPILING.md
diff options
context:
space:
mode:
authorKun Zhang <zhangkun@google.com>2015-08-28 18:47:06 -0700
committerKun Zhang <zhangkun@google.com>2015-08-31 09:26:20 -0700
commitbd23a8d69352c154d2aeee132ae5ece522223e8f (patch)
tree379a8ec34d1f85dc77ab11b0f397dc2a1a879efd /COMPILING.md
parentd678498ca7ff3ceaa9110f8778055a12f5357c0a (diff)
downloadgrpc-grpc-java-bd23a8d69352c154d2aeee132ae5ece522223e8f.tar.gz
Upgrade to protobuf-3.0.0-beta-1
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 fff734f0a..7ac36ddc6 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-alpha-3.1.
+The codegen plugin is C++ code and requires protobuf 3.0.0-beta-1.
For Linux, Mac and MinGW:
```
$ git clone https://github.com/google/protobuf.git
$ cd protobuf
-$ git checkout v3.0.0-alpha-3.1
+$ git checkout v3.0.0-beta-1
$ ./autogen.sh
$ ./configure
$ make
@@ -72,15 +72,15 @@ 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-alpha-3.1\src ^
- -PvcProtobufLibs=C:\path\to\protobuf-3.0.0-alpha-3.1\vsprojects\Release
+ -PvcProtobufInclude=C:\path\to\protobuf-3.0.0-beta-1\src ^
+ -PvcProtobufLibs=C:\path\to\protobuf-3.0.0-beta-1\vsprojects\Release
```
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-alpha-3.1\\src
-vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0-alpha-3.1\\vsprojects\\Release
+vcProtobufInclude=C:\\path\\to\\protobuf-3.0.0-beta-1\\src
+vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0-beta-1\\vsprojects\\Release
```
The build script will build the codegen for the same architecture as the Java