github
/
teleport
mirror of https://github.com/tp4a/teleport
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

temp.

pull/32/head
Apex Liu 2017-04-07 11:54:02 +08:00
parent d1270e38ab
commit 8777543985
4 changed files with 68 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
build/builder/build-external.py
View File

@ -100,6 +100,7 @@ class BuilderWin(BuilderBase):
self.JSONCPP_PATH_SRC = os.path.join(PATH_EXTERNAL, 'jsoncpp') self.JSONCPP_PATH_SRC = os.path.join(PATH_EXTERNAL, 'jsoncpp')
self.MONGOOSE_PATH_SRC = os.path.join(PATH_EXTERNAL, 'mongoose') self.MONGOOSE_PATH_SRC = os.path.join(PATH_EXTERNAL, 'mongoose')
self.MBEDTLS_PATH_SRC = os.path.join(PATH_EXTERNAL, 'mbedtls') self.MBEDTLS_PATH_SRC = os.path.join(PATH_EXTERNAL, 'mbedtls')
self.LIBUV_PATH_SRC = os.path.join(PATH_EXTERNAL, 'libuv')
self.LIBSSH_PATH_SRC = os.path.join(PATH_EXTERNAL, 'libssh-win-static') self.LIBSSH_PATH_SRC = os.path.join(PATH_EXTERNAL, 'libssh-win-static')
self._prepare_python_header() self._prepare_python_header()
@ -226,6 +227,23 @@ class BuilderWin(BuilderBase):
os.rename(os.path.join(PATH_EXTERNAL, 'mbedtls-mbedtls-{}'.format(env.ver_mbedtls)), self.MBEDTLS_PATH_SRC) os.rename(os.path.join(PATH_EXTERNAL, 'mbedtls-mbedtls-{}'.format(env.ver_mbedtls)), self.MBEDTLS_PATH_SRC)
else: else:
cc.w('already exists, skip.') cc.w('already exists, skip.')
return
cc.v('')
# fix source file
utils.ensure_file_exists(os.path.join(PATH_EXTERNAL, 'fix-external', 'mbedtls', 'include', 'mbedtls', 'config.h'))
utils.copy_file(os.path.join(PATH_EXTERNAL, 'fix-external', 'mbedtls', 'include', 'mbedtls'), os.path.join(self.MBEDTLS_PATH_SRC, 'include', 'mbedtls'), 'config.h')
utils.ensure_file_exists(os.path.join(PATH_EXTERNAL, 'fix-external', 'mbedtls', 'library', 'rsa.c'))
utils.copy_file(os.path.join(PATH_EXTERNAL, 'fix-external', 'mbedtls', 'library'), os.path.join(self.MBEDTLS_PATH_SRC, 'library'), 'rsa.c')
def _build_libuv(self, file_name):
cc.n('prepare libuv source code... ', end='')
if not os.path.exists(self.LIBUV_PATH_SRC):
cc.v('')
utils.unzip(os.path.join(PATH_DOWNLOAD, file_name), PATH_EXTERNAL)
os.rename(os.path.join(PATH_EXTERNAL, 'libuv-{}'.format(env.ver_libuv)), self.LIBUV_PATH_SRC)
else:
cc.w('already exists, skip.')
def build_sqlite(self): def build_sqlite(self):
cc.w('sqlite not need for Windows, skip.') cc.w('sqlite not need for Windows, skip.')
@ -346,46 +364,48 @@ class BuilderLinux(BuilderBase):
f.writelines(fl) f.writelines(fl)
f.close() f.close()
# fix config.h # # fix config.h
mkfile = os.path.join(self.MBEDTLS_PATH_SRC, 'include', 'mbedtls', 'config.h') # mkfile = os.path.join(self.MBEDTLS_PATH_SRC, 'include', 'mbedtls', 'config.h')
f = open(mkfile) # f = open(mkfile)
fl = f.readlines() # fl = f.readlines()
f.close() # f.close()
#
for i in range(len(fl)): # for i in range(len(fl)):
if fl[i].find('#define MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED') >= 0: # if fl[i].find('#define MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED') >= 0:
fl[i] = '//#define MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED\n' # fl[i] = '//#define MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED\n'
elif fl[i].find('#define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED') >= 0: # elif fl[i].find('#define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED') >= 0:
fl[i] = '//#define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED\n' # fl[i] = '//#define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED\n'
elif fl[i].find('#define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED') >= 0: # elif fl[i].find('#define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED') >= 0:
fl[i] = '//#define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED\n' # fl[i] = '//#define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED\n'
elif fl[i].find('#define MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED') >= 0: # elif fl[i].find('#define MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED') >= 0:
fl[i] = '//#define MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED\n' # fl[i] = '//#define MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED\n'
elif fl[i].find('#define MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED') >= 0: # elif fl[i].find('#define MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED') >= 0:
fl[i] = '//#define MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED\n' # fl[i] = '//#define MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED\n'
elif fl[i].find('#define MBEDTLS_SELF_TEST') >= 0: # elif fl[i].find('#define MBEDTLS_SELF_TEST') >= 0:
fl[i] = '//#define MBEDTLS_SELF_TEST\n' # fl[i] = '//#define MBEDTLS_SELF_TEST\n'
elif fl[i].find('#define MBEDTLS_SSL_RENEGOTIATION') >= 0: # elif fl[i].find('#define MBEDTLS_SSL_RENEGOTIATION') >= 0:
fl[i] = '//#define MBEDTLS_SSL_RENEGOTIATION\n' # fl[i] = '//#define MBEDTLS_SSL_RENEGOTIATION\n'
elif fl[i].find('#define MBEDTLS_ECDH_C') >= 0: # elif fl[i].find('#define MBEDTLS_ECDH_C') >= 0:
fl[i] = '//#define MBEDTLS_ECDH_C\n' # fl[i] = '//#define MBEDTLS_ECDH_C\n'
elif fl[i].find('#define MBEDTLS_ECDSA_C') >= 0: # elif fl[i].find('#define MBEDTLS_ECDSA_C') >= 0:
fl[i] = '//#define MBEDTLS_ECDSA_C\n' # fl[i] = '//#define MBEDTLS_ECDSA_C\n'
elif fl[i].find('#define MBEDTLS_ECP_C') >= 0: # elif fl[i].find('#define MBEDTLS_ECP_C') >= 0:
fl[i] = '//#define MBEDTLS_ECP_C\n' # fl[i] = '//#define MBEDTLS_ECP_C\n'
elif fl[i].find('#define MBEDTLS_NET_C') >= 0: # elif fl[i].find('#define MBEDTLS_NET_C') >= 0:
fl[i] = '//#define MBEDTLS_NET_C\n' # fl[i] = '//#define MBEDTLS_NET_C\n'
#
elif fl[i].find('#define MBEDTLS_RSA_NO_CRT') >= 0: # elif fl[i].find('#define MBEDTLS_RSA_NO_CRT') >= 0:
fl[i] = '#define MBEDTLS_RSA_NO_CRT\n' # fl[i] = '#define MBEDTLS_RSA_NO_CRT\n'
elif fl[i].find('#define MBEDTLS_SSL_PROTO_SSL3') >= 0: # elif fl[i].find('#define MBEDTLS_SSL_PROTO_SSL3') >= 0:
fl[i] = '#define MBEDTLS_SSL_PROTO_SSL3\n' # fl[i] = '#define MBEDTLS_SSL_PROTO_SSL3\n'
#
f = open(mkfile, 'w') # f = open(mkfile, 'w')
f.writelines(fl) # f.writelines(fl)
f.close() # f.close()
# fix source file # fix source file
utils.ensure_file_exists(os.path.join(PATH_EXTERNAL, 'fix-external', 'mbedtls', 'include', 'mbedtls', 'config.h'))
utils.copy_file(os.path.join(PATH_EXTERNAL, 'fix-external', 'mbedtls', 'include', 'mbedtls'), os.path.join(self.MBEDTLS_PATH_SRC, 'include', 'mbedtls'), 'config.h')
utils.ensure_file_exists(os.path.join(PATH_EXTERNAL, 'fix-external', 'mbedtls', 'library', 'rsa.c')) utils.ensure_file_exists(os.path.join(PATH_EXTERNAL, 'fix-external', 'mbedtls', 'library', 'rsa.c'))
utils.copy_file(os.path.join(PATH_EXTERNAL, 'fix-external', 'mbedtls', 'library'), os.path.join(self.MBEDTLS_PATH_SRC, 'library'), 'rsa.c') utils.copy_file(os.path.join(PATH_EXTERNAL, 'fix-external', 'mbedtls', 'library'), os.path.join(self.MBEDTLS_PATH_SRC, 'library'), 'rsa.c')
@ -527,7 +547,7 @@ def main():
builder.build_jsoncpp() builder.build_jsoncpp()
builder.build_mongoose() builder.build_mongoose()
builder.build_openssl() builder.build_openssl()
####builder.build_libuv() builder.build_libuv()
builder.build_mbedtls() builder.build_mbedtls()
builder.build_libssh() builder.build_libssh()
builder.build_sqlite() builder.build_sqlite()

13
build/builder/build-server.py
View File

@ -48,11 +48,14 @@ class BuilderWin(BuilderBase):
utils.msvc_build(sln_file, 'tpssh', ctx.target_path, ctx.bits_path, False) utils.msvc_build(sln_file, 'tpssh', ctx.target_path, ctx.bits_path, False)
utils.ensure_file_exists(out_file) utils.ensure_file_exists(out_file)
# if os.path.exists(os.path.join(env.root_path, 'server', 'tp_core', 'protocol', 'ssh', 'tpssh.vs2015.sln')):
# s = os.path.join(env.root_path, 'out', 'console', ctx.bits_path, ctx.target_path, 'console.exe') cc.n('build RDP protocol ...')
# t = os.path.join(env.root_path, 'out', 'eom_agent', ctx.target_path, ctx.dist_path, 'eom_agent.com') sln_file = os.path.join(env.root_path, 'server', 'tp_core', 'protocol', 'rdp', 'tprdp.vs2015.sln')
# shutil.copy(s, t) out_file = os.path.join(env.root_path, 'out', 'server', ctx.bits_path, ctx.target_path, 'tprdp.dll')
# utils.ensure_file_exists(t) if os.path.exists(out_file):
utils.remove(out_file)
utils.msvc_build(sln_file, 'tprdp', ctx.target_path, ctx.bits_path, False)
utils.ensure_file_exists(out_file)
class BuilderLinux(BuilderBase): class BuilderLinux(BuilderBase):

3
config.ini.in
View File

@ -33,8 +33,7 @@ cmake = /opt/cmake/bin/cmake
[external_ver] [external_ver]
openssl = 1.0.2h,1000208f openssl = 1.0.2h,1000208f
libuv = 1.9.1 libuv = 1.11.0
libssh = 0.7.4
mbedtls = 2.3.0 mbedtls = 2.3.0
sqlite = 3170000 sqlite = 3170000
libssh = 0.7.4 libssh = 0.7.4

0
external/fix-external/mbedtls/include/config.h → external/fix-external/mbedtls/include/mbedtls/config.h vendored
View File