mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-19 00:41:43 +00:00
[upstream_utils] Use pathlib instead of os.path (#7983)
A noteworthy change is the replacement of the `dp.startswith(os.path.join(".", "subdir"))` pattern. pathlib doesn't offer something with similar semantics besides `match` and `full_match`, so there's now a helper function that replicates the behavior.
Other notable changes include the addition of type annotations to ensure code correctness, using == to check file names instead of `endswith` for clarity (`endswith` is still used to check extensions), manual walking and copying being refactored in googletest, json, memory, nanopb, protobuf, and sleipnir to use `walk_cwd_and_copy_if`, and matching functions being shortened to the point where they can just be inlined into the lambda.
Co-authored-by: Tyler Veness <calcmogul@gmail.com>
Co-authored-by: David Vo <auscompgeek@users.noreply.github.com>
This commit is contained in:
@@ -1,26 +1,25 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import os
|
||||
import shutil
|
||||
from pathlib import Path
|
||||
|
||||
from upstream_utils import Lib, walk_cwd_and_copy_if
|
||||
from upstream_utils import Lib, has_prefix, walk_cwd_and_copy_if
|
||||
|
||||
|
||||
def copy_upstream_src(wpilib_root):
|
||||
wpiutil = os.path.join(wpilib_root, "wpiutil")
|
||||
def copy_upstream_src(wpilib_root: Path):
|
||||
wpiutil = wpilib_root / "wpiutil"
|
||||
|
||||
# Delete old install
|
||||
for d in [
|
||||
"src/main/native/thirdparty/debugging/src",
|
||||
"src/main/native/thirdparty/debugging/include",
|
||||
]:
|
||||
shutil.rmtree(os.path.join(wpiutil, d), ignore_errors=True)
|
||||
shutil.rmtree(wpiutil / d, ignore_errors=True)
|
||||
|
||||
# Copy debugging files into allwpilib
|
||||
filenames = walk_cwd_and_copy_if(
|
||||
lambda dp, f: dp.startswith(os.path.join(".", "src"))
|
||||
or dp.startswith(os.path.join(".", "include")),
|
||||
os.path.join(wpiutil, "src/main/native/thirdparty/debugging"),
|
||||
lambda dp, f: has_prefix(dp, Path("src")) or has_prefix(dp, Path("include")),
|
||||
wpiutil / "src/main/native/thirdparty/debugging",
|
||||
)
|
||||
|
||||
for filename in filenames:
|
||||
|
||||
Reference in New Issue
Block a user