fix compile error becase of proto (#65)

This commit is contained in:
Liangliang Gu 2019-08-14 14:38:45 +08:00 committed by Zhexuan Yang
parent 24ed19b582
commit 2ceec148c1
2 changed files with 49 additions and 38 deletions

View File

@ -128,7 +128,12 @@
<directory>${basedir}/kvproto/include</directory>
<includes>
<include>**/gogoproto/**</include>
<include>**/*.proto</include>
</includes>
</resource>
<resource>
<directory>${basedir}/kvproto/include</directory>
<includes>
<include>*.proto</include>
</includes>
</resource>
<resource>
@ -136,7 +141,7 @@
<filtering>true</filtering>
</resource>
<resource>
<directory>${basedir}/raft-rs/proto</directory>
<directory>${basedir}/raft-rs/proto/proto</directory>
<filtering>true</filtering>
</resource>
<resource>

View File

@ -14,20 +14,26 @@
# limitations under the License.
#
kvproto_hash=a4759dfe3753ce136d252578340bb2b33633ccfa
raft_rs_hash=14f007b443935aef51cb161c5b368b54fc8ed176
tipb_hash=c0b8f1a8c8395c319049600dc0efd278f1e26a0d
if [ -d "kvproto" ]; then
cd kvproto; git pull origin master; cd ..
cd kvproto; git fetch -p; git checkout ${kvproto_hash}; cd ..
else
git clone https://github.com/pingcap/kvproto
git clone https://github.com/pingcap/kvproto; cd kvproto; git checkout ${kvproto_hash}; cd ..
fi
if [ -d "raft-rs" ]; then
cd raft-rs; git pull origin master; cd ..
cd raft-rs; git fetch -p; git checkout ${raft_rs_hash}; cd ..
else
git clone https://github.com/pingcap/raft-rs
git clone https://github.com/pingcap/raft-rs; cd raft-rs; git checkout ${raft_rs_hash}; cd ..
fi
if [ -d "tipb" ]; then
cd tipb; git pull origin master; cd ..
cd tipb; git fetch -p; git checkout ${tipb_hash}; cd ..
else
git clone https://github.com/pingcap/tipb
git clone https://github.com/pingcap/tipb; cd tipb; git checkout ${tipb_hash}; cd ..
fi