highperfocused/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2025-10-09 22:52:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

No more linting extapps, tired of merge conflicts --nobuild

Browse Source
This commit is contained in:
Willy-JL
2025-01-20 23:58:26 +00:00
parent cdf84c46d7
commit 54378dfbe0
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SConstruct
View File

@@ -327,8 +327,9 @@ firmware_env.Append(
IMG_LINT_SOURCES=[ IMG_LINT_SOURCES=[
# Image assets # Image assets
"applications", "applications",
"!applications/external",
"assets", "assets",
# Avoid merge conflicts
"!applications/external",
], ],
) )
@@ -346,8 +347,9 @@ black_commandline = [
black_base_args = [ black_base_args = [
"--include", "--include",
'"(\\.scons|\\.py|SConscript|SConstruct|\\.fam)$"', '"(\\.scons|\\.py|SConscript|SConstruct|\\.fam)$"',
# Avoid merge conflicts
"--exclude", "--exclude",
'"(mp_flipper/(flipperzero|docs)/.*\\.py)$"', '"applications/external"',
] ]
distenv.PhonyTarget( distenv.PhonyTarget(

12
firmware.scons
View File

@@ -31,16 +31,8 @@ env = ENV.Clone(
Dir("applications"), Dir("applications"),
# Not C code # Not C code
Dir("!applications/system/js_app/packages"), Dir("!applications/system/js_app/packages"),
# Frequently updated and very different formatting, painful to merge # Avoid merge conflicts
Dir("!applications/external/nfc_playlist"), Dir("!applications/external"),
Dir("!applications/external/flip_library"),
Dir("!applications/external/flip_social"),
Dir("!applications/external/flip_store"),
Dir("!applications/external/flip_trader"),
Dir("!applications/external/flip_weather"),
Dir("!applications/external/flip_wifi"),
Dir("!applications/external/flip_world"),
Dir("!applications/external/web_crawler"),
], ],
LIBPATH=[ LIBPATH=[
"${LIB_DIST_DIR}", "${LIB_DIST_DIR}",