diff --git a/build/.idea/build.iml b/build/.idea/build.iml index 02c8122..6711606 100644 --- a/build/.idea/build.iml +++ b/build/.idea/build.iml @@ -1,11 +1,11 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/build/builder/build-version.py b/build/builder/build-version.py index fbcb419..c0de736 100644 --- a/build/builder/build-version.py +++ b/build/builder/build-version.py @@ -141,7 +141,7 @@ class Builder: self._update_ver_nsi(nsi_file, self.VER_TP_ASSIST) def make_assist_macos_ver(self): - plist_file = os.path.join(env.root_path, 'client', 'tp_assist_macos', 'src', 'tp_assist-Info.plist') + plist_file = os.path.join(env.root_path, 'client', 'tp_assist_macos', 'src', 'TP-Assist-Info.plist') self._update_ver_plist(plist_file, self.VER_TP_ASSIST) ver_file = os.path.join(env.root_path, 'client', 'tp_assist_macos', 'src', 'csrc', 'ts_ver.h') diff --git a/build/builder/core/ver.py b/build/builder/core/ver.py index 5b022cc..4bc5945 100644 --- a/build/builder/core/ver.py +++ b/build/builder/core/ver.py @@ -1,3 +1,3 @@ # -*- coding: utf8 -*- -VER_TP_SERVER = "3.1.0" -VER_TP_ASSIST = "3.1.0" +VER_TP_SERVER = "3.2.0" +VER_TP_ASSIST = "3.2.0" diff --git a/client/tp_assist_win/tp_assist.rc b/client/tp_assist_win/tp_assist.rc index 05aae11..fabec21 100644 Binary files a/client/tp_assist_win/tp_assist.rc and b/client/tp_assist_win/tp_assist.rc differ diff --git a/client/tp_assist_win/ts_ver.h b/client/tp_assist_win/ts_ver.h index b2b4e76..a296cc3 100644 --- a/client/tp_assist_win/ts_ver.h +++ b/client/tp_assist_win/ts_ver.h @@ -1,6 +1,6 @@ #ifndef __TS_ASSIST_VER_H__ #define __TS_ASSIST_VER_H__ -#define TP_ASSIST_VER L"3.1.0" +#define TP_ASSIST_VER L"3.2.0" #endif // __TS_ASSIST_VER_H__ diff --git a/dist/client/windows/assist/installer.nsi b/dist/client/windows/assist/installer.nsi index a4cb5cf..c12f4be 100644 Binary files a/dist/client/windows/assist/installer.nsi and b/dist/client/windows/assist/installer.nsi differ diff --git a/server/tp_core/core/tp_core.rc b/server/tp_core/core/tp_core.rc index 3c6f666..3503ea9 100644 Binary files a/server/tp_core/core/tp_core.rc and b/server/tp_core/core/tp_core.rc differ diff --git a/server/tp_core/core/ts_ver.h b/server/tp_core/core/ts_ver.h index 20daa59..aca4ca9 100644 --- a/server/tp_core/core/ts_ver.h +++ b/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"3.1.0" +#define TP_SERVER_VER L"3.2.0" #endif // __TS_SERVER_VER_H__ diff --git a/server/www/teleport/webroot/app/app_ver.py b/server/www/teleport/webroot/app/app_ver.py index 2a85131..c8cc557 100644 --- a/server/www/teleport/webroot/app/app_ver.py +++ b/server/www/teleport/webroot/app/app_ver.py @@ -1,2 +1,2 @@ # -*- coding: utf8 -*- -TP_SERVER_VER = "3.1.0" +TP_SERVER_VER = "3.2.0" diff --git a/version.in b/version.in index 070de37..8ad7beb 100644 --- a/version.in +++ b/version.in @@ -10,8 +10,8 @@ Minor: 次版本号。如果两个程序集的名称和主版本号相同,而 Revision: 修订号。主版本号和次版本号都相同但修订号不同的程序集应是完全可互换的。 这适用于修复以前发布的程序集中的错误或安全漏洞。 -TP_SERVER 3.1.0 # 整个服务端打包的版本 -TP_TPCORE 3.1.0 # 核心服务 tp_core 的版本 +TP_SERVER 3.2.0 # 整个服务端打包的版本 +TP_TPCORE 3.2.0 # 核心服务 tp_core 的版本 TP_TPWEB 3.1.0 # web服务 tp_web 的版本(一般除非升级Python,否则不会变化) -TP_ASSIST 3.1.0 # 助手版本 +TP_ASSIST 3.2.0 # 助手版本