From d83e202f00a0c8795d707ba3aa54c0f7960ba1a5 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Fri, 22 Jul 2022 18:08:36 -0700 Subject: [PATCH] [upstream_utils] Update paths in update_fmt.py (#4338) --- upstream_utils/update_fmt.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/upstream_utils/update_fmt.py b/upstream_utils/update_fmt.py index 6704564b87..6dd3ff0359 100755 --- a/upstream_utils/update_fmt.py +++ b/upstream_utils/update_fmt.py @@ -20,28 +20,31 @@ def main(): am_patches(repo, [os.path.join(prefix, "0001-Don-t-throw-on-write-failure.patch")]) # Delete old install - for d in ["src/main/native/fmtlib/src", "src/main/native/fmtlib/include"]: + 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) # 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", - os.path.join(wpiutil, "src/main/native/fmtlib"), + 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"), - os.path.join(wpiutil, "src/main/native/fmtlib"), + os.path.join(wpiutil, "src/main/native/thirdparty/fmtlib"), ) for f in src_files: comment_out_invalid_includes( - f, [os.path.join(wpiutil, "src/main/native/fmtlib/include")] + f, [os.path.join(wpiutil, "src/main/native/thirdparty/fmtlib/include")] ) for f in include_files: comment_out_invalid_includes( - f, [os.path.join(wpiutil, "src/main/native/fmtlib/include")] + f, [os.path.join(wpiutil, "src/main/native/thirdparty/fmtlib/include")] )