From 814558306eda665b4f33fc5455cd02ad30ad1ee2 Mon Sep 17 00:00:00 2001 From: Blake Mizerany Date: Wed, 3 Sep 2014 15:46:01 -0700 Subject: [PATCH 1/3] raft: coerce import gogoproto from third_party --- raft/raftpb/genproto.sh | 9 ++++++++- raft/raftpb/raft.pb.go | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/raft/raftpb/genproto.sh b/raft/raftpb/genproto.sh index 39dc53a6c..1aabc60c2 100755 --- a/raft/raftpb/genproto.sh +++ b/raft/raftpb/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 diff --git a/raft/raftpb/raft.pb.go b/raft/raftpb/raft.pb.go index 482afbc6e..1be37ef4d 100644 --- a/raft/raftpb/raft.pb.go +++ b/raft/raftpb/raft.pb.go @@ -17,14 +17,14 @@ */ package raftpb -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 From 10b73418cfcea82c217abd826bbce6faad4c08fc Mon Sep 17 00:00:00 2001 From: Blake Mizerany Date: Wed, 3 Sep 2014 16:00:42 -0700 Subject: [PATCH 2/3] wal: coerce import gogoproto from third_party --- wal/genproto.sh | 8 ++++++++ wal/record.pb.go | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100755 wal/genproto.sh diff --git a/wal/genproto.sh b/wal/genproto.sh new file mode 100755 index 000000000..1aabc60c2 --- /dev/null +++ b/wal/genproto.sh @@ -0,0 +1,8 @@ +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 diff --git a/wal/record.pb.go b/wal/record.pb.go index c70e04ee5..b4fab1f21 100644 --- a/wal/record.pb.go +++ b/wal/record.pb.go @@ -13,14 +13,14 @@ */ package wal -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 From 3aa90b32f9c7841f73c1e93daff427d872b06fb2 Mon Sep 17 00:00:00 2001 From: Blake Mizerany Date: Wed, 3 Sep 2014 16:01:18 -0700 Subject: [PATCH 3/3] snap: coerce import gogoproto from third_party --- snap/genproto.sh | 8 ++++++++ snap/snap.pb.go | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100755 snap/genproto.sh diff --git a/snap/genproto.sh b/snap/genproto.sh new file mode 100755 index 000000000..1aabc60c2 --- /dev/null +++ b/snap/genproto.sh @@ -0,0 +1,8 @@ +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 diff --git a/snap/snap.pb.go b/snap/snap.pb.go index 763b6de3b..c5fc0a423 100644 --- a/snap/snap.pb.go +++ b/snap/snap.pb.go @@ -13,14 +13,14 @@ */ package snap -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