Skip to content

Commit

Permalink
improve tools and build scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
xianjimli committed Jan 2, 2025
1 parent 5b2f05b commit 3989c6e
Show file tree
Hide file tree
Showing 10 changed files with 910 additions and 124 deletions.
1 change: 1 addition & 0 deletions docs/changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

2025/01/02
* 去掉重复的宏定义(感谢俊杰发现问题)
* 完善打包工具和脚本,各工具新增src_filename参数,可根据文件内的资源文件数组打包指定的资源(感谢培煌提供补丁)

2025/01/01
* 完善 freertos 移植。
Expand Down
6 changes: 3 additions & 3 deletions scripts/update_res_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def use_theme_config_from_res_config(res_config_path, config = None):
if not os.path.exists(config_json) :
print(config_json + ' is not exists.')
return

content = res_config.res_config()
content.load_file(config_json)
else :
Expand Down Expand Up @@ -68,7 +68,7 @@ def use_theme_config_from_res_config(res_config_path, config = None):
else:
imagegen_options = 'rgba'

if IS_GENERATE_INC_BITMAP:
if IS_GENERATE_INC_BITMAP and not content.get_storage_dir():
config_dir = common.join_path(ASSETS_ROOT, common.join_path(theme_name, 'fonts/config'))
common.remove_dir(config_dir)
common.make_dirs(config_dir)
Expand Down Expand Up @@ -242,7 +242,7 @@ def run(awtk_root, is_excluded_file_handler = None, is_new_usage = False) :
print('For details, please read scripts/README.md.')
else:
if GDPI != '':
DPI = GDPI
DPI = GDPI
if IMAGEGEN_OPTIONS != '':
for theme in THEMES :
theme["imagegen_options"] = IMAGEGEN_OPTIONS
Expand Down
Loading

0 comments on commit 3989c6e

Please sign in to comment.