Merge branch 'ofw_dev' into dev

scripts/fbt_tools/fbt_assets.py

@@ -9,7 +9,7 @@ from SCons.Errors import StopError
 
 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"])
+    icons_src += env.GlobRecursive("**/frame_rate", env["ICON_SRC_DIR"])
 
     target = [
         target[0].File(env.subst("${ICON_FILE_NAME}.c")),

scripts/fbt_tools/fbt_extapps.py

@@ -157,6 +157,11 @@ class AppBuilder:
                 for source_type in self.app.sources
             )
         )
+        if not app_sources:
+            raise UserError(f"No source files found for {self.app.appid}")
+
+        ## Uncomment for debug
+        # print(f"App sources for {self.app.appid}: {list(f.path for f in app_sources)}")
 
         app_artifacts = FlipperExternalAppInfo(self.app)
         app_artifacts.debug = self.app_env.Program(
@@ -239,9 +244,10 @@ class AppBuilder:
 
         # Add dependencies on file assets
         for assets_dir in self.app._assets_dirs:
+            glob_res = self.app_env.GlobRecursive("*", assets_dir)
             self.app_env.Depends(
                 app_artifacts.compact,
-                (assets_dir, self.app_env.GlobRecursive("*", assets_dir)),
+                (*glob_res, assets_dir),
             )
 
         # Always run the validator for the app's binary when building the app

scripts/fbt_tools/pvsstudio.py

@@ -48,7 +48,6 @@ def generate(env):
             "@.pvsoptions",
             "-j${PVSNCORES}",
             # "--incremental", # kinda broken on PVS side
-            "--disableLicenseExpirationCheck",
         ],
         PVSCONVOPTIONS=[
             "-a",

scripts/fbt_tools/sconsrecursiveglob.py

@@ -1,6 +1,7 @@
 import SCons
 from fbt.util import GLOB_FILE_EXCLUSION
 from SCons.Script import Flatten
+from SCons.Node.FS import has_glob_magic
 
 
 def GlobRecursive(env, pattern, node=".", exclude=[]):
@@ -9,14 +10,20 @@ def GlobRecursive(env, pattern, node=".", exclude=[]):
     results = []
     if isinstance(node, str):
         node = env.Dir(node)
-    for f in node.glob("*", source=True, exclude=exclude):
-        if isinstance(f, SCons.Node.FS.Dir):
-            results += env.GlobRecursive(pattern, f, exclude)
-    results += node.glob(
-        pattern,
-        source=True,
-        exclude=exclude,
-    )
+    # Only initiate actual recursion if special symbols can be found in 'pattern'
+    if has_glob_magic(pattern):
+        for f in node.glob("*", source=True, exclude=exclude):
+            if isinstance(f, SCons.Node.FS.Dir):
+                results += env.GlobRecursive(pattern, f, exclude)
+        results += node.glob(
+            pattern,
+            source=True,
+            exclude=exclude,
+        )
+    # Otherwise, just check if that's an existing file path
+    # NB: still creates "virtual" nodes as part of existence check
+    elif (file_node := node.File(pattern)).exists() or file_node.rexists():
+        results.append(file_node)
     # print(f"Glob result for {pattern} from {node}: {results}")
     return results