improve build scripts

This commit is contained in:
lixianjing 2024-07-22 17:53:36 +08:00
parent 0ee1a6a330
commit 95ba9d7b32
2 changed files with 6 additions and 4 deletions

View File

@ -2,6 +2,7 @@
2024/07/22
* 修正dragger save\_x和save\_y(感谢颖健提供补丁)
* 修改app_helper优先使用compile config设定的APP_ROOT(感谢朝泽提供补丁)
2024/07/19
* 支持lldb正常退出后不会暂停runtime程序(感谢智明提供补丁)

View File

@ -259,7 +259,10 @@ class AppHelperBase:
self.complie_helper.scons_user_sopt(ARGUMENTS)
compile_config.set_curr_config(self.complie_helper)
APP_ROOT = os.path.normpath(os.getcwd())
APP_ROOT = compile_config.get_curr_app_root()
if len(APP_ROOT) == 0:
APP_ROOT = os.path.normpath(os.getcwd())
compile_config.set_curr_app_root(APP_ROOT)
self.SRC_DIR = 'src'
self.TKC_ONLY = getTkcOnly();
@ -356,14 +359,12 @@ class AppHelperBase:
def getAwtkConfig(self):
sys.path.insert(0, self.AWTK_ROOT)
tmp_cwd = os.getcwd()
os.chdir(self.AWTK_ROOT)
compile_config.set_curr_app_root(tmp_cwd)
tmp_complie_helper = compile_config.get_curr_config()
compile_config.set_app_win32_res(tmp_complie_helper.get_value('WIN32_RES', None))
compile_config.set_curr_config(None)
import awtk_config as awtk
os.chdir(tmp_cwd)
os.chdir(compile_config.get_curr_app_root())
compile_config.set_curr_config(tmp_complie_helper)
return awtk