Skip to content

Commit 1a24aaf

Browse files
committed
fixed go_package of gogo.proto so it doesn't break other projects
1 parent 8b510ea commit 1a24aaf

File tree

3 files changed

+169
-167
lines changed

3 files changed

+169
-167
lines changed

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ init:
2727
empty :=
2828
space := $(empty) $(empty)
2929
PACKAGE := github.com/solo-io/protoc-gen-ext
30+
GOGO_OUTPUT := github.com/gogo/protobuf/gogoproto/*
3031

3132
# protoc-gen-go parameters for properly generating the import path for PGV
3233
EXT_IMPORT := Mhash/hash.proto=${PACKAGE}/ext
@@ -44,7 +45,9 @@ PHONE: generated-code
4445
generated-code:
4546
protoc -I=. --go_out="${EXT_IMPORT}:." extproto/ext.proto
4647
protoc -I=. --go_out="${EXT_IMPORT}:." extproto/gogoproto/gogo.proto
47-
cp -r ${PACKAGE}/extproto/ extproto; rm -rf github.com
48+
cp -r ${PACKAGE}/extproto/ extproto
49+
cp -r ${GOGO_OUTPUT} extproto/gogoproto
50+
rm -rf github.com
4851
protoc -I=. -I=./vendor/github.com/gogo/protobuf --go_out="." --ext_out="." tests/api/hello.proto
4952

5053

0 commit comments

Comments
 (0)