2024-12-28 23:24:32 -05:00
|
|
|
#!/usr/bin/env python3
|
|
|
|
|
|
|
|
|
|
import os
|
|
|
|
|
import shutil
|
[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>
2025-05-29 22:05:22 +00:00
|
|
|
from pathlib import Path
|
2024-12-28 23:24:32 -05:00
|
|
|
|
|
|
|
|
from upstream_utils import Lib, walk_cwd_and_copy_if
|
|
|
|
|
|
|
|
|
|
|
[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>
2025-05-29 22:05:22 +00:00
|
|
|
def copy_upstream_src(wpilib_root: Path):
|
|
|
|
|
wpical = wpilib_root / "wpical"
|
2024-12-28 23:24:32 -05:00
|
|
|
|
|
|
|
|
# Delete old install
|
|
|
|
|
for d in [
|
|
|
|
|
"src/main/native/thirdparty/mrcal_java/src",
|
|
|
|
|
"src/main/native/thirdparty/mrcal_java/include",
|
|
|
|
|
]:
|
[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>
2025-05-29 22:05:22 +00:00
|
|
|
shutil.rmtree(wpical / d, ignore_errors=True)
|
2024-12-28 23:24:32 -05:00
|
|
|
|
|
|
|
|
os.chdir("src")
|
|
|
|
|
files = walk_cwd_and_copy_if(
|
[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>
2025-05-29 22:05:22 +00:00
|
|
|
lambda dp, f: f == "mrcal_wrapper.h",
|
|
|
|
|
wpical / "src/main/native/thirdparty/mrcal_java/include",
|
2024-12-28 23:24:32 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
files = walk_cwd_and_copy_if(
|
[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>
2025-05-29 22:05:22 +00:00
|
|
|
lambda dp, f: f == "mrcal_wrapper.cpp",
|
|
|
|
|
wpical / "src/main/native/thirdparty/mrcal_java/src",
|
2024-12-28 23:24:32 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
for f in files:
|
|
|
|
|
with open(f) as file:
|
|
|
|
|
content = file.read()
|
|
|
|
|
content = content.replace("#include <malloc.h>", "")
|
2025-08-03 14:41:25 -04:00
|
|
|
content = content.replace(
|
|
|
|
|
"suitesparse/cholmod_core.h", "suitesparse/cholmod.h"
|
|
|
|
|
)
|
2024-12-28 23:24:32 -05:00
|
|
|
content = content.replace(
|
|
|
|
|
"// mrcal_point3_t *c_observations_point_pool = observations_point;",
|
|
|
|
|
"mrcal_point3_t *c_observations_point_pool = observations_point;",
|
|
|
|
|
)
|
|
|
|
|
content = content.replace(
|
|
|
|
|
"// mrcal_observation_point_triangulated_t *observations_point_triangulated =",
|
|
|
|
|
"mrcal_observation_point_triangulated_t *observations_point_triangulated = NULL;",
|
|
|
|
|
)
|
|
|
|
|
content = content.replace(
|
|
|
|
|
"// observations_point_triangulated,",
|
|
|
|
|
"observations_point_triangulated,",
|
|
|
|
|
)
|
|
|
|
|
content = content.replace(
|
|
|
|
|
"// 0, // hard-coded to 0", "0, // hard-coded to 0"
|
|
|
|
|
)
|
|
|
|
|
content = content.replace(
|
|
|
|
|
"// observations_point_triangulated, -1,",
|
|
|
|
|
"observations_point_triangulated, -1,",
|
|
|
|
|
)
|
|
|
|
|
content = content.replace(
|
|
|
|
|
"c_observations_board_pool, &mrcal_lensmodel, c_imagersizes,",
|
|
|
|
|
"c_observations_board_pool, c_observations_point_pool, &mrcal_lensmodel, c_imagersizes,",
|
|
|
|
|
)
|
|
|
|
|
with open(f, "w") as file:
|
|
|
|
|
file.write(content)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def main():
|
|
|
|
|
name = "mrcal_java"
|
|
|
|
|
url = "https://github.com/PhotonVision/mrcal-java"
|
2025-07-10 15:01:15 -07:00
|
|
|
# main on 2024-11-30
|
2024-12-28 23:24:32 -05:00
|
|
|
tag = "5f9d3168ccf1ecdfca48da13ea07fffa47f95d00"
|
|
|
|
|
|
|
|
|
|
mrcal_java = Lib(name, url, tag, copy_upstream_src)
|
|
|
|
|
mrcal_java.main()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
|
main()
|