[FL-3097] fbt, faploader: minimal app module implementation (#2420)
* fbt, faploader: minimal app module implementation * faploader, libs: moved API hashtable core to flipper_application * example: compound api * lib: flipper_application: naming fixes, doxygen comments * fbt: changed `requires` manifest field behavior for app extensions * examples: refactored plugin apps; faploader: changed new API naming; fbt: changed PLUGIN app type meaning * loader: dropped support for debug apps & plugin menus * moved applications/plugins -> applications/external * Restored x bit on chiplist_convert.py * git: fixed free-dap submodule path * pvs: updated submodule paths * examples: example_advanced_plugins.c: removed potential memory leak on errors * examples: example_plugins: refined requires * fbt: not deploying app modules for debug/sample apps; extra validation for .PLUGIN-type apps * apps: removed cdefines for external apps * fbt: moved ext app path definition * fbt: reworked fap_dist handling; f18: synced api_symbols.csv * fbt: removed resources_paths for extapps * scripts: reworked storage * scripts: reworked runfap.py & selfupdate.py to use new api * wip: fal runner * fbt: moved file packaging into separate module * scripts: storage: fixes * scripts: storage: minor fixes for new api * fbt: changed internal artifact storage details for external apps * scripts: storage: additional fixes and better error reporting; examples: using APP_DATA_PATH() * fbt, scripts: reworked launch_app to deploy plugins; moved old runfap.py to distfap.py * fbt: extra check for plugins descriptors * fbt: additional checks in emitter * fbt: better info message on SDK rebuild * scripts: removed requirements.txt * loader: removed remnants of plugins & debug menus * post-review fixes
This commit is contained in:
		
							
								
								
									
										27
									
								
								SConstruct
									
									
									
									
									
								
							
							
						
						
									
										27
									
								
								SConstruct
									
									
									
									
									
								
							| @@ -139,34 +139,33 @@ if GetOption("fullenv") or any( | ||||
| basic_dist = distenv.DistCommand("fw_dist", distenv["DIST_DEPENDS"]) | ||||
| distenv.Default(basic_dist) | ||||
|  | ||||
| dist_dir = distenv.GetProjetDirName() | ||||
| dist_dir_name = distenv.GetProjetDirName() | ||||
| dist_dir = distenv.Dir(f"#/dist/{dist_dir_name}") | ||||
| external_apps_artifacts = firmware_env["FW_EXTAPPS"] | ||||
| external_app_list = external_apps_artifacts.application_map.values() | ||||
|  | ||||
| fap_dist = [ | ||||
|     distenv.Install( | ||||
|         distenv.Dir(f"#/dist/{dist_dir}/apps/debug_elf"), | ||||
|         list( | ||||
|             app_artifact.debug | ||||
|             for app_artifact in firmware_env["FW_EXTAPPS"].applications.values() | ||||
|         ), | ||||
|         dist_dir.Dir("debug_elf"), | ||||
|         list(app_artifact.debug for app_artifact in external_app_list), | ||||
|     ), | ||||
|     *( | ||||
|         distenv.Install( | ||||
|             f"#/dist/{dist_dir}/apps/{app_artifact.app.fap_category}", | ||||
|             app_artifact.compact[0], | ||||
|             dist_dir.File(dist_entry[1]).dir, | ||||
|             app_artifact.compact, | ||||
|         ) | ||||
|         for app_artifact in firmware_env["FW_EXTAPPS"].applications.values() | ||||
|         for app_artifact in external_app_list | ||||
|         for dist_entry in app_artifact.dist_entries | ||||
|     ), | ||||
| ] | ||||
| Depends( | ||||
|     fap_dist, | ||||
|     list( | ||||
|         app_artifact.validator | ||||
|         for app_artifact in firmware_env["FW_EXTAPPS"].applications.values() | ||||
|     ), | ||||
|     list(app_artifact.validator for app_artifact in external_app_list), | ||||
| ) | ||||
| Alias("fap_dist", fap_dist) | ||||
| # distenv.Default(fap_dist) | ||||
|  | ||||
| distenv.Depends(firmware_env["FW_RESOURCES"], firmware_env["FW_EXTAPPS"].resources_dist) | ||||
| distenv.Depends(firmware_env["FW_RESOURCES"], external_apps_artifacts.resources_dist) | ||||
|  | ||||
| # Copy all faps to device | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user