Skip to content

Commit

Permalink
Apply patches first
Browse files Browse the repository at this point in the history
  • Loading branch information
KangarooKoala committed Jul 15, 2024
1 parent fc44737 commit 0cbabd2
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions upstream_utils/update_mpack.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@ def main():
wpilib_root = get_repo_root()
wpiutil = os.path.join(wpilib_root, "wpiutil")

# Delete old install
for d in [
"src/main/native/thirdparty/mpack/src",
"src/main/native/thirdparty/mpack/include",
]:
shutil.rmtree(os.path.join(wpiutil, d), ignore_errors=True)

# Apply patches to upstream Git repo
os.chdir(upstream_root)

Expand All @@ -37,6 +30,13 @@ def main():
os.path.join(wpilib_root, "upstream_utils/mpack_patches", f),
)

# Delete old install
for d in [
"src/main/native/thirdparty/mpack/src",
"src/main/native/thirdparty/mpack/include",
]:
shutil.rmtree(os.path.join(wpiutil, d), ignore_errors=True)

# Run the amalgmation script
subprocess.check_call(["bash", "tools/amalgamate.sh"])

Expand Down

0 comments on commit 0cbabd2

Please sign in to comment.