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-11-01 17:56:40 +08:00
parent 70782e3e2f
commit a46122c55b
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/changes.md
View File

@ -1,4 +1,9 @@
# 最新动态 # 最新动态
2023/11/1
* font\_gen修复会同时打包origin默认字体时的报错信息(感谢高源提供补丁)
* str\_gen修复字体内容为空时的报错(感谢高源提供补丁)
2023/10/30 2023/10/30
* 修复conf\_doc\_dup\_node复制数组的问题(感谢俊杰提供补丁)。 * 修复conf\_doc\_dup\_node复制数组的问题(感谢俊杰提供补丁)。
* 增加debugger\_get\_curr\_frame\_index函数(感谢智明提供补丁) * 增加debugger\_get\_curr\_frame\_index函数(感谢智明提供补丁)

14
scripts/update_res_common.py
View File

@ -300,7 +300,7 @@ def get_appint_folder(path, regex = '/', include_self = True):
for reg in regex_list: for reg in regex_list:
folder_list += get_appint_folder_ex(path, reg, [], '') folder_list += get_appint_folder_ex(path, reg, [], '')
if include_self == True: if include_self == True:
folder_list.append(tuple((path, ''))) folder_list.append(tuple((path, '')))
return folder_list return folder_list
@ -652,6 +652,8 @@ def gen_res_all_font():
for f in get_appint_folder(in_files, '.ttf', False): for f in get_appint_folder(in_files, '.ttf', False):
out_files = f[0].replace(INPUT_DIR, join_path(OUTPUT_DIR, 'raw')) out_files = f[0].replace(INPUT_DIR, join_path(OUTPUT_DIR, 'raw'))
out_foler = os.path.dirname(out_files) out_foler = os.path.dirname(out_files)
if 'origin' in out_foler:
continue
if not os.path.exists(out_foler): if not os.path.exists(out_foler):
make_dirs(out_foler) make_dirs(out_foler)
copy_file(f[0], out_files) copy_file(f[0], out_files)
@ -699,6 +701,8 @@ def gen_res_all_font():
raw = f[0] raw = f[0]
filename = filename.replace(INPUT_DIR, join_path(OUTPUT_DIR, 'inc')) filename = filename.replace(INPUT_DIR, join_path(OUTPUT_DIR, 'inc'))
inc = filename + '.res' inc = filename + '.res'
if "origin" in inc:
continue
resgen(raw, inc, THEME, '.res') resgen(raw, inc, THEME, '.res')
emit_generate_res_after('font') emit_generate_res_after('font')
@ -1212,12 +1216,12 @@ def get_args(args) :
def get_opts(args) : def get_opts(args) :
import getopt import getopt
longsots = ['awtk_root=', 'AWTK_ROOT=', longsots = ['awtk_root=', 'AWTK_ROOT=',
'action=', 'ACTION=', 'action=', 'ACTION=',
'help', 'HELP', 'help', 'HELP',
'dpi=', 'DPI=', 'dpi=', 'DPI=',
'image_options=', 'IMAGE_OPTIONS=', 'image_options=', 'IMAGE_OPTIONS=',
'lcd_orientation=', 'LCD_ORIENTATION=', 'lcd_orientation=', 'LCD_ORIENTATION=',
'lcd_enable_fast_rotation=', 'LCD_ENABLE_FAST_ROTATION=', 'lcd_enable_fast_rotation=', 'LCD_ENABLE_FAST_ROTATION=',
'res_config_file=', 'RES_CONFIG_FILE=', 'res_config_file=', 'RES_CONFIG_FILE=',
'res_config_script=', 'RES_CONFIG_SCRIPT=', 'res_config_script=', 'RES_CONFIG_SCRIPT=',

8
tools/str_gen/main.cc
View File

@ -29,9 +29,11 @@
ret_t gen_one(const char* input_file, const char* output_file, const char* theme, ret_t gen_one(const char* input_file, const char* output_file, const char* theme,
bool_t output_bin) { bool_t output_bin) {
ret_t ret = RET_OK; ret_t ret = RET_OK;
if (!xml_to_str_gen(input_file, output_file, theme, output_bin)) { if (!exit_if_need_not_update(input_file, output_file)) {
ret = RET_FAIL; if (!xml_to_str_gen(input_file, output_file, theme, output_bin)) {
GEN_ERROR(input_file); ret = RET_FAIL;
GEN_ERROR(input_file);
}
} }
return ret; return ret;
} }