jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-23 02:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

load_usermods: Make missing libArchive an error

Browse Source 
Rather than try and fail to add this property, abort if it's missing
from any requested usermod.
This commit is contained in:
Will Miles 2025-05-06 21:55:06 -04:00
parent 849d5e6667
commit ee3864175d
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pio-scripts/load_usermods.py
View File

@ -2,6 +2,8 @@ Import('env')
import os.path import os.path
from collections import deque from collections import deque
from pathlib import Path # For OS-agnostic path manipulation from pathlib import Path # For OS-agnostic path manipulation
from click import secho
from SCons.Script import Exit
from platformio.builder.tools.piolib import LibBuilderBase from platformio.builder.tools.piolib import LibBuilderBase
from platformio.package.manager.library import LibraryPackageManager from platformio.package.manager.library import LibraryPackageManager
@ -105,6 +107,7 @@ def wrapped_ConfigureProjectLibBuilder(xenv):
for dep in result.depbuilders: for dep in result.depbuilders:
cached_add_includes(dep, processed_deps, extra_include_dirs) cached_add_includes(dep, processed_deps, extra_include_dirs)
broken_usermods = []
for dep in result.depbuilders: for dep in result.depbuilders:
if is_wled_module(dep): if is_wled_module(dep):
# Add the wled folder to the include path # Add the wled folder to the include path
@ -114,9 +117,15 @@ def wrapped_ConfigureProjectLibBuilder(xenv):
dep.env.PrependUnique(CPPPATH=str(dir)) dep.env.PrependUnique(CPPPATH=str(dir))
# Enforce that libArchive is not set; we must link them directly to the executable # Enforce that libArchive is not set; we must link them directly to the executable
if dep.lib_archive: if dep.lib_archive:
build = dep._manifest.get("build", {}) broken_usermods.append(dep)
build["libArchive"] = False
dep._manifest["build"] = build if broken_usermods:
broken_usermods = [usermod.name for usermod in broken_usermods]
secho(
f"ERROR: libArchive=false is missing on usermod(s) {' '.join(broken_usermods)} -- modules will not compile in correctly",
fg="red",
err=True)
Exit(1)
return result return result