[upstream_utils] Handle edge case in filename matches (#5576)

endswith() leaves files out from subdirectories, which means projects
that add new subdirectories won't have those files included when they
probably should be.
This commit is contained in:
Tyler Veness
2023-08-28 15:07:13 -07:00
committed by GitHub
parent 9d86624c00
commit 360fb835f4
3 changed files with 5 additions and 7 deletions

View File

@@ -35,13 +35,13 @@ def main():
# Copy fmt source files into allwpilib
src_files = walk_cwd_and_copy_if(
lambda dp, f: dp.endswith("src") and f.endswith(".cc") and f != "fmt.cc",
lambda dp, f: dp.startswith("./src") and f.endswith(".cc") and f != "fmt.cc",
os.path.join(wpiutil, "src/main/native/thirdparty/fmtlib"),
)
# Copy fmt header files into allwpilib
include_files = walk_cwd_and_copy_if(
lambda dp, f: dp.endswith("include/fmt"),
lambda dp, f: dp.startswith("./include/fmt"),
os.path.join(wpiutil, "src/main/native/thirdparty/fmtlib"),
)

View File

@@ -30,9 +30,7 @@ def main():
# Copy gcem include files into allwpilib
include_files = walk_cwd_and_copy_if(
lambda dp, f: dp.endswith("include")
or dp.endswith("gcem_incl")
or dp.endswith("quadrature"),
lambda dp, f: dp.startswith("./include"),
os.path.join(wpimath, "src/main/native/thirdparty/gcem"),
)

View File

@@ -45,7 +45,7 @@ def main():
]
include_files = walk_cwd_and_copy_if(
lambda dp, f: "include" in dp and f not in include_ignorelist,
lambda dp, f: dp.startswith("./include") and f not in include_ignorelist,
os.path.join(wpinet, "src/main/native/thirdparty/libuv"),
)
@@ -66,7 +66,7 @@ def main():
"sysinfo-memory.c",
]
src_files = walk_cwd_and_copy_if(
lambda dp, f: "src" in dp and "docs" not in dp and f not in src_ignorelist,
lambda dp, f: dp.startswith("./src") and f not in src_ignorelist,
os.path.join(wpinet, "src/main/native/thirdparty/libuv"),
)