From 8fef2fc2cd96319ea904038c07e2d58c5ac33e12 Mon Sep 17 00:00:00 2001 From: Apex Liu Date: Wed, 5 Aug 2020 02:56:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=AF=91Mac=E7=89=88=E5=8A=A9?= =?UTF-8?q?=E6=89=8B=EF=BC=8C=E5=B9=B6=E5=8F=91=E5=B8=833.5.6=E7=89=88Mac?= =?UTF-8?q?=E5=8A=A9=E6=89=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/build.py | 4 ++-- build/builder/build-external.py | 2 ++ build/builder/core/env.py | 4 ++-- client/tp_assist_macos/src/TP-Assist-Info.plist | 2 +- client/tp_assist_macos/src/zh-Hans.lproj/Localizable.strings | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build/build.py b/build/build.py index c6c7f51..f4a7122 100644 --- a/build/build.py +++ b/build/build.py @@ -258,8 +258,8 @@ def make_options(): add_split('version [build every release]') add_option('x64', 'ver', 'Update version setting') add_split('client side') - add_option('x64', 'assist-exe', 'Assist Execute [%s]' % ctx.target_path) - add_option('x64', 'assist-installer', 'Assist Installer') + add_option('x64', 'client', 'Assist Execute [%s]' % ctx.target_path) + add_option('x64', 'client-installer', 'Assist Installer') add_split('clear') add_option('x86', 'clear-ext-client', 'Clear external libraries for client') else: diff --git a/build/builder/build-external.py b/build/builder/build-external.py index 1ca3d57..26ef5d6 100644 --- a/build/builder/build-external.py +++ b/build/builder/build-external.py @@ -934,6 +934,8 @@ def main(): elif command == 'ext-server': builder.prepare_python() builder.build_mbedtls() + builder.build_jsoncpp() + builder.build_mongoose() builder.build_libuv() builder.build_zlib() builder.build_libssh() diff --git a/build/builder/core/env.py b/build/builder/core/env.py index e9680d8..bf51ab0 100644 --- a/build/builder/core/env.py +++ b/build/builder/core/env.py @@ -187,8 +187,8 @@ class Env(object): cc.e(' - can not locate `cmake`, so I can not build binary from source.') elif self.is_macos: - if 'qt' in _tmp: - self.qt = _tmp['qt'] + if 'qt_path' in _tmp: + self.qt = _tmp['qt_path'] else: self.qt = None diff --git a/client/tp_assist_macos/src/TP-Assist-Info.plist b/client/tp_assist_macos/src/TP-Assist-Info.plist index 1df91ea..de9fa1d 100644 --- a/client/tp_assist_macos/src/TP-Assist-Info.plist +++ b/client/tp_assist_macos/src/TP-Assist-Info.plist @@ -31,7 +31,7 @@ NSAppleEventsUsageDescription NSHumanReadableCopyright - Copyright © 2017~2019, tp4a.com. All rights reserved. + Copyright © 2017~2020, tp4a.com. All rights reserved. NSMainNibFile MainMenu NSPrincipalClass diff --git a/client/tp_assist_macos/src/zh-Hans.lproj/Localizable.strings b/client/tp_assist_macos/src/zh-Hans.lproj/Localizable.strings index 9ebc70b..5b7dcf7 100644 --- a/client/tp_assist_macos/src/zh-Hans.lproj/Localizable.strings +++ b/client/tp_assist_macos/src/zh-Hans.lproj/Localizable.strings @@ -15,5 +15,5 @@ "about " = "关于 "; "version" = ""; "app_full_name" = "Teleport助手"; -"copyright" = "© 2017~2019，tp4a.com。保留所有权利。"; +"copyright" = "© 2017~2020，tp4a.com。保留所有权利。"; "visit_tp4a_website" = "访问 Teleport 网站";