Skip to content

Commit

Permalink
scripts: update gogo/protobuf, use 'gofast' plugin
Browse files Browse the repository at this point in the history
- Fix etcd-io#5942
- Partial fix for etcd-io#5865
  • Loading branch information
gyuho committed Jul 18, 2016
1 parent 336e4f2 commit 6e53f75
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/genproto.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fi
DIRS="./wal/walpb ./etcdserver/etcdserverpb ./snap/snappb ./raft/raftpb ./mvcc/mvccpb ./lease/leasepb ./auth/authpb"

# exact version of protoc-gen-gogo to build
GOGO_PROTO_SHA="2752d97bbd91927dd1c43296dbf8700e50e2708c"
GOGO_PROTO_SHA="5f813990bfffa3c2f4414dbea480e705ab280358"
GRPC_GATEWAY_SHA="f52d055dc48aec25854ed7d31862f78913cf17d1"

# set up self-contained GOPATH for building
Expand Down Expand Up @@ -57,7 +57,7 @@ popd

for dir in ${DIRS}; do
pushd ${dir}
protoc --gogofast_out=plugins=grpc,import_prefix=github.com/coreos/:. -I=.:"${GOGOPROTO_PATH}":"${COREOS_ROOT}":"${GRPC_GATEWAY_ROOT}/third_party/googleapis" *.proto
protoc --gofast_out=plugins=grpc,import_prefix=github.com/coreos/:. -I=.:"${GOGOPROTO_PATH}":"${COREOS_ROOT}":"${GRPC_GATEWAY_ROOT}/third_party/googleapis" *.proto
sed -i.bak -E "s/github\.com\/coreos\/(gogoproto|github\.com|golang\.org|google\.golang\.org)/\1/g" *.pb.go
sed -i.bak -E 's/github\.com\/coreos\/(errors|fmt|io)/\1/g' *.pb.go
sed -i.bak -E 's/import _ \"gogoproto\"//g' *.pb.go
Expand Down

0 comments on commit 6e53f75

Please sign in to comment.