Merge branch 'main' into 2027

This commit is contained in:
Peter Johnson
2025-05-29 21:41:50 -07:00
347 changed files with 18562 additions and 11557 deletions

View File

@@ -1,33 +1,33 @@
#!/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/fmtlib/src",
"src/main/native/thirdparty/fmtlib/include",
]:
shutil.rmtree(os.path.join(wpiutil, d), ignore_errors=True)
shutil.rmtree(wpiutil / d, ignore_errors=True)
# Copy fmt source files into allwpilib
walk_cwd_and_copy_if(
lambda dp, f: dp.startswith(os.path.join(".", "src"))
lambda dp, f: has_prefix(dp, Path("src"))
and f.endswith(".cc")
and f != "fmt.cc",
os.path.join(wpiutil, "src/main/native/thirdparty/fmtlib"),
wpiutil / "src/main/native/thirdparty/fmtlib",
)
# Copy fmt header files into allwpilib
walk_cwd_and_copy_if(
lambda dp, f: dp.startswith(os.path.join(".", "include", "fmt")),
os.path.join(wpiutil, "src/main/native/thirdparty/fmtlib"),
lambda dp, f: has_prefix(dp, Path("include/fmt")),
wpiutil / "src/main/native/thirdparty/fmtlib",
)