minor cleanup

flipperdevices · Oct 25, 2023 · 54e8711 · 54e8711
1 parent 3079eeb
commit 54e8711
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/applications/services/loader/loader.h b/applications/services/loader/loader.h
@@ -29,7 +29,7 @@ typedef struct {
 /**
  * @brief Start application
  * @param[in] instance loader instance
- * @param[in] name application name
+ * @param[in] name application name or id
  * @param[in] args application arguments
  * @param[out] error_message detailed error message, can be NULL
  * @return LoaderStatus 
@@ -40,7 +40,7 @@ LoaderStatus
 /**
  * @brief Start application with GUI error message
  * @param[in] instance loader instance
- * @param[in] name application name
+ * @param[in] name application name or id
  * @param[in] args application arguments
  * @return LoaderStatus 
  */

diff --git a/scripts/fbt_tools/fbt_assets.py b/scripts/fbt_tools/fbt_assets.py
@@ -39,6 +39,7 @@ 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
+        # Preserve original paths, do .png -> .bm conversion
         target.extend(
             map(
                 lambda node: target_base_dir.File(

diff --git a/scripts/fbt_tools/fbt_extapps.py b/scripts/fbt_tools/fbt_extapps.py
@@ -1,7 +1,5 @@
 import itertools
-import os
 import pathlib
-import shutil
 from dataclasses import dataclass, field
 from typing import Dict, List, Optional
 

diff --git a/scripts/fbt_tools/fbt_resources.py b/scripts/fbt_tools/fbt_resources.py
@@ -1,6 +1,3 @@
-# import os
-# import subprocess
-
 import os
 import shutil
 
@@ -11,7 +8,7 @@
 from SCons.Node.FS import Dir, File
 
 
-def resources_dist_emitter(target, source, env):
+def _resources_dist_emitter(target, source, env):
     resources_root = env.Dir(env["RESOURCES_ROOT"])
 
     target = []
@@ -53,7 +50,7 @@ def resources_dist_emitter(target, source, env):
     return (target, source)
 
 
-def resources_dist_action(target, source, env):
+def _resources_dist_action(target, source, env):
     shutil.rmtree(env.Dir(env["RESOURCES_ROOT"]).abspath, ignore_errors=True)
     for src, target in zip(source, target):
         os.makedirs(os.path.dirname(target.path), exist_ok=True)
@@ -75,10 +72,10 @@ def generate(env, **kw):
         BUILDERS={
             "ResourcesDist": Builder(
                 action=Action(
-                    resources_dist_action,
+                    _resources_dist_action,
                     "${RESOURCEDISTCOMSTR}",
                 ),
-                emitter=resources_dist_emitter,
+                emitter=_resources_dist_emitter,
             ),
             "ManifestBuilder": Builder(
                 action=Action(

diff --git a/site_scons/extapps.scons b/site_scons/extapps.scons
@@ -55,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)