From 99c737133794a63d00ed887d2db5049e0918bf66 Mon Sep 17 00:00:00 2001 From: Blake Mizerany Date: Wed, 3 Sep 2014 19:47:05 -0700 Subject: [PATCH] etcdserver: use vendored gogoproto --- etcdserver/etcdserverpb/etcdserver.pb.go | 4 ++-- etcdserver/etcdserverpb/genproto.sh | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/etcdserver/etcdserverpb/etcdserver.pb.go b/etcdserver/etcdserverpb/etcdserver.pb.go index 84b0e6b71..fd9ad85c7 100644 --- a/etcdserver/etcdserverpb/etcdserver.pb.go +++ b/etcdserver/etcdserverpb/etcdserver.pb.go @@ -13,14 +13,14 @@ */ package etcdserverpb -import proto "code.google.com/p/gogoprotobuf/proto" +import proto "github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto" import json "encoding/json" import math "math" // discarding unused import gogoproto "code.google.com/p/gogoprotobuf/gogoproto/gogo.pb" import io "io" -import code_google_com_p_gogoprotobuf_proto "code.google.com/p/gogoprotobuf/proto" +import code_google_com_p_gogoprotobuf_proto "github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto" // Reference proto, json, and math imports to suppress error if they are not otherwise used. var _ = proto.Marshal diff --git a/etcdserver/etcdserverpb/genproto.sh b/etcdserver/etcdserverpb/genproto.sh index 39dc53a6c..1aabc60c2 100644 --- a/etcdserver/etcdserverpb/genproto.sh +++ b/etcdserver/etcdserverpb/genproto.sh @@ -1 +1,8 @@ -exec protoc --gogo_out=. -I=.:$GOPATH/src/code.google.com/p/gogoprotobuf/protobuf:$GOPATH/src *.proto +set -e +protoc --gogo_out=. -I=.:$GOPATH/src/code.google.com/p/gogoprotobuf/protobuf:$GOPATH/src *.proto + +prefix=github.com/coreos/etcd/third_party +sed \ + -i'.bak' \ + "s|code.google.com/p/gogoprotobuf/proto|$prefix/code.google.com/p/gogoprotobuf/proto|" *.go +rm *.bak