diff --git a/go/generate.sh b/go/generate.sh index bc4799b5..4d7856d6 100755 --- a/go/generate.sh +++ b/go/generate.sh @@ -2,12 +2,14 @@ set -eo pipefail -PROTO_BASE_DIR=../proto +ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" + +PROTO_BASE_DIR=$ROOT/proto PROTO_PUPPET_DIR=$PROTO_BASE_DIR/wechaty/puppet PROTO_WECHATY_DIR=$PROTO_BASE_DIR/wechaty -OUT_WECHATY_DIR=./generated/wechaty -OUT_PUPPET_DIR=$OUT_WECHATY_DIR/puppet +OUT_WECHATY_DIR=$ROOT/go/generated/wechaty +OUT_PUPPET_DIR=$OUT_WECHATY_DIR if [ ! -d "$PUPPET_GEN_DIR" ]; then mkdir -p $OUT_PUPPET_DIR @@ -15,11 +17,11 @@ fi protoc --version -protoc \ - -I $PROTO_PUPPET_DIR \ +cd $PROTO_WECHATY_DIR && protoc \ + -I $PROTO_WECHATY_DIR \ --go_out=plugins=grpc:$OUT_PUPPET_DIR \ --go_opt=paths=source_relative \ - $PROTO_PUPPET_DIR/*.proto + puppet/*.proto protoc \ -I $PROTO_WECHATY_DIR \ diff --git a/proto/wechaty/puppet/file_box.proto b/proto/wechaty/puppet/file_box.proto index a940e3b9..42e23df1 100644 --- a/proto/wechaty/puppet/file_box.proto +++ b/proto/wechaty/puppet/file_box.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package wechaty.puppet; +option go_package="github.com/wechaty/go-grpc/wechaty/puppet"; + message FileBoxChunk { oneof payload { bytes data = 1;