mirrors/flipperzero-firmware
1
Fork 0
mirror of https://github.com/flipperdevices/flipperzero-firmware.git synced 2025-12-12 20:59:50 +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

23
scripts/fbt_tools/fbt_hwtarget.py
View File

@@ -2,9 +2,9 @@ import json
class HardwareTargetLoader:
def __init__(self, env, target_scons_dir, target_id):
def __init__(self, env, root_target_scons_dir, target_id):
self.env = env
self.target_scons_dir = target_scons_dir
self.all_targets_root_dir = root_target_scons_dir
self.target_dir = self._getTargetDir(target_id)
# self.target_id = target_id
self.layered_target_dirs = []
@@ -23,7 +23,7 @@ class HardwareTargetLoader:
self._processTargetDefinitions(target_id)
def _getTargetDir(self, target_id):
return self.target_scons_dir.Dir(f"f{target_id}")
return self.all_targets_root_dir.Dir(f"f{target_id}")
def _loadDescription(self, target_id):
target_json_file = self._getTargetDir(target_id).File("target.json")
@@ -34,14 +34,14 @@ class HardwareTargetLoader:
return vals
def _processTargetDefinitions(self, target_id):
self.layered_target_dirs.append(f"targets/f{target_id}")
target_dir = self._getTargetDir(target_id)
self.layered_target_dirs.append(target_dir)
config = self._loadDescription(target_id)
for path_list in ("include_paths", "sdk_header_paths"):
getattr(self, path_list).extend(
f"#/firmware/targets/f{target_id}/{p}"
for p in config.get(path_list, [])
target_dir.Dir(p) for p in config.get(path_list, [])
)
self.excluded_sources.extend(config.get("excluded_sources", []))
@@ -50,7 +50,7 @@ class HardwareTargetLoader:
file_attrs = (
# (name, use_src_node)
("startup_script", False),
("startup_script", True),
("linker_script_flash", True),
("linker_script_ram", True),
("linker_script_app", True),
@@ -59,9 +59,10 @@ class HardwareTargetLoader:
for attr_name, use_src_node in file_attrs:
if (val := config.get(attr_name)) and not getattr(self, attr_name):
node = self.env.File(f"firmware/targets/f{target_id}/{val}")
node = target_dir.File(val)
if use_src_node:
node = node.srcnode()
# print(f"Got node {node}, {node.path} for {attr_name}")
setattr(self, attr_name, node)
for attr_name in ("linker_dependencies",):
@@ -84,8 +85,8 @@ class HardwareTargetLoader:
)
seen_filenames.update(f.name for f in accepted_sources)
sources.extend(accepted_sources)
# print(f"Found {len(sources)} sources: {list(f.name for f in sources)}")
return sources
# print(f"Found {len(sources)} sources: {list(f.path for f in sources)}")
return list(f.get_path(self.all_targets_root_dir) for f in sources)
def gatherSdkHeaders(self):
sdk_headers = []
@@ -101,7 +102,7 @@ class HardwareTargetLoader:
def ConfigureForTarget(env, target_id):
target_loader = HardwareTargetLoader(env, env.Dir("#/firmware/targets"), target_id)
target_loader = HardwareTargetLoader(env, env["TARGETS_ROOT"], target_id)
env.Replace(
TARGET_CFG=target_loader,
SDK_DEFINITION=target_loader.sdk_symbols,