mirror of
https://github.com/flipperdevices/flipperzero-firmware.git
synced 2025-12-12 04:41:26 +04:00
[FL-2832] fbt: more fixes & improvements (#1854)
* github: bundling debug folder with scripts; docs: fixes & updates; fbt: added FAP_EXAMPLES variable to enable building example apps. Disabled by default. fbt: added TERM to list of proxied environment variables * fbt: better help output; disabled implicit_deps_unchanged; added color to import validator reports * fbt: moved debug configuration to separate tool * fbt: proper dependency tracker for SDK source file; renamed linker script for external apps * fbt: fixed debug elf path * fbt: packaging sdk archive * scripts: fixed sconsdist.py * fbt: reworked sdk packing; docs: updates * docs: info on cli target; linter fixes * fbt: moved main code to scripts folder * scripts: packing update into .tgz * fbt, scripts: reworked copro_dist to build .tgz * scripts: fixed naming for archived updater package * Scripts: fix ぐるぐる回る Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
This commit is contained in:
hedger
@@ -81,46 +81,41 @@ vars.AddVariables(
|
||||
help="Enable debug tools to be built",
|
||||
default=False,
|
||||
),
|
||||
)
|
||||
|
||||
vars.Add(
|
||||
"DIST_SUFFIX",
|
||||
help="Suffix for binaries in build output for dist targets",
|
||||
default="local",
|
||||
)
|
||||
|
||||
vars.Add(
|
||||
"UPDATE_VERSION_STRING",
|
||||
help="Version string for updater package",
|
||||
default="${DIST_SUFFIX}",
|
||||
)
|
||||
|
||||
|
||||
vars.Add(
|
||||
"COPRO_CUBE_VERSION",
|
||||
help="Cube version",
|
||||
default="",
|
||||
)
|
||||
|
||||
vars.Add(
|
||||
"COPRO_STACK_ADDR",
|
||||
help="Core2 Firmware address",
|
||||
default="0",
|
||||
)
|
||||
|
||||
vars.Add(
|
||||
"COPRO_STACK_BIN",
|
||||
help="Core2 Firmware file name",
|
||||
default="",
|
||||
)
|
||||
|
||||
vars.Add(
|
||||
"COPRO_DISCLAIMER",
|
||||
help="Value to pass to bundling script to confirm dangerous operations",
|
||||
default="",
|
||||
)
|
||||
|
||||
vars.AddVariables(
|
||||
BoolVariable(
|
||||
"FAP_EXAMPLES",
|
||||
help="Enable example applications to be built",
|
||||
default=False,
|
||||
),
|
||||
(
|
||||
"DIST_SUFFIX",
|
||||
"Suffix for binaries in build output for dist targets",
|
||||
"local",
|
||||
),
|
||||
(
|
||||
"UPDATE_VERSION_STRING",
|
||||
"Version string for updater package",
|
||||
"${DIST_SUFFIX}",
|
||||
),
|
||||
(
|
||||
"COPRO_CUBE_VERSION",
|
||||
"Cube version",
|
||||
"",
|
||||
),
|
||||
(
|
||||
"COPRO_STACK_ADDR",
|
||||
"Core2 Firmware address",
|
||||
"0",
|
||||
),
|
||||
(
|
||||
"COPRO_STACK_BIN",
|
||||
"Core2 Firmware file name",
|
||||
"",
|
||||
),
|
||||
(
|
||||
"COPRO_DISCLAIMER",
|
||||
"Value to pass to bundling script to confirm dangerous operations",
|
||||
"",
|
||||
),
|
||||
PathVariable(
|
||||
"COPRO_OB_DATA",
|
||||
help="Path to OB reference data",
|
||||
@@ -161,86 +156,75 @@ vars.AddVariables(
|
||||
validator=PathVariable.PathAccept,
|
||||
default="",
|
||||
),
|
||||
)
|
||||
|
||||
vars.Add(
|
||||
"FBT_TOOLCHAIN_VERSIONS",
|
||||
help="Whitelisted toolchain versions (leave empty for no check)",
|
||||
default=tuple(),
|
||||
)
|
||||
|
||||
vars.Add(
|
||||
"OPENOCD_OPTS",
|
||||
help="Options to pass to OpenOCD",
|
||||
default="",
|
||||
)
|
||||
|
||||
vars.Add(
|
||||
"BLACKMAGIC",
|
||||
help="Blackmagic probe location",
|
||||
default="auto",
|
||||
)
|
||||
|
||||
vars.Add(
|
||||
"UPDATE_SPLASH",
|
||||
help="Directory name with slideshow frames to render after installing update package",
|
||||
default="update_default",
|
||||
)
|
||||
|
||||
vars.Add(
|
||||
"LOADER_AUTOSTART",
|
||||
help="Application name to automatically run on Flipper boot",
|
||||
default="",
|
||||
)
|
||||
|
||||
|
||||
vars.Add(
|
||||
"FIRMWARE_APPS",
|
||||
help="Map of (configuration_name->application_list)",
|
||||
default={
|
||||
"default": (
|
||||
# Svc
|
||||
"basic_services",
|
||||
# Apps
|
||||
"main_apps",
|
||||
"system_apps",
|
||||
# Settings
|
||||
"settings_apps",
|
||||
# Plugins
|
||||
# "basic_plugins",
|
||||
# Debug
|
||||
# "debug_apps",
|
||||
)
|
||||
},
|
||||
)
|
||||
|
||||
vars.Add(
|
||||
"FIRMWARE_APP_SET",
|
||||
help="Application set to use from FIRMWARE_APPS",
|
||||
default="default",
|
||||
)
|
||||
|
||||
vars.Add(
|
||||
"APPSRC",
|
||||
help="Application source directory for app to build & upload",
|
||||
default="",
|
||||
)
|
||||
|
||||
# List of tuples (directory, add_to_global_include_path)
|
||||
vars.Add(
|
||||
"APPDIRS",
|
||||
help="Directories to search for firmware components & external apps",
|
||||
default=[
|
||||
("applications", False),
|
||||
("applications/services", True),
|
||||
("applications/main", True),
|
||||
("applications/settings", False),
|
||||
("applications/system", False),
|
||||
("applications/debug", False),
|
||||
("applications/plugins", False),
|
||||
("applications/examples", False),
|
||||
("applications_user", False),
|
||||
],
|
||||
(
|
||||
"FBT_TOOLCHAIN_VERSIONS",
|
||||
"Whitelisted toolchain versions (leave empty for no check)",
|
||||
tuple(),
|
||||
),
|
||||
(
|
||||
"OPENOCD_OPTS",
|
||||
"Options to pass to OpenOCD",
|
||||
"",
|
||||
),
|
||||
(
|
||||
"BLACKMAGIC",
|
||||
"Blackmagic probe location",
|
||||
"auto",
|
||||
),
|
||||
(
|
||||
"UPDATE_SPLASH",
|
||||
"Directory name with slideshow frames to render after installing update package",
|
||||
"update_default",
|
||||
),
|
||||
(
|
||||
"LOADER_AUTOSTART",
|
||||
"Application name to automatically run on Flipper boot",
|
||||
"",
|
||||
),
|
||||
(
|
||||
"FIRMWARE_APPS",
|
||||
"Map of (configuration_name->application_list)",
|
||||
{
|
||||
"default": (
|
||||
# Svc
|
||||
"basic_services",
|
||||
# Apps
|
||||
"main_apps",
|
||||
"system_apps",
|
||||
# Settings
|
||||
"settings_apps",
|
||||
# Plugins
|
||||
# "basic_plugins",
|
||||
# Debug
|
||||
# "debug_apps",
|
||||
)
|
||||
},
|
||||
),
|
||||
(
|
||||
"FIRMWARE_APP_SET",
|
||||
"Application set to use from FIRMWARE_APPS",
|
||||
"default",
|
||||
),
|
||||
(
|
||||
"APPSRC",
|
||||
"Application source directory for app to build & upload",
|
||||
"",
|
||||
),
|
||||
# List of tuples (directory, add_to_global_include_path)
|
||||
(
|
||||
"APPDIRS",
|
||||
"Directories to search for firmware components & external apps",
|
||||
[
|
||||
("applications", False),
|
||||
("applications/services", True),
|
||||
("applications/main", True),
|
||||
("applications/settings", False),
|
||||
("applications/system", False),
|
||||
("applications/debug", False),
|
||||
("applications/plugins", False),
|
||||
("applications_user", False),
|
||||
],
|
||||
),
|
||||
)
|
||||
|
||||
Return("vars")
|
||||
|
||||
Reference in New Issue
Block a user