mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 04:34:43 +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

90
scripts/fbt_tools/fbt_assets.py
View File

@@ -5,9 +5,10 @@ from ansi.color import fg
from SCons.Action import Action
from SCons.Builder import Builder
from SCons.Errors import StopError
from SCons.Node.FS import File
def icons_emitter(target, source, env):
def _icons_emitter(target, source, env):
icons_src = env.GlobRecursive("*.png", env["ICON_SRC_DIR"])
icons_src += env.GlobRecursive("**/frame_rate", env["ICON_SRC_DIR"])
@@ -18,7 +19,7 @@ def icons_emitter(target, source, env):
return target, icons_src
def proto_emitter(target, source, env):
def _proto_emitter(target, source, env):
target = []
for src in source:
basename = os.path.splitext(src.name)[0]
@@ -27,7 +28,7 @@ def proto_emitter(target, source, env):
return target, source
def dolphin_emitter(target, source, env):
def _dolphin_emitter(target, source, env):
res_root_dir = source[0].Dir(env["DOLPHIN_RES_TYPE"])
source = [res_root_dir]
source.extend(env.GlobRecursive("*.*", res_root_dir.srcnode()))
@@ -38,16 +39,15 @@ def dolphin_emitter(target, source, env):
if env["DOLPHIN_RES_TYPE"] == "external":
target = [target_base_dir.File("manifest.txt")]
## A detailed list of files to be generated
## works better if we just leave target the folder
# target = []
# target.extend(
# map(
# lambda node: target_base_dir.File(
# res_root_dir.rel_path(node).replace(".png", ".bm")
# ),
# filter(lambda node: isinstance(node, SCons.Node.FS.File), source),
# )
# )
# Preserve original paths, do .png -> .bm conversion
target.extend(
map(
lambda node: target_base_dir.File(
res_root_dir.rel_path(node).replace(".png", ".bm")
),
filter(lambda node: isinstance(node, File), source),
)
)
else:
asset_basename = f"assets_dolphin_{env['DOLPHIN_RES_TYPE']}"
target = [
@@ -65,7 +65,7 @@ def dolphin_emitter(target, source, env):
return target, source
def _invoke_git(args, source_dir):
def __invoke_git(args, source_dir):
cmd = ["git"]
cmd.extend(args)
return (
@@ -75,11 +75,11 @@ def _invoke_git(args, source_dir):
)
def proto_ver_generator(target, source, env):
def _proto_ver_generator(target, source, env):
target_file = target[0]
src_dir = source[0].dir.abspath
try:
_invoke_git(
__invoke_git(
["fetch", "--tags"],
source_dir=src_dir,
)
@@ -88,7 +88,7 @@ def proto_ver_generator(target, source, env):
print(fg.boldred("Git: fetch failed"))
try:
git_describe = _invoke_git(
git_describe = __invoke_git(
["describe", "--tags", "--abbrev=0"],
source_dir=src_dir,
)
@@ -127,7 +127,6 @@ def generate(env):
ICONSCOMSTR="\tICONS\t${TARGET}",
PROTOCOMSTR="\tPROTO\t${SOURCE}",
DOLPHINCOMSTR="\tDOLPHIN\t${DOLPHIN_RES_TYPE}",
RESMANIFESTCOMSTR="\tMANIFEST\t${TARGET}",
PBVERCOMSTR="\tPBVER\t${TARGET}",
)
@@ -135,37 +134,74 @@ def generate(env):
BUILDERS={
"IconBuilder": Builder(
action=Action(
'${PYTHON3} ${ASSETS_COMPILER} icons ${ICON_SRC_DIR} ${TARGET.dir} --filename "${ICON_FILE_NAME}"',
[
[
"${PYTHON3}",
"${ASSETS_COMPILER}",
"icons",
"${ICON_SRC_DIR}",
"${TARGET.dir}",
"--filename",
"${ICON_FILE_NAME}",
],
],
"${ICONSCOMSTR}",
),
emitter=icons_emitter,
emitter=_icons_emitter,
),
"ProtoBuilder": Builder(
action=Action(
"${PYTHON3} ${NANOPB_COMPILER} -q -I${SOURCE.dir.posix} -D${TARGET.dir.posix} ${SOURCES.posix}",
[
[
"${PYTHON3}",
"${NANOPB_COMPILER}",
"-q",
"-I${SOURCE.dir.posix}",
"-D${TARGET.dir.posix}",
"${SOURCES.posix}",
],
],
"${PROTOCOMSTR}",
),
emitter=proto_emitter,
emitter=_proto_emitter,
suffix=".pb.c",
src_suffix=".proto",
),
"DolphinSymBuilder": Builder(
action=Action(
"${PYTHON3} ${ASSETS_COMPILER} dolphin -s dolphin_${DOLPHIN_RES_TYPE} ${SOURCE} ${_DOLPHIN_OUT_DIR}",
[
[
"${PYTHON3}",
"${ASSETS_COMPILER}",
"dolphin",
"-s",
"dolphin_${DOLPHIN_RES_TYPE}",
"${SOURCE}",
"${_DOLPHIN_OUT_DIR}",
],
],
"${DOLPHINCOMSTR}",
),
emitter=dolphin_emitter,
emitter=_dolphin_emitter,
),
"DolphinExtBuilder": Builder(
action=Action(
"${PYTHON3} ${ASSETS_COMPILER} dolphin ${SOURCE} ${_DOLPHIN_OUT_DIR}",
[
[
"${PYTHON3}",
"${ASSETS_COMPILER}",
"dolphin",
"${SOURCE}",
"${_DOLPHIN_OUT_DIR}",
],
],
"${DOLPHINCOMSTR}",
),
emitter=dolphin_emitter,
emitter=_dolphin_emitter,
),
"ProtoVerBuilder": Builder(
action=Action(
proto_ver_generator,
_proto_ver_generator,
"${PBVERCOMSTR}",
),
),