nodep

gogoproto/gogo.proto

@@ -66,6 +66,7 @@ extend google.protobuf.FileOptions {
 
 	optional bool goproto_extensions_map_all = 63025;
 	optional bool goproto_unrecognized_all = 63026;
+	optional bool gogoproto_import = 63027;
 }
 
 extend google.protobuf.MessageOptions {

gogoproto/helper.go

@@ -193,3 +193,7 @@ func HasUnrecognized(file *google_protobuf.FileDescriptorProto, message *google_
 func IsProto3(file *google_protobuf.FileDescriptorProto) bool {
 	return file.GetSyntax() == "proto3"
 }
+
+func ImportsGoGoProto(file *google_protobuf.FileDescriptorProto) bool {
+	return proto.GetBoolExtension(file.Options, E_GogoprotoImport, true)
+}

plugin/equal/equaltest.go

@@ -46,6 +46,9 @@ func (p *test) Generate(imports generator.PluginImports, file *generator.FileDes
 	timePkg := imports.NewImport("time")
 	testingPkg := imports.NewImport("testing")
 	protoPkg := imports.NewImport("github.com/gogo/protobuf/proto")
+	if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) {
+		protoPkg = imports.NewImport("github.com/golang/protobuf/proto")
+	}
 	for _, message := range file.Messages() {
 		ccTypeName := generator.CamelCaseSlice(message.TypeName())
 		if !gogoproto.HasVerboseEqual(file.FileDescriptorProto, message.DescriptorProto) {

plugin/face/face.go

@@ -168,6 +168,9 @@ func (p *plugin) GetMapGoType(file *descriptor.FileDescriptorProto, field *descr
 func (p *plugin) Generate(file *generator.FileDescriptor) {
 	p.PluginImports = generator.NewPluginImports(p.Generator)
 	protoPkg := p.NewImport("github.com/gogo/protobuf/proto")
+	if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) {
+		protoPkg = p.NewImport("github.com/golang/protobuf/proto")
+	}
 	for _, message := range file.Messages() {
 		if !gogoproto.IsFace(file.FileDescriptorProto, message.DescriptorProto) {
 			continue

plugin/gostring/gostring.go

@@ -129,6 +129,9 @@ func (p *gostring) Generate(file *generator.FileDescriptor) {
 	fmtPkg := p.NewImport("fmt")
 	stringsPkg := p.NewImport("strings")
 	protoPkg := p.NewImport("github.com/gogo/protobuf/proto")
+	if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) {
+		protoPkg = p.NewImport("github.com/golang/protobuf/proto")
+	}
 	sortPkg := p.NewImport("sort")
 	strconvPkg := p.NewImport("strconv")
 	reflectPkg := p.NewImport("reflect")

plugin/marshalto/marshalto.go

@@ -369,6 +369,9 @@ func (p *marshalto) Generate(file *generator.FileDescriptor) {
 
 	mathPkg := p.NewImport("math")
 	protoPkg := p.NewImport("github.com/gogo/protobuf/proto")
+	if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) {
+		protoPkg = p.NewImport("github.com/golang/protobuf/proto")
+	}
 	sortKeysPkg := p.NewImport("github.com/gogo/protobuf/sortkeys")
 	p.unsafePkg = p.NewImport("unsafe")
 

plugin/populate/populate.go

@@ -446,6 +446,9 @@ func (p *plugin) Generate(file *generator.FileDescriptor) {
 
 	p.localName = generator.FileName(file)
 	protoPkg := p.NewImport("github.com/gogo/protobuf/proto")
+	if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) {
+		protoPkg = p.NewImport("github.com/golang/protobuf/proto")
+	}
 
 	for _, message := range file.Messages() {
 		if !gogoproto.HasPopulate(file.FileDescriptorProto, message.DescriptorProto) {

plugin/size/size.go

@@ -199,6 +199,9 @@ func (p *size) Generate(file *generator.FileDescriptor) {
 	p.atleastOne = false
 	p.localName = generator.FileName(file)
 	protoPkg := p.NewImport("github.com/gogo/protobuf/proto")
+	if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) {
+		protoPkg = p.NewImport("github.com/golang/protobuf/proto")
+	}
 	for _, message := range file.Messages() {
 		if !gogoproto.IsSizer(file.FileDescriptorProto, message.DescriptorProto) {
 			continue

plugin/size/sizetest.go

@@ -46,6 +46,9 @@ func (p *test) Generate(imports generator.PluginImports, file *generator.FileDes
 	timePkg := imports.NewImport("time")
 	testingPkg := imports.NewImport("testing")
 	protoPkg := imports.NewImport("github.com/gogo/protobuf/proto")
+	if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) {
+		protoPkg = imports.NewImport("github.com/golang/protobuf/proto")
+	}
 	for _, message := range file.Messages() {
 		ccTypeName := generator.CamelCaseSlice(message.TypeName())
 		if !gogoproto.IsSizer(file.FileDescriptorProto, message.DescriptorProto) {

plugin/testgen/testgen.go

@@ -269,6 +269,9 @@ func (p *testProto) Generate(imports generator.PluginImports, file *generator.Fi
 	randPkg := imports.NewImport("math/rand")
 	timePkg := imports.NewImport("time")
 	protoPkg := imports.NewImport("github.com/gogo/protobuf/proto")
+	if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) {
+		protoPkg = imports.NewImport("github.com/golang/protobuf/proto")
+	}
 	for _, message := range file.Messages() {
 		ccTypeName := generator.CamelCaseSlice(message.TypeName())
 		if message.DescriptorProto.GetOptions().GetMapEntry() {
@@ -505,6 +508,9 @@ func (p *testText) Generate(imports generator.PluginImports, file *generator.Fil
 	randPkg := imports.NewImport("math/rand")
 	timePkg := imports.NewImport("time")
 	protoPkg := imports.NewImport("github.com/gogo/protobuf/proto")
+	if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) {
+		protoPkg = imports.NewImport("github.com/golang/protobuf/proto")
+	}
 	//fmtPkg := imports.NewImport("fmt")
 	for _, message := range file.Messages() {
 		ccTypeName := generator.CamelCaseSlice(message.TypeName())

plugin/unmarshal/unmarshal.go

@@ -789,6 +789,9 @@ func (p *unmarshal) Generate(file *generator.FileDescriptor) {
 	p.unsafePkg = p.NewImport("unsafe")
 	fmtPkg := p.NewImport("fmt")
 	protoPkg := p.NewImport("github.com/gogo/protobuf/proto")
+	if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) {
+		protoPkg = p.NewImport("github.com/golang/protobuf/proto")
+	}
 
 	for _, message := range file.Messages() {
 		ccTypeName := generator.CamelCaseSlice(message.TypeName())

protoc-gen-gogo/generator/generator.go

@@ -1185,7 +1185,11 @@ func (g *Generator) generateImports() {
 	// do, which is tricky when there's a plugin, just import it and
 	// reference it later. The same argument applies to the math package,
 	// for handling bit patterns for floating-point numbers.
-	g.PrintImport(g.Pkg["proto"], g.ImportPrefix+"github.com/gogo/protobuf/proto")
+	if gogoproto.ImportsGoGoProto(g.file.FileDescriptorProto) {
+		g.PrintImport(g.Pkg["proto"], g.ImportPrefix+"github.com/gogo/protobuf/proto")
+	} else {
+		g.PrintImport(g.Pkg["proto"], g.ImportPrefix+"github.com/golang/protobuf/proto")
+	}
 	if !g.file.proto3 {
 		g.PrintImport(g.Pkg["math"], "math")
 	}

test/Makefile

@@ -29,6 +29,7 @@
 regenerate:
 	go install github.com/gogo/protobuf/protoc-gen-gogo/protoc-gen-combo
 	protoc-gen-combo --default=false --proto_path=../:../../../../:../protobuf/:. thetest.proto
+	protoc --gogo_out=. --proto_path=../:../../../../:../protobuf/:. thetest.proto
 	cp uuid.go ./combos/both/
 	cp uuid.go ./combos/marshaler/
 	cp uuid.go ./combos/unmarshaler/