From e76f3f9fba36711202ea3452175500f60099074c Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Fri, 18 Oct 2024 13:56:44 -0400 Subject: [PATCH] Try dlls again --- tests/MODULE.bazel.lock | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/tests/MODULE.bazel.lock b/tests/MODULE.bazel.lock index 27b2bb5..89b68ef 100644 --- a/tests/MODULE.bazel.lock +++ b/tests/MODULE.bazel.lock @@ -139,7 +139,7 @@ }, "@@rules_bzlmodrio_jdk~//:maven_deps.bzl%deps": { "general": { - "bzlTransitiveDigest": "QQwyuMb1ES3Sn/EKuPkREFIyWDhlyAyMstqkJ2gNZMI=", + "bzlTransitiveDigest": "9Zl37hjrFh490t1AON4Y7TWqhmitvzKuVkAGZh84X2E=", "usagesDigest": "U+tCKAYT563wXiw5hz8oK2Hf7s4NG7RTkarVy+SX5mQ=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -207,10 +207,18 @@ "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_tool": "git apply" + "patch_cmds": [ + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/concrt140.dll bin/concrt140.dll", + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/msvcp140.dll bin/msvcp140.dll", + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/msvcp140_1.dll bin/msvcp140_1.dll", + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/msvcp140_2.dll bin/msvcp140_2.dll", + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/msvcp140_atomic_wait.dll bin/msvcp140_atomic_wait.dll", + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/msvcp140_codecvt_ids.dll bin/msvcp140_codecvt_ids.dll", + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/vccorlib140.dll bin/vccorlib140.dll", + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/vcruntime140.dll bin/vcruntime140.dll", + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/vcruntime140_1.dll bin/vcruntime140_1.dll", + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/vcruntime140_threads.dll bin/vcruntime140_threads.dll" + ] } }, "roboriojdk_linux": { @@ -246,6 +254,11 @@ } }, "recordedRepoMappingEntries": [ + [ + "rules_bzlmodrio_jdk~", + "rules_bzlmodrio_jdk", + "rules_bzlmodrio_jdk~" + ], [ "rules_bzlmodrio_jdk~", "rules_java",