server_common/wsproxy
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移除githook

Browse Source
This commit is contained in:
aozhiwei 2019-07-13 09:30:34 +08:00
parent a353b38874
commit e28201cea0
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/tools/scripts/construct/build_pb.py
View File

@ -62,9 +62,6 @@ def rebuild():
except Exception as e: except Exception as e:
print('build_protocol rebuild error:' + str(e)) print('build_protocol rebuild error:' + str(e))
def repair_githooks():
os.system('/bin/bash ../tools/scripts/githooks/install.sh')
parser = OptionParser(usage="%prog [options]") parser = OptionParser(usage="%prog [options]")
parser.add_option( parser.add_option(
"-n", "-n",
@ -73,8 +70,6 @@ parser.add_option(
help = "no repair git hooks", help = "no repair git hooks",
) )
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
if not options.nohooks:
repair_githooks()
if need_rebuild(): if need_rebuild():
rebuild() rebuild()

2
server/wsproxy/CMakeLists.txt
View File

@ -26,6 +26,8 @@ include_directories(
/usr/include/mysql /usr/include/mysql
/usr/include/jsoncpp /usr/include/jsoncpp
/usr/include/hiredis /usr/include/hiredis
/usr/include/eigen3
/usr/include/glm
../../third_party ../../third_party
. .
) )

2
third_party/a8engine vendored

@ -1 +1 @@
Subproject commit 287a824201d2aac638b5a8b2b0c01e87973dc685 Subproject commit 238bb8599fe25133416448739a8b298978879aba