mirrors/flipperzero-firmware
1
Fork 0
mirror of https://github.com/flipperdevices/flipperzero-firmware.git synced 2025-12-12 12:51:22 +04:00
Code Issues Activity

[FL-3629] fbt: reworked assets & resources handling (#3160)

Browse Source 
* fbt: reworking targets & assets handling WIP
* fbt: dist fixes
* fbt: moved SD card resources to owning apps
* unit_tests: moved resources to app folder
* github: updated unit_tests paths
* github: packaging fixes
* unit_tests: fixes
* fbt: assets: internal cleanup
* fbt: reworked assets handling
* github: unit_tests: reintroducing fixes
* minor cleanup
* fbt: naming changes to reflect private nature of scons tools
* fbt: resources: fixed dist archive paths
* docs: updated paths
* docs: updated more paths
* docs: included "resources" parameter in app manifest docs; updated assets readme
* updated gitignore for assets
* github: updated action versions
* unit_tests: restored timeout; scripts: assets: logging changes
* gh: don't upload desktop animations for unit test run

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
hedger
2023-10-30 19:17:30 +04:00
committed by GitHub
parent 176fb21f5f
commit 917410a0a8
345 changed files with 466 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/fbt_tools/fbt_sdk.py
View File

@@ -37,13 +37,13 @@ def ProcessSdkDepends(env, filename):
return depends
def api_amalgam_emitter(target, source, env):
def _api_amalgam_emitter(target, source, env):
target.append(env.ChangeFileExtension(target[0], ".d"))
target.append(env.ChangeFileExtension(target[0], ".i.c"))
return target, source
def api_amalgam_gen_origin_header(target, source, env):
def _api_amalgam_gen_origin_header(target, source, env):
mega_file = env.subst("${TARGET}.c", target=target[0])
with open(mega_file, "wt") as sdk_c:
sdk_c.write(
@@ -183,12 +183,12 @@ class SdkTreeBuilder:
self._generate_sdk_meta()
def deploy_sdk_header_tree_action(target, source, env):
def _deploy_sdk_header_tree_action(target, source, env):
sdk_tree = SdkTreeBuilder(env, target, source)
return sdk_tree.deploy_action()
def deploy_sdk_header_tree_emitter(target, source, env):
def _deploy_sdk_header_tree_emitter(target, source, env):
sdk_tree = SdkTreeBuilder(env, target, source)
return sdk_tree.emitter(target, source, env)
@@ -227,7 +227,7 @@ def _check_sdk_is_up2date(sdk_cache: SdkCache):
)
def validate_api_cache(source, target, env):
def _validate_api_cache(source, target, env):
# print(f"Generating SDK for {source[0]} to {target[0]}")
current_sdk = SdkCollector()
current_sdk.process_source_file_for_sdk(source[0].path)
@@ -240,7 +240,7 @@ def validate_api_cache(source, target, env):
_check_sdk_is_up2date(sdk_cache)
def generate_api_table(source, target, env):
def _generate_api_table(source, target, env):
sdk_cache = SdkCache(source[0].path)
_check_sdk_is_up2date(sdk_cache)
@@ -278,10 +278,10 @@ def generate(env, **kw):
env.Append(
BUILDERS={
"ApiAmalgamator": Builder(
emitter=api_amalgam_emitter,
emitter=_api_amalgam_emitter,
action=[
Action(
api_amalgam_gen_origin_header,
_api_amalgam_gen_origin_header,
"$SDK_AMALGAMATE_HEADER_COMSTR",
),
Action(
@@ -293,15 +293,15 @@ def generate(env, **kw):
),
"SDKHeaderTreeExtractor": Builder(
action=Action(
deploy_sdk_header_tree_action,
_deploy_sdk_header_tree_action,
"$SDKTREE_COMSTR",
),
emitter=deploy_sdk_header_tree_emitter,
emitter=_deploy_sdk_header_tree_emitter,
src_suffix=".d",
),
"ApiTableValidator": Builder(
action=Action(
validate_api_cache,
_validate_api_cache,
"$SDKSYM_UPDATER_COMSTR",
),
suffix=".csv",
@@ -309,7 +309,7 @@ def generate(env, **kw):
),
"ApiSymbolTable": Builder(
action=Action(
generate_api_table,
_generate_api_table,
"$APITABLE_GENERATOR_COMSTR",
),
suffix=".h",