Skip to content

Commit d74d56a

Browse files
authored
fix go-grpc generate failed (#101)
1 parent 8fba81f commit d74d56a

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

go/generate.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,26 @@
22

33
set -eo pipefail
44

5-
PROTO_BASE_DIR=../proto
5+
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
6+
7+
PROTO_BASE_DIR=$ROOT/proto
68
PROTO_PUPPET_DIR=$PROTO_BASE_DIR/wechaty/puppet
79
PROTO_WECHATY_DIR=$PROTO_BASE_DIR/wechaty
810

9-
OUT_WECHATY_DIR=./generated/wechaty
10-
OUT_PUPPET_DIR=$OUT_WECHATY_DIR/puppet
11+
OUT_WECHATY_DIR=$ROOT/go/generated/wechaty
12+
OUT_PUPPET_DIR=$OUT_WECHATY_DIR
1113

1214
if [ ! -d "$PUPPET_GEN_DIR" ]; then
1315
mkdir -p $OUT_PUPPET_DIR
1416
fi
1517

1618
protoc --version
1719

18-
protoc \
19-
-I $PROTO_PUPPET_DIR \
20+
cd $PROTO_WECHATY_DIR && protoc \
21+
-I $PROTO_WECHATY_DIR \
2022
--go_out=plugins=grpc:$OUT_PUPPET_DIR \
2123
--go_opt=paths=source_relative \
22-
$PROTO_PUPPET_DIR/*.proto
24+
puppet/*.proto
2325

2426
protoc \
2527
-I $PROTO_WECHATY_DIR \

proto/wechaty/puppet/file_box.proto

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
syntax = "proto3";
22
package wechaty.puppet;
33

4+
option go_package="github.com/wechaty/go-grpc/wechaty/puppet";
5+
46
message FileBoxChunk {
57
oneof payload {
68
bytes data = 1;

0 commit comments

Comments
 (0)