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

Merge branch 'dev' of github.com:eomsoft/teleport into dev

pull/32/merge
apexliu 2017-03-27 21:29:20 +08:00
parent a592da9626 91b0d0bfb2
commit 9af9964330
7 changed files with 51 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/.idea/build.iml
View File

@ -2,7 +2,7 @@
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$/builder" />
<orderEntry type="inheritedJdk" />
<orderEntry type="jdk" jdkName="py34" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="TestRunnerService">

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

@ -80,7 +80,7 @@ class BuilderBase:
def build_sqlite(self):
file_name = 'sqlite-autoconf-{}.tar.gz'.format(env.ver_sqlite)
if not utils.download_file('sqlite source tarball', 'http://sqlite.org/2016/{}'.format(file_name), PATH_DOWNLOAD, file_name):
if not utils.download_file('sqlite source tarball', 'http://sqlite.org/2017/{}'.format(file_name), PATH_DOWNLOAD, file_name):
return
self._build_sqlite(file_name)

4
build/builder/build-pysrt.py
View File

@ -3,6 +3,8 @@
import shutil
import struct
import sys
from core import colorconsole as cc
from core import makepyo
from core import utils
@ -95,7 +97,7 @@ class PYSBase:
makepyo.make(_tmp_)
cc.v('compress into python.zip...')
utils.make_zip(_tmp_, out_file)
utils.make_zip(_tmp_, out_file, from_parent=False)
utils.ensure_file_exists(out_file)
cc.v('remove temp folder...')

2
build/builder/build-version.py
View File

@ -120,7 +120,7 @@ class Builder:
rc_file = os.path.join(env.root_path, 'client', 'tp_assist', 'tp_assist.rc')
self._update_vs_rc(rc_file, self.VER_TELEPORT_ASSIST)
nsi_file = os.path.join(env.root_path, 'dist', 'windows', 'client', 'assist', 'installer.nsi')
nsi_file = os.path.join(env.root_path, 'dist', 'client', 'windows', 'assist', 'installer.nsi')
self._update_nsi_rc(nsi_file, self.VER_TELEPORT_ASSIST)
def make_tp_core_ver(self):

53
build/builder/core/utils.py
View File

@ -23,8 +23,28 @@ def _check_download_file(file_name):
if 'Everything is Ok' in output:
return True
else:
cc.w('[fixme] how to test file on Linux? ', end='')
return True
x = os.path.splitext(file_name)
# print('ext:', x)
if x[-1].lower() == '.zip':
ret, output = sys_exec('zip -T "{}"'.format(file_name), False)
# print('test .zip:', ret, output)
if ret == 0:
return True
elif x[-1].lower() == '.xz':
ret, output = sys_exec('xz -t "{}"'.format(file_name), False)
# print('test .xz:', ret, output)
if ret == 0:
return True
elif x[-1].lower() == '.gz':
ret, output = sys_exec('gzip -t "{}"'.format(file_name), False)
# print('test .gz:', ret, output)
if ret == 0:
return True
else:
cc.w('[fixme] how to test {} on Linux? '.format(x[-1]), end='')
return True
return False
def download_file(desc, url, target_path, file_name):
@ -331,20 +351,33 @@ def strip(filename):
return True
def make_zip(src_path, to_file):
def make_zip(src_path, to_file, from_parent=True):
cc.v('compress folder into .zip...')
if env.is_win:
src_path = os.path.abspath(src_path)
_parent = os.path.abspath(os.path.join(src_path, '..'))
_folder = src_path[len(_parent) + 1:]
src_path = os.path.abspath(src_path)
_parent = os.path.abspath(os.path.join(src_path, '..'))
_folder = src_path[len(_parent) + 1:]
if env.is_win:
old_p = os.getcwd()
os.chdir(_parent)
cmd = '""{}" a "{}" "{}""'.format(env.zip7, to_file, _folder)
if from_parent:
os.chdir(_parent)
cmd = '""{}" a "{}" "{}""'.format(env.zip7, to_file, _folder)
else:
os.chdir(src_path)
cmd = '""{}" a "{}" "*""'.format(env.zip7, to_file)
os.system(cmd)
os.chdir(old_p)
elif env.is_linux:
pass
old_p = os.getcwd()
if from_parent:
os.chdir(_parent)
cmd = 'zip -r "{}" "{}"'.format(to_file, _folder)
else:
os.chdir(src_path)
cmd = 'zip -q -r "{}" ./*'.format(to_file)
os.system(cmd)
os.chdir(old_p)
else:
raise RuntimeError('not support this platform.')

2
config.ini.in
View File

@ -35,7 +35,7 @@ cmake = /opt/cmake/bin/cmake
openssl = 1.0.2h,1000208f
libuv = 1.9.1
mbedtls = 2.3.0
sqlite = 3160200
sqlite = 3170000
libssh = 0.7.4
jsoncpp = 0.10.6
mongoose = 6.6

114
server/.idea/server.iml
View File

@ -1,114 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="CPP_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$/../common/libex/src/ex_ini.cpp">
<sourceFolder url="file://$MODULE_DIR$/../common/libex/src/ex_ini.cpp" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../common/libex/src/ex_log.cpp">
<sourceFolder url="file://$MODULE_DIR$/../common/libex/src/ex_log.cpp" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../common/libex/src/ex_path.cpp">
<sourceFolder url="file://$MODULE_DIR$/../common/libex/src/ex_path.cpp" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../common/libex/src/ex_str.cpp">
<sourceFolder url="file://$MODULE_DIR$/../common/libex/src/ex_str.cpp" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../common/libex/src/ex_thread.cpp">
<sourceFolder url="file://$MODULE_DIR$/../common/libex/src/ex_thread.cpp" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../common/libex/src/ex_util.cpp">
<sourceFolder url="file://$MODULE_DIR$/../common/libex/src/ex_util.cpp" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../common/libex/src/ex_winsrv.cpp">
<sourceFolder url="file://$MODULE_DIR$/../common/libex/src/ex_winsrv.cpp" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../common/pyshell/src/pys_api.cpp">
<sourceFolder url="file://$MODULE_DIR$/../common/pyshell/src/pys_api.cpp" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../common/pyshell/src/pys_core.cpp">
<sourceFolder url="file://$MODULE_DIR$/../common/pyshell/src/pys_core.cpp" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../common/pyshell/src/pys_util.cpp">
<sourceFolder url="file://$MODULE_DIR$/../common/pyshell/src/pys_util.cpp" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../external/jsoncpp/src/lib_json/json_reader.cpp">
<sourceFolder url="file://$MODULE_DIR$/../external/jsoncpp/src/lib_json/json_reader.cpp" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../external/jsoncpp/src/lib_json/json_value.cpp">
<sourceFolder url="file://$MODULE_DIR$/../external/jsoncpp/src/lib_json/json_value.cpp" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../external/jsoncpp/src/lib_json/json_writer.cpp">
<sourceFolder url="file://$MODULE_DIR$/../external/jsoncpp/src/lib_json/json_writer.cpp" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../external/mongoose/mongoose.c">
<sourceFolder url="file://$MODULE_DIR$/../external/mongoose/mongoose.c" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/tp_core/core/ts_http_rpc.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/core/ts_crypto.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/core/ts_main.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/core/ts_session.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/core/ts_http_client.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/core/ts_http_rpc.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/core/ts_http_client.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/core/ts_main.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/core/CMakeLists.txt" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/core/ts_web_rpc.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/core/main.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/core/ts_env.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/core/ts_env.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/core/ts_session.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/core/ts_web_rpc.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/core/ts_crypto.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/common/base_env.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/common/ts_membuf.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/common/base_env.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/common/base_record.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/common/base_record.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/common/ts_membuf.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/protocol/ssh/tpp_env.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/protocol/ssh/CMakeLists.txt" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/protocol/ssh/ssh_recorder.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/protocol/ssh/ssh_session.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/protocol/ssh/ssh_proxy.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/protocol/ssh/tpssh.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/protocol/ssh/ssh_recorder.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/protocol/ssh/tpp_env.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/protocol/ssh/ssh_session.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_core/protocol/ssh/ssh_proxy.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_web/src/main.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_web/src/ts_env.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_web/src/CMakeLists.txt" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tp_web/src/ts_env.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/CMakeLists.txt" isTestSource="false" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library name="Header Search Paths">
<CLASSES>
<root url="file:///usr/include" />
<root url="file:///usr/lib/gcc/x86_64-redhat-linux/4.4.7/include" />
<root url="file:///usr/local/include" />
<root url="file://$MODULE_DIR$/../external/jsoncpp/include" />
<root url="file://$MODULE_DIR$/../external/mongoose" />
<root url="file://$MODULE_DIR$/../external/linux/release/include" />
<root url="file://$MODULE_DIR$/../common/pyshell/include" />
<root url="file://$MODULE_DIR$/../common/libex/include" />
</CLASSES>
<SOURCES>
<root url="file:///usr/include" />
<root url="file:///usr/lib/gcc/x86_64-redhat-linux/4.4.7/include" />
<root url="file:///usr/local/include" />
<root url="file://$MODULE_DIR$/../external/jsoncpp/include" />
<root url="file://$MODULE_DIR$/../external/mongoose" />
<root url="file://$MODULE_DIR$/../external/linux/release/include" />
<root url="file://$MODULE_DIR$/../common/pyshell/include" />
<root url="file://$MODULE_DIR$/../common/libex/include" />
</SOURCES>
<excluded>
<root url="file://$MODULE_DIR$/../external/mongoose/mongoose.c" />
</excluded>
</library>
</orderEntry>
</component>
</module>
<module classpath="CMake" type="CPP_MODULE" version="4" />