add peerdirs for GO_PROTO_CMD to well known types
@@ -306,13 +306,26 @@ macro ADD_PY_PROTO_OUT(Suf) {
GO_PROTOC_GEN_TOOL=vendor/github.com/golang/protobuf/protoc-gen-go
GO_PROTOC_GEN_PLUGINS=
+GO_PROTOBUF_WELLKNOWN_TYPES=\
+ vendor/github.com/golang/protobuf/ptypes \
+ vendor/github.com/golang/protobuf/ptypes/any \
+ vendor/github.com/golang/protobuf/ptypes/duration \
+ vendor/github.com/golang/protobuf/ptypes/empty \
+ vendor/github.com/golang/protobuf/ptypes/struct \
+ vendor/github.com/golang/protobuf/ptypes/timestamp \
+ vendor/github.com/golang/protobuf/ptypes/wrappers \
+ vendor/google.golang.org/genproto/protobuf/api \
+ vendor/google.golang.org/genproto/protobuf/field_mask \
+ vendor/google.golang.org/genproto/protobuf/ptype \
+ vendor/google.golang.org/genproto/protobuf/source_context
+
macro GO_PROTOC_PLUGIN_ARGS_BASE(Name, Tool, Plugins="") {
.CMD=--plugin=protoc-gen-${Name}=${tool:Tool} --${Name}_out=$Plugins$ARCADIA_BUILD_ROOT/$PROTO_NAMESPACE
}
macro GO_PROTO_CMD(File) {
.CMD=${cwd;rootdir;input:File} $YMAKE_PYTHON ${input:"build/scripts/go_proto_wrapper.py"} $GO_ARCADIA_PROJECT_PREFIX $GO_CONTRIB_PROJECT_PREFIX $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE -I=$ARCADIA_BUILD_ROOT -I=$PROTO_PATH ${input;rootrel:File} ${output;hide;noauto;norel;noext;suf=.pb.go:File} $GO_PROTOC_PLUGIN_ARGS_BASE(go $GO_PROTOC_GEN_TOOL $GO_PROTOC_GEN_PLUGINS) ${kv;hide:"p PT"} ${kv;hide:"pc yellow"}
- .PEERDIR=${GOSTD}/fmt ${GOSTD}/math vendor/github.com/golang/protobuf/proto vendor/github.com/golang/protobuf/protoc-gen-go/descriptor contrib/libs/protobuf
+ .PEERDIR=${GOSTD}/fmt ${GOSTD}/math vendor/github.com/golang/protobuf/proto vendor/github.com/golang/protobuf/protoc-gen-go/descriptor contrib/libs/protobuf ${GO_PROTOBUF_WELLKNOWN_TYPES}
}
macro CPP_PROTO_CMD(File) {
