移除python依赖

This commit is contained in:
aozhiwei 2019-01-10 22:00:14 +08:00
parent 54513b5aa2
commit f7f763f2b4
4 changed files with 11 additions and 13 deletions

View File

@ -16,18 +16,18 @@ def printp_stdout(p):
while not is_terminated():
line = p.stdout.readline()
if len(line) > 0:
print line,
except Exception, e:
print 'build_pb stdout error:' + e
print(line, end = '')
except Exception as e:
print('build_pb stdout error:' + e)
def printp_stderr(p):
try:
while is_terminated():
line = p.stderr.readline()
if len(line) > 0:
print line,
except Exception, e:
print 'build_pb stderr error:' + e
print(line, end = '')
except Exception as e:
print('build_pb stderr error:' + e)
def need_rebuild():
for proto_name in ('ss_proto', 'ss_msgid'):
@ -58,8 +58,8 @@ def rebuild():
t1.join()
t2.join()
sys.exit(p.returncode)
except Exception, e:
print 'build_protocol rebuild error:' + str(e)
except Exception as e:
print('build_protocol rebuild error:' + str(e))
def repair_githooks():
os.system('/bin/bash ../tools/scripts/githooks/install.sh')
@ -68,4 +68,4 @@ repair_githooks()
if need_rebuild():
rebuild()
else:
print 'pb files already is the latest'
print('pb files already is the latest')

View File

@ -10,7 +10,6 @@ include_directories(
../../third_party/a8engine
/usr/include/mysql
/usr/include/jsoncpp
/usr/include/python3.4m
/usr/include/hiredis
../../third_party
.
@ -61,7 +60,6 @@ target_link_libraries(
rt
crypto
ssl
python3.4m
jsoncpp
curl
hiredis

@ -1 +1 @@
Subproject commit 0c3e904eec417052ee2fdacc90751feeaa3bc5a2
Subproject commit 972852f335e1245614b2349a780de93b4d1d7bcb

@ -1 +1 @@
Subproject commit 6313ff569fbc5454c4c1590c322a73c7721ef777
Subproject commit 803b1812d08fe8c3b3eea9371f8d9b0bead93c6d