Merge pull request #350 from tomwilkie/go_package

Add go_package
gogo · Nov 7, 2017 · f83204b · f83204b
2 parents 117892b + 8ddeac9
commit f83204b
Show file tree

Hide file tree

Showing 41 changed files with 10,614 additions and 10,605 deletions.
diff --git a/gogoproto/Makefile b/gogoproto/Makefile
@@ -28,7 +28,7 @@
 
 regenerate:
 	go install github.com/gogo/protobuf/protoc-gen-gogo
-	protoc --gogo_out=Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor:. --proto_path=../../../../:../protobuf/:. *.proto
+	protoc --gogo_out=Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor:../../../../ --proto_path=../../../../:../protobuf/:. *.proto
 
 restore:
 	cp gogo.pb.golden gogo.pb.go

diff --git a/gogoproto/gogo.pb.go b/gogoproto/gogo.pb.go
diff --git a/gogoproto/gogo.proto b/gogoproto/gogo.proto
@@ -33,6 +33,7 @@ import "google/protobuf/descriptor.proto";
 
 option java_package = "com.google.protobuf";
 option java_outer_classname = "GoGoProtos";
+option go_package = "github.com/gogo/protobuf/gogoproto";
 
 extend google.protobuf.EnumOptions {
 	optional bool goproto_enum_prefix = 62001;

diff --git a/jsonpb/jsonpb_test_proto/test_objects.pb.go b/jsonpb/jsonpb_test_proto/test_objects.pb.go