|
@ -78,21 +78,27 @@ if pioutil.is_pio_build(): |
|
|
err = "ERROR: Config files found in directory %s. Please move them into the Marlin subfolder." % p |
|
|
err = "ERROR: Config files found in directory %s. Please move them into the Marlin subfolder." % p |
|
|
raise SystemExit(err) |
|
|
raise SystemExit(err) |
|
|
|
|
|
|
|
|
|
|
|
# |
|
|
|
|
|
# Find the name.cpp.o or name.o and remove it |
|
|
|
|
|
# |
|
|
|
|
|
def rm_ofile(subdir, name): |
|
|
|
|
|
build_dir = os.path.join(env['PROJECT_BUILD_DIR'], build_env); |
|
|
|
|
|
for outdir in [ build_dir, os.path.join(build_dir, "debug") ]: |
|
|
|
|
|
for ext in [ ".cpp.o", ".o" ]: |
|
|
|
|
|
fpath = os.path.join(outdir, "src", "src", subdir, name + ext) |
|
|
|
|
|
if os.path.exists(fpath): |
|
|
|
|
|
os.remove(fpath) |
|
|
|
|
|
|
|
|
# |
|
|
# |
|
|
# Give warnings on every build |
|
|
# Give warnings on every build |
|
|
# |
|
|
# |
|
|
srcpath = os.path.join(env['PROJECT_BUILD_DIR'], build_env, "src", "src") |
|
|
rm_ofile("inc", "Warnings") |
|
|
warnfile = os.path.join(srcpath, "inc", "Warnings.cpp.o") |
|
|
|
|
|
if os.path.exists(warnfile): |
|
|
|
|
|
os.remove(warnfile) |
|
|
|
|
|
|
|
|
|
|
|
# |
|
|
# |
|
|
# Rebuild 'settings.cpp' for EEPROM_INIT_NOW |
|
|
# Rebuild 'settings.cpp' for EEPROM_INIT_NOW |
|
|
# |
|
|
# |
|
|
if 'EEPROM_INIT_NOW' in env['MARLIN_FEATURES']: |
|
|
if 'EEPROM_INIT_NOW' in env['MARLIN_FEATURES']: |
|
|
setfile = os.path.join(srcpath, "module", "settings.cpp.o") |
|
|
rm_ofile("module", "settings") |
|
|
if os.path.exists(setfile): |
|
|
|
|
|
os.remove(setfile) |
|
|
|
|
|
|
|
|
|
|
|
# |
|
|
# |
|
|
# Check for old files indicating an entangled Marlin (mixing old and new code) |
|
|
# Check for old files indicating an entangled Marlin (mixing old and new code) |
|
|