Skip to content

Commit bd23a8d

Browse files
zhangkun83zhangkun83
committed
Upgrade to protobuf-3.0.0-beta-1
1 parent d678498 commit bd23a8d

40 files changed

Lines changed: 438 additions & 459 deletions

‎.travis.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ language: java
44

55
env:
66
global:
7-
- LDFLAGS=-L/tmp/proto3-a3/lib
8-
- CXXFLAGS=-I/tmp/proto3-a3/include
9-
- LD_LIBRARY_PATH=/tmp/proto3-a3/lib
10-
- PATH=/tmp/proto3-a3/bin:$PATH
7+
- PROTOBUF_VERSION=3.0.0-beta-1
8+
- LDFLAGS=-L/tmp/protobuf-${PROTOBUF_VERSION}/lib
9+
- CXXFLAGS=-I/tmp/protobuf-${PROTOBUF_VERSION}/include
10+
- LD_LIBRARY_PATH=/tmp/protobuf-${PROTOBUF_VERSION}/lib
1111

1212
before_install:
13-
- buildscripts/make_dependencies.sh # build protoc into /tmp/proto3-a3
13+
- buildscripts/make_dependencies.sh # build protoc into /tmp/protobuf-${PROTOBUF_VERSION}
1414
- mkdir -p $HOME/.gradle
1515
- echo "checkstyle.ignoreFailures=false" >> $HOME/.gradle/gradle.properties
1616

@@ -31,7 +31,7 @@ notifications:
3131

3232
cache:
3333
directories:
34-
- /tmp/proto3-a3
34+
- /tmp/protobuf-${PROTOBUF_VERSION}
3535
- $HOME/.m2/repository/io/netty
3636
- $HOME/.gradle/caches/modules-2
3737
- $HOME/.gradle/wrapper

‎COMPILING.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ This section is only necessary if you are making changes to the code
2727
generation. Most users only need to use `skipCodegen=true` as discussed above.
2828

2929
### Build Protobuf
30-
The codegen plugin is C++ code and requires protobuf 3.0.0-alpha-3.1.
30+
The codegen plugin is C++ code and requires protobuf 3.0.0-beta-1.
3131

3232
For Linux, Mac and MinGW:
3333
```
3434
$ git clone https://github.com/google/protobuf.git
3535
$ cd protobuf
36-
$ git checkout v3.0.0-alpha-3.1
36+
$ git checkout v3.0.0-beta-1
3737
$ ./autogen.sh
3838
$ ./configure
3939
$ make
@@ -72,15 +72,15 @@ When building on Windows and VC++, you need to specify project properties for
7272
Gradle to find protobuf:
7373
```
7474
.\gradlew install ^
75-
-PvcProtobufInclude=C:\path\to\protobuf-3.0.0-alpha-3.1\src ^
76-
-PvcProtobufLibs=C:\path\to\protobuf-3.0.0-alpha-3.1\vsprojects\Release
75+
-PvcProtobufInclude=C:\path\to\protobuf-3.0.0-beta-1\src ^
76+
-PvcProtobufLibs=C:\path\to\protobuf-3.0.0-beta-1\vsprojects\Release
7777
```
7878

7979
Since specifying those properties every build is bothersome, you can instead
8080
create ``<project-root>\gradle.properties`` with contents like:
8181
```
82-
vcProtobufInclude=C:\\path\\to\\protobuf-3.0.0-alpha-3.1\\src
83-
vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0-alpha-3.1\\vsprojects\\Release
82+
vcProtobufInclude=C:\\path\\to\\protobuf-3.0.0-beta-1\\src
83+
vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0-beta-1\\vsprojects\\Release
8484
```
8585

8686
The build script will build the codegen for the same architecture as the Java

‎benchmarks/src/generated/main/java/io/grpc/testing/ClientArgs.java‎

Lines changed: 9 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎benchmarks/src/generated/main/java/io/grpc/testing/ClientArgsOrBuilder.java‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎benchmarks/src/generated/main/java/io/grpc/testing/ClientConfig.java‎

Lines changed: 11 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎benchmarks/src/generated/main/java/io/grpc/testing/ClientStats.java‎

Lines changed: 6 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎benchmarks/src/generated/main/java/io/grpc/testing/ClientStatus.java‎

Lines changed: 6 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎benchmarks/src/generated/main/java/io/grpc/testing/ClientType.java‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎benchmarks/src/generated/main/java/io/grpc/testing/HistogramData.java‎

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎benchmarks/src/generated/main/java/io/grpc/testing/Mark.java‎

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)