From b259cb77f741afa4aa28575bdc532a3dcf1ca936 Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Mon, 6 Sep 2021 20:08:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3lib=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: a1012112796 <1012112796@qq.com> --- building.py | 3 ++- sharelib.py | 14 +------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/building.py b/building.py index 4b2253f..ae7960f 100644 --- a/building.py +++ b/building.py @@ -709,11 +709,12 @@ def GroupLibFullName(name, env): return env['LIBPREFIX'] + name + env['LIBSUFFIX'] def BuildLibInstallAction(target, source, env): + import rtconfig lib_name = GetOption('buildlib') for Group in Projects: if Group['name'] == lib_name: lib_name = GroupLibFullName(Group['name'], env) - dst_name = os.path.join(Group['path'], lib_name) + dst_name = os.path.join(rtconfig.SHARE_LIB_PATH, Group['name'], lib_name) print('Copy '+lib_name+' => ' + dst_name) do_copy_file(lib_name, dst_name) break diff --git a/sharelib.py b/sharelib.py index e883733..3f76775 100644 --- a/sharelib.py +++ b/sharelib.py @@ -48,19 +48,7 @@ class SharelibHandler: def __export_lib(self, dist_path, path, libs): for lib in libs: - libFile = path +'/lib' + lib + '.a' - libExist = False - if os.path.isfile(libFile): - shutil.copy(libFile, dist_path) - libExist = True - - libFile = path +'/lib' + lib + '.lib' - if os.path.isfile(libFile): - shutil.copy(libFile, dist_path) - libExist = True - - if libExist: - self._LIB_LIST.append(lib) + self._LIB_LIST.append(lib) def __export_headers(self, dist_path, group, path, headers, all, need_path = True): dst = os.path.join(dist_path, group)