SCons: do not include backup files in build (#2221)

* SCons: do not include backup files in build
* fbt: now GlobRecursive by default excludes backup files
* fbt: added backup file exclusion to plain libs

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Co-authored-by: hedger <hedger@users.noreply.github.com>
Co-authored-by: hedger <hedger@nanode.su>
Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Michal Suchánek
2023-02-08 10:35:38 +01:00
committed by GitHub
parent 23ecc186c2
commit 00076deece
6 changed files with 23 additions and 8 deletions

View File

@@ -27,9 +27,7 @@ def proto_emitter(target, source, env):
def dolphin_emitter(target, source, env):
res_root_dir = source[0].Dir(env["DOLPHIN_RES_TYPE"])
source = [res_root_dir]
source.extend(
env.GlobRecursive("*.*", res_root_dir.srcnode()),
)
source.extend(env.GlobRecursive("*.*", res_root_dir.srcnode()))
target_base_dir = target[0]
env.Replace(_DOLPHIN_OUT_DIR=target[0])

View File

@@ -1,7 +1,11 @@
import SCons
from SCons.Script import Flatten
from fbt.util import GLOB_FILE_EXCLUSION
def GlobRecursive(env, pattern, node=".", exclude=None):
def GlobRecursive(env, pattern, node=".", exclude=[]):
exclude = list(set(Flatten(exclude) + GLOB_FILE_EXCLUSION))
# print(f"Starting glob for {pattern} from {node} (exclude: {exclude})")
results = []
if isinstance(node, str):
node = env.Dir(node)
@@ -13,7 +17,7 @@ def GlobRecursive(env, pattern, node=".", exclude=None):
source=True,
exclude=exclude,
)
# print(f"Glob for {pattern} from {node}: {results}")
# print(f"Glob result for {pattern} from {node}: {results}")
return results