3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-12-28 10:20:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

🔨 Fix misplaced config files check

Browse source 
Fixes #28091
This commit is contained in:
Scott Lahteine 2025-10-02 13:43:42 -05:00
parent dadbedc4fd
commit cb0706f9cc
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
buildroot/share/PlatformIO/scripts/preflight-checks.py
View file

@ -65,13 +65,14 @@ if pioutil.is_pio_build():
# Useful values
project_dir = Path(env['PROJECT_DIR'])
config_files = ("Configuration.h", "Configuration_adv.h")
mpath = project_dir / "Marlin"
#
# Update old macros BOTH and EITHER in configuration files
#
conf_modified = False
for f in config_files:
conf_path = project_dir / "Marlin" / f
conf_path = mpath / f
if conf_path.is_file():
with open(conf_path, 'r', encoding="utf8") as file:
text = file.read()
@ -101,13 +102,16 @@ if pioutil.is_pio_build():
raise SystemExit(err)
#
# Check for Config files in two common incorrect places
# Check for Config files *only* existing in common incorrect places
#
for p in (project_dir, project_dir / "config"):
for f in config_files:
if (p / f).is_file():
err = "ERROR: Config files found in directory %s. Please move them into the Marlin subfolder." % p
raise SystemExit(err)
if (mpath / "Config.h").is_file() or ((mpath / config_files[0]).is_file() and (mpath / config_files[1]).is_file()):
pass
else:
for p in (project_dir, project_dir / "config"):
for f in config_files:
if (p / f).is_file():
err = "ERROR: Config files found in directory %s. Please move them into the Marlin subfolder." % p
raise SystemExit(err)
#
# Find the name.cpp.o or name.o and remove it