fbt: moved SD card resources to owning apps

applications/main/bad_usb/application.fam

@@ -6,6 +6,7 @@ App(
     stack_size=2 * 1024,
     icon="A_BadUsb_14",
     order=70,
+    resources="resources",
     fap_libs=["assets"],
     fap_icon="icon.png",
     fap_category="USB",

applications/main/infrared/application.fam

@@ -7,6 +7,7 @@ App(
     icon="A_Infrared_14",
     stack_size=3 * 1024,
     order=40,
+    resources="resources",
     fap_libs=["assets"],
     fap_icon="icon.png",
     fap_category="Infrared",

applications/main/nfc/application.fam

@@ -7,6 +7,7 @@ App(
     icon="A_NFC_14",
     stack_size=5 * 1024,
     order=30,
+    resources="resources",
     fap_libs=["assets"],
     fap_icon="icon.png",
     fap_category="NFC",

applications/main/subghz/application.fam

@@ -7,6 +7,7 @@ App(
     icon="A_Sub1ghz_14",
     stack_size=3 * 1024,
     order=10,
+    resources="resources",
     fap_libs=["assets", "hwdrivers"],
     fap_icon="icon.png",
     fap_category="Sub-GHz",

applications/main/u2f/application.fam

@@ -6,6 +6,7 @@ App(
     stack_size=2 * 1024,
     icon="A_U2F_14",
     order=80,
+    resources="resources",
     fap_libs=["assets"],
     fap_category="USB",
     fap_icon="icon.png",

assets/SConscript

@@ -6,7 +6,6 @@ assetsenv = env.Clone(
     tools=["fbt_assets"],
     FW_LIB_NAME="assets",
     GIT_UNIX_TIMESTAMP=get_git_commit_unix_timestamp(),
-    RESOURCES_STATIC_ROOT=env.Dir("#/assets/resources"),
 )
 assetsenv.ApplyLibFlags()
 
@@ -102,7 +101,6 @@ if assetsenv["IS_BASE_FIRMWARE"]:
                     "manifest",
                     "${TARGET.dir.posix}",
                     "--timestamp=${GIT_UNIX_TIMESTAMP}",
-                    "--static-dir=${RESOURCES_STATIC_ROOT}",
                 ]
             ],
             "${RESMANIFESTCOMSTR}",

scripts/assets.py

@@ -54,11 +54,6 @@ def init(self):
             type=int,
             required=False,
         )
-        self.parser_manifest.add_argument(
-            "--static-dir",
-            help="Static files to add to resources",
-            required=True,
-        )
         self.parser_manifest.set_defaults(func=self.manifest)
 
         self.parser_copro = self.subparsers.add_parser(
@@ -227,11 +222,6 @@ def manifest(self):
             self.logger.error(f'"{directory_path}" is not a directory')
             exit(255)
 
-        shutil.copytree(
-            self.args.static_dir,
-            directory_path,
-            dirs_exist_ok=True,
-        )
         manifest_file = os.path.join(directory_path, "Manifest")
         old_manifest = Manifest()
         if os.path.exists(manifest_file):

scripts/fbt/appmanifest.py

@@ -64,6 +64,7 @@ class Library:
     order: int = 0
     sdk_headers: List[str] = field(default_factory=list)
     targets: List[str] = field(default_factory=lambda: ["all"])
+    resources: Optional[str] = None
 
     # .fap-specific
     sources: List[str] = field(default_factory=lambda: ["*.c*"])
@@ -268,11 +269,15 @@ def __init__(
         self._check_unsatisfied()  # unneeded?
         self._check_target_match()
         self._group_plugins()
-        self.apps = sorted(
+        self._apps = sorted(
             list(map(self.appmgr.get, self.appnames)),
             key=lambda app: app.appid,
         )
 
+    @property
+    def apps(self):
+        return list(self._apps)
+
     def _is_missing_dep(self, dep_name: str):
         return dep_name not in self.appnames
 
@@ -381,13 +386,13 @@ def _group_plugins(self):
 
     def get_apps_cdefs(self):
         cdefs = set()
-        for app in self.apps:
+        for app in self._apps:
             cdefs.update(app.cdefines)
         return sorted(list(cdefs))
 
     def get_sdk_headers(self):
         sdk_headers = []
-        for app in self.apps:
+        for app in self._apps:
             sdk_headers.extend(
                 [
                     src._appdir.File(header)
@@ -401,14 +406,14 @@ def get_apps_of_type(self, apptype: FlipperAppType, all_known: bool = False):
         return sorted(
             filter(
                 lambda app: app.apptype == apptype,
-                self.appmgr.known_apps.values() if all_known else self.apps,
+                self.appmgr.known_apps.values() if all_known else self._apps,
             ),
             key=lambda app: app.order,
         )
 
     def get_builtin_apps(self):
         return list(
-            filter(lambda app: app.apptype in self.BUILTIN_APP_TYPES, self.apps)
+            filter(lambda app: app.apptype in self.BUILTIN_APP_TYPES, self._apps)
         )
 
     def get_builtin_app_folders(self):

scripts/fbt_tools/fbt_extapps.py

@@ -344,6 +344,17 @@ def resources_fap_dist_emitter(target, source, env):
             source.append(app_artifacts.compact)
             target.append(resources_root.File(dist_path))
 
+    # Deploy apps' resources too
+    for app in env["APPBUILD"].apps:
+        if not app.resources:
+            continue
+        apps_resource_dir = app._appdir.Dir(app.resources)
+        for res_file in env.GlobRecursive("*", apps_resource_dir):
+            if not isinstance(res_file, File):
+                continue
+            source.append(res_file)
+            target.append(resources_root.File(res_file.get_path(apps_resource_dir)))
+
     assert len(target) == len(source)
     return (target, source)