1
mirror of https://github.com/flipperdevices/flipperzero-firmware.git synced 2025-12-12 20:59:50 +04:00

fbt: glob improvements (#3117)

* fbt: glob improvements, now treats entries with no special glob chars as files by default, not calling scons' globbing for them
* fbt: further fixes for glob
* fbt: less strict existence checks
* fbt: fixed frame_rate collection; typo fixes & comments

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
hedger
2023-10-06 10:11:02 +03:00
committed by GitHub
parent 699078d5a5
commit d47e5ca520
3 changed files with 23 additions and 10 deletions

View File

@@ -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