sv/Marlin
1
1
Fork 0
Code Issues Pull Requests Wiki Activity

🔨 PlatformIO 6 compatibility

Browse Source
This commit is contained in:
Scott Lahteine
2023-07-18 18:41:51 -05:00
parent ca194ca52e
commit ba38d4f411
20 changed files with 278 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
buildroot/share/PlatformIO/scripts/common-dependencies.py
View File

@@ -45,7 +45,7 @@ def add_to_feat_cnf(feature, flines):
parts = dep.split('=')
name = parts.pop(0)
rest = '='.join(parts)
if name in ['extra_scripts', 'src_filter', 'lib_ignore']:
if name in ['extra_scripts', 'build_src_filter', 'lib_ignore']:
feat[name] = rest
else:
feat['lib_deps'] += [dep]
@@ -146,19 +146,19 @@ def apply_features_config():
blab("Running extra_scripts for %s... " % feature)
env.SConscript(feat['extra_scripts'], exports="env")
if 'src_filter' in feat:
blab("Adding src_filter for %s... " % feature)
src_filter = ' '.join(env.GetProjectOption('src_filter'))
if 'build_src_filter' in feat:
blab("Adding build_src_filter for %s... " % feature)
build_src_filter = ' '.join(env.GetProjectOption('build_src_filter'))
# first we need to remove the references to the same folder
my_srcs = re.findall( r'[+-](<.*?>)', feat['src_filter'])
cur_srcs = re.findall( r'[+-](<.*?>)', src_filter)
my_srcs = re.findall( r'[+-](<.*?>)', feat['build_src_filter'])
cur_srcs = re.findall( r'[+-](<.*?>)', build_src_filter)
for d in my_srcs:
if d in cur_srcs:
src_filter = re.sub(r'[+-]' + d, '', src_filter)
build_src_filter = re.sub(r'[+-]' + d, '', build_src_filter)
src_filter = feat['src_filter'] + ' ' + src_filter
set_env_field('src_filter', [src_filter])
env.Replace(SRC_FILTER=src_filter)
build_src_filter = feat['build_src_filter'] + ' ' + build_src_filter
set_env_field('build_src_filter', [build_src_filter])
env.Replace(SRC_FILTER=build_src_filter)
if 'lib_ignore' in feat:
blab("Adding lib_ignore for %s... " % feature)