fix(unixfs/pb) rename proto package -> unixfs_pb
Brian Tiger Chow committed
Oct 22, 2014 at 05:13 UTC
454d1df4aad7f2a95e55647e10ff44ee8d00fa30
3 files changed
+17
-12
unixfs/pb/Makefile
+8
-3
@@ -1,5 +1,10 @@
1
-all: data.pb.go
1
+PB = $(wildcard *.proto)
2
+GO = $(PB:.proto=.pb.go)
3
3
-data.pb.go: data.proto
4
- protoc --go_out=. data.proto
4
+all: $(GO)
5
6
+%.pb.go: %.proto
7
+ protoc --gogo_out=. --proto_path=../../../../../../:/usr/local/opt/protobuf/include:. $<
8
+
9
+clean:
10
+ rm *.pb.go
unixfs/pb/unixfs.pb.go
renamed
+8
-8
@@ -1,19 +1,19 @@
1
-// Code generated by protoc-gen-go.
2
-// source: data.proto
1
+// Code generated by protoc-gen-gogo.
2
+// source: unixfs.proto
3
// DO NOT EDIT!
4
5
/*
6
-Package unixfs is a generated protocol buffer package.
6
+Package unixfs_pb is a generated protocol buffer package.
7
8
It is generated from these files:
9
- data.proto
9
+ unixfs.proto
10
11
It has these top-level messages:
12
PBData
13
*/
14
-package unixfs
14
+package unixfs_pb
15
16
-import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
16
+import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
17
import math "math"
18
19
// Reference imports to suppress errors if they are not otherwise used.
@@ -57,7 +57,7 @@ func (x *PBData_DataType) UnmarshalJSON(data []byte) error {
57
}
58
59
type PBData struct {
60
- Type *PBData_DataType `protobuf:"varint,1,req,enum=unixfs.PBData_DataType" json:"Type,omitempty"`
60
+ Type *PBData_DataType `protobuf:"varint,1,req,enum=unixfs.pb.PBData_DataType" json:"Type,omitempty"`
61
Data []byte `protobuf:"bytes,2,opt" json:"Data,omitempty"`
62
Filesize *uint64 `protobuf:"varint,3,opt,name=filesize" json:"filesize,omitempty"`
63
Blocksizes []uint64 `protobuf:"varint,4,rep,name=blocksizes" json:"blocksizes,omitempty"`
@@ -97,5 +97,5 @@ func (m *PBData) GetBlocksizes() []uint64 {
97
}
98
99
func init() {
100
- proto.RegisterEnum("unixfs.PBData_DataType", PBData_DataType_name, PBData_DataType_value)
100
+ proto.RegisterEnum("unixfs.pb.PBData_DataType", PBData_DataType_name, PBData_DataType_value)
101
}
unixfs/pb/unixfs.proto
renamed
+1
-1
@@ -1,4 +1,4 @@
1
-package unixfs;
1
+package unixfs.pb;
2
3
message PBData {
4
enum DataType {