github
/
teleport
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

temp.

pull/32/merge
apexliu 2017-03-27 11:54:28 +00:00
parent 914c8be91e
commit 91b0d0bfb2
6 changed files with 8 additions and 118 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"> <module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager"> <component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$/builder" /> <content url="file://$MODULE_DIR$/builder" />
<orderEntry type="inheritedJdk" /> <orderEntry type="jdk" jdkName="py34" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
<component name="TestRunnerService"> <component name="TestRunnerService">

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

@ -80,7 +80,7 @@ class BuilderBase:
def build_sqlite(self): def build_sqlite(self):
file_name = 'sqlite-autoconf-{}.tar.gz'.format(env.ver_sqlite) 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 return
self._build_sqlite(file_name) self._build_sqlite(file_name)

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

@ -3,6 +3,8 @@
import shutil import shutil
import struct import struct
import sys
from core import colorconsole as cc from core import colorconsole as cc
from core import makepyo from core import makepyo
from core import utils from core import utils
@ -95,7 +97,7 @@ class PYSBase:
makepyo.make(_tmp_) makepyo.make(_tmp_)
cc.v('compress into python.zip...') 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) utils.ensure_file_exists(out_file)
cc.v('remove temp folder...') 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') rc_file = os.path.join(env.root_path, 'client', 'tp_assist', 'tp_assist.rc')
self._update_vs_rc(rc_file, self.VER_TELEPORT_ASSIST) 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) self._update_nsi_rc(nsi_file, self.VER_TELEPORT_ASSIST)
def make_tp_core_ver(self): def make_tp_core_ver(self):

2
config.ini.in
View File

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

114
server/.idea/server.iml
View File

@ -1,114 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module type="CPP_MODULE" version="4"> <module classpath="CMake" 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>