mirror of
https://github.com/flipperdevices/flipperzero-firmware.git
synced 2025-12-12 04:41:26 +04:00
[FL-3629] fbt: reworked assets & resources handling (#3160)
* 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:
@@ -14,7 +14,6 @@ appenv = ENV["APPENV"] = ENV.Clone(
|
||||
"fbt_assets",
|
||||
"fbt_sdk",
|
||||
],
|
||||
RESOURCES_ROOT=ENV.Dir("#/assets/resources"),
|
||||
)
|
||||
|
||||
appenv.Replace(
|
||||
@@ -56,7 +55,6 @@ appenv.AppendUnique(
|
||||
@dataclass
|
||||
class FlipperExtAppBuildArtifacts:
|
||||
application_map: dict = field(default_factory=dict)
|
||||
resources_dist: NodeList = field(default_factory=NodeList)
|
||||
sdk_tree: NodeList = field(default_factory=NodeList)
|
||||
|
||||
|
||||
@@ -78,8 +76,6 @@ Alias(
|
||||
list(app_artifact.validator for app_artifact in extapps.application_map.values()),
|
||||
)
|
||||
|
||||
extapps.resources_dist = appenv.FapDist(appenv["RESOURCES_ROOT"], [])
|
||||
|
||||
|
||||
if appsrc := appenv.subst("$APPSRC"):
|
||||
launch_target = appenv.AddAppLaunchTarget(appsrc, "launch")
|
||||
|
||||
Reference in New Issue
Block a user