test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-11-29 18:48:09 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

improve build scripts

Browse Source
This commit is contained in:
lixianjing 2023-12-27 12:12:00 +08:00
parent 8e3da35eeb
commit 6d5f0f30e1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.md
View File

@ -2,6 +2,7 @@
2023/12/27 2023/12/27
* 增加函数tk\_islower/tk\_isupper(感谢兆坤提供补丁) * 增加函数tk\_islower/tk\_isupper(感谢兆坤提供补丁)
* 增加函数slist\_find\_ex(感谢兆坤提供补丁) * 增加函数slist\_find\_ex(感谢兆坤提供补丁)
* 修复app的build\_dir参数编译不正常的问题(感谢智明提供补丁)
2023/12/26 2023/12/26
* 完善API注释错误（感谢俊杰发现问题) * 完善API注释错误（感谢俊杰发现问题)

7
scripts/app_helper_base.py
View File

@ -394,8 +394,7 @@ class AppHelperBase:
for iter in self.DEPENDS_LIBS: for iter in self.DEPENDS_LIBS:
for so in iter['shared_libs']: for so in iter['shared_libs']:
src = os.path.join(iter['root'], self.BUILD_DIR) self.awtk.copySharedLib(iter['root'], self.APP_BIN_DIR, so)
self.awtk.copySharedLib(src, self.APP_BIN_DIR, so)
def cleanAwtkSharedLib(self): def cleanAwtkSharedLib(self):
if self.TKC_ONLY: if self.TKC_ONLY:
@ -674,8 +673,8 @@ class AppHelperBase:
LIBPATH = LIBPATH + [join_path(iter['root'], f)] LIBPATH = LIBPATH + [join_path(iter['root'], f)]
else: else:
if self.isBuildShared(): if self.isBuildShared():
LIBPATH += [join_path(iter['root'], self.BIN_DIR)] LIBPATH += [join_path(iter['root'], 'bin')]
LIBPATH += [join_path(iter['root'], self.LIB_DIR)] LIBPATH += [join_path(iter['root'], 'lib')]
LIBS = self.APP_LIBS + LIBS LIBS = self.APP_LIBS + LIBS
if hasattr(awtk, 'CC'): if hasattr(awtk, 'CC'):