Merge remote-tracking branch 'origin/update_jdk' into update_jdk

wpilibsuite · Dec 7, 2024 · 9455429 · 9455429
2 parents c7cbc84 + d5f0db2
commit 9455429
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 11 deletions.
diff --git a/maven_deps.bzl b/maven_deps.bzl
@@ -53,6 +53,21 @@ def __setup_jdk_dependencies(mctx):
         strip_prefix = "jdk-17.0.12+7/Contents/Home",
     )
 
+    runtime_files = [
+        "concrt140.dll",
+        "msvcp140.dll",
+        "msvcp140_1.dll",
+        "msvcp140_2.dll",
+        "msvcp140_atomic_wait.dll",
+        "msvcp140_codecvt_ids.dll",
+        "vccorlib140.dll",
+        "vcruntime140.dll",
+        "vcruntime140_1.dll",
+        "vcruntime140_threads.dll",
+    ]
+
+    runtime_labels = [Label("@rules_bzlmodrio_jdk//msvc_runtime:" + f) for f in runtime_files]
+    win_patch_cmds = ["cp ../" + lbl.repo_name + "/msvc_runtime/" + lbl.name + " bin/" + lbl.name for lbl in runtime_labels]
     remote_java_repository(
         name = "roboriojdk_windows",
         prefix = "roboriojdk",
@@ -64,9 +79,7 @@ def __setup_jdk_dependencies(mctx):
         sha256 = "052049d687ebfda6a4032d54afcd0da6549a23bc2ed04cfaa509746eeacbae71",
         urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.zip"],
         strip_prefix = "jdk-17.0.12+7",
-        patches = ["@rules_bzlmodrio_jdk//:0001-Fixup-runtime.patch"],
-        patch_args = ["-p1"],
-        patch_tool = "git apply",
+        patch_cmds = win_patch_cmds
     )
 
 def setup_legacy_setup_jdk_dependencies():

diff --git a/msvc_runtime/concrt140.dll b/msvc_runtime/concrt140.dll
diff --git a/msvc_runtime/msvcp140.dll b/msvc_runtime/msvcp140.dll
diff --git a/msvc_runtime/msvcp140_1.dll b/msvc_runtime/msvcp140_1.dll
diff --git a/msvc_runtime/msvcp140_2.dll b/msvc_runtime/msvcp140_2.dll
diff --git a/msvc_runtime/msvcp140_atomic_wait.dll b/msvc_runtime/msvcp140_atomic_wait.dll
diff --git a/msvc_runtime/msvcp140_codecvt_ids.dll b/msvc_runtime/msvcp140_codecvt_ids.dll
diff --git a/msvc_runtime/vccorlib140.dll b/msvc_runtime/vccorlib140.dll
diff --git a/msvc_runtime/vcruntime140.dll b/msvc_runtime/vcruntime140.dll
diff --git a/msvc_runtime/vcruntime140_1.dll b/msvc_runtime/vcruntime140_1.dll
diff --git a/msvc_runtime/vcruntime140_threads.dll b/msvc_runtime/vcruntime140_threads.dll
diff --git a/tests/MODULE.bazel.lock b/tests/MODULE.bazel.lock