升级版本号到2.2.5.1，准备发布新版本。

build/.idea/build.iml

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

build/builder/build-assist.py

@@ -58,56 +58,8 @@ class BuilderWin(BuilderBase):
 
         self._build_installer()
 
-        # last_ver = 'teleport-assist-last-win.zip'
-        # if os.path.exists(os.path.join(ROOT_PATH, 'dist', last_ver)):
-        #     utils.remove(os.path.join(ROOT_PATH, 'dist', last_ver))
-
-        # utils.copy_file(os.path.join(ROOT_PATH, 'dist'), os.path.join(ROOT_PATH, 'dist'), ('{}.zip'.format(name), last_ver))
-
-        # cc.n('build assist package for backend...')
-        # name = 'teleport-assist-last-win'
-        # utils.remove(os.path.join(ROOT_PATH, 'dist', '{}.zip'.format(name)))
-        # self._build_installer(name)
-
-        # utils.copy_file(os.path.join(ROOT_PATH, 'dist'), os.path.join(ROOT_PATH, 'web', 'site', 'teleport', 'static', 'download'), 'teleport-assist-win.zip')
-
         utils.ensure_file_exists(out_file)
 
-    # @staticmethod
-    # def _build_installer(name):
-    #     base_path = os.path.join(ROOT_PATH, 'out', 'client')
-    #     base_tmp = os.path.join(base_path, '_tmp_')
-    #     tmp_path = os.path.join(base_tmp, name)
-    #
-    #     if os.path.exists(base_tmp):
-    #         utils.remove(base_tmp)
-    #
-    #     utils.makedirs(tmp_path)
-    #
-    #     utils.copy_file(os.path.join(ROOT_PATH, 'out', 'client', ctx.bits_path, ctx.target_path), tmp_path, 'tp_assist.exe')
-    #     utils.copy_file(os.path.join(ROOT_PATH, 'client', 'tp_assist', 'cfg'), tmp_path, ('ssh_client.ini', 'ssh_client.ini'))
-    #     utils.copy_file(os.path.join(ROOT_PATH, 'client', 'tp_assist', 'cfg'), tmp_path, ('scp_client.ini', 'scp_client.ini'))
-    #     utils.copy_file(os.path.join(ROOT_PATH, 'client', 'tp_assist', 'cfg'), tmp_path, ('telnet_client.ini', 'telnet_client.ini'))
-    #
-    #     utils.copy_ex(os.path.join(ROOT_PATH, 'client', 'tp_assist'), tmp_path, 'site')
-    #
-    #     # utils.makedirs(os.path.join(tmp_path, 'tools', 'tprdp'))
-    #     utils.makedirs(os.path.join(tmp_path, 'tools', 'putty'))
-    #     utils.makedirs(os.path.join(tmp_path, 'tools', 'winscp'))
-    #     # utils.copy_file(os.path.join(ROOT_PATH, 'out', 'tp_rdp', ctx.bits_path, ctx.target_path), os.path.join(tmp_path, 'tools', 'tprdp'), 'tp_rdp.exe')
-    #     # utils.copy_file(os.path.join(ROOT_PATH, 'tools', 'tprdp'), os.path.join(tmp_path, 'tools', 'tprdp'), 'tprdp-client.exe')
-    #     # utils.copy_file(os.path.join(ROOT_PATH, 'tools', 'tprdp'), os.path.join(tmp_path, 'tools', 'tprdp'), 'tprdp-replay.exe')
-    #     utils.copy_file(os.path.join(ROOT_PATH, 'client', 'tools', 'putty'), os.path.join(tmp_path, 'tools', 'putty'), 'putty.exe')
-    #     utils.copy_file(os.path.join(ROOT_PATH, 'client', 'tools', 'winscp'), os.path.join(tmp_path, 'tools', 'winscp'), 'WinSCP.exe')
-    #     utils.copy_file(os.path.join(ROOT_PATH, 'client', 'tools', 'winscp'), os.path.join(tmp_path, 'tools', 'winscp'), 'license.txt')
-    #     utils.copy_file(os.path.join(ROOT_PATH, 'client', 'tools'), os.path.join(tmp_path, 'tools'), 'securecrt-telnet.vbs')
-    #
-    #     # utils.makedirs(os.path.join(tmp_path, 'data'))
-    #     # utils.copy_file(os.path.join(ROOT_PATH, 'tp_assist'), os.path.join(tmp_path, 'data'), 'ssl.cert')
-    #
-    #     out_file = os.path.join(ROOT_PATH, 'dist', '{}.zip'.format(name))
-    #     utils.make_zip(base_tmp, out_file)
-
 
     @staticmethod
     def _build_installer():
@@ -131,10 +83,18 @@ class BuilderWin(BuilderBase):
         utils.copy_ex(os.path.join(env.root_path, 'client', 'tp_assist'), tmp_app_path, 'site')
 
         utils.makedirs(os.path.join(tmp_app_path, 'tools', 'putty'))
-        utils.makedirs(os.path.join(tmp_app_path, 'tools', 'winscp'))
         utils.copy_file(os.path.join(env.root_path, 'client', 'tools', 'putty'), os.path.join(tmp_app_path, 'tools', 'putty'), 'putty.exe')
+
+        utils.makedirs(os.path.join(tmp_app_path, 'tools', 'winscp'))
         utils.copy_file(os.path.join(env.root_path, 'client', 'tools', 'winscp'), os.path.join(tmp_app_path, 'tools', 'winscp'), 'WinSCP.exe')
         utils.copy_file(os.path.join(env.root_path, 'client', 'tools', 'winscp'), os.path.join(tmp_app_path, 'tools', 'winscp'), 'license.txt')
+
+        utils.makedirs(os.path.join(tmp_app_path, 'tools', 'tprdp'))
+        utils.copy_file(os.path.join(env.root_path, 'client', 'tools', 'tprdp'), os.path.join(tmp_app_path, 'tools', 'tprdp'), 'tprdp-client.exe')
+        utils.copy_file(os.path.join(env.root_path, 'client', 'tools', 'tprdp'), os.path.join(tmp_app_path, 'tools', 'tprdp'), 'tprdp-replay.exe')
+        utils.copy_file(os.path.join(env.root_path, 'client', 'tools', 'tprdp'), os.path.join(tmp_app_path, 'tools', 'tprdp'), 'libeay32.dll')
+        utils.copy_file(os.path.join(env.root_path, 'client', 'tools', 'tprdp'), os.path.join(tmp_app_path, 'tools', 'tprdp'), 'ssleay32.dll')
+
         utils.copy_file(os.path.join(env.root_path, 'client', 'tools'), os.path.join(tmp_app_path, 'tools'), 'securecrt-telnet.vbs')
 
         utils.nsis_build(os.path.join(env.root_path, 'dist', 'client', 'windows', 'assist', 'installer.nsi'))

build/builder/core/ver.py

@@ -1,3 +1,3 @@
 # -*- coding: utf8 -*-
-VER_TELEPORT_SERVER = "2.1.2.1"
+VER_TELEPORT_SERVER = "2.2.5.1"
-VER_TELEPORT_ASSIST = "2.1.2.1"
+VER_TELEPORT_ASSIST = "2.2.5.1"

client/tp_assist/ts_ver.h

@@ -1,6 +1,6 @@
 #ifndef __TS_ASSIST_VER_H__
 #define __TS_ASSIST_VER_H__
 
-#define TP_ASSIST_VER	L"2.1.2.1"
+#define TP_ASSIST_VER	L"2.2.5.1"
 
 #endif // __TS_ASSIST_VER_H__

server/tp_core/core/ts_ver.h

@@ -1,6 +1,6 @@
 #ifndef __TS_SERVER_VER_H__
 #define __TS_SERVER_VER_H__
 
-#define TP_SERVER_VER	L"2.1.2.1"
+#define TP_SERVER_VER	L"2.2.5.1"
 
 #endif // __TS_SERVER_VER_H__

server/tp_web/src/ts_ver.h

@@ -1,6 +1,6 @@
 #ifndef __TS_SERVER_VER_H__
 #define __TS_SERVER_VER_H__
 
-#define TP_SERVER_VER	L"2.1.2.1"
+#define TP_SERVER_VER	L"2.2.5.1"
 
 #endif // __TS_SERVER_VER_H__

server/www/teleport/app/eom_ver.py

@@ -1,4 +1,4 @@
 # -*- coding: utf8 -*-
-TS_VER = "2.1.2.1"
+TS_VER = "2.2.5.1"
-TP_ASSIST_LAST_VER = "2.1.2.1"
+TP_ASSIST_LAST_VER = "2.2.5.1"
 TP_ASSIST_REQUIRE = "2.0.0.1"