diff options
| author | robot-javacom <[email protected]> | 2025-09-29 10:16:05 +0300 |
|---|---|---|
| committer | robot-javacom <[email protected]> | 2025-09-29 10:36:43 +0300 |
| commit | e5d1d3a8bbbdfe5b7dd6020f5f4e68bcb6cfbaf4 (patch) | |
| tree | 804a8346150cd8854a2b62b83803c90e5fa8e11a /build/platform/java | |
| parent | 4145772338d824a2163726ccd4df310b7057065e (diff) | |
Поддержать JDK 25 в аркадии
https://nda.ya.ru/t/8WYUG2pO7Kaaag
commit_hash:5faed6ce4dc3add634be2e5b04f537573ff4c616
Diffstat (limited to 'build/platform/java')
| -rw-r--r-- | build/platform/java/jdk/jdk25/jdk.json | 19 | ||||
| -rw-r--r-- | build/platform/java/jdk/jdk25/ya.make | 17 | ||||
| -rw-r--r-- | build/platform/java/jdk/ya.make | 4 |
3 files changed, 40 insertions, 0 deletions
diff --git a/build/platform/java/jdk/jdk25/jdk.json b/build/platform/java/jdk/jdk25/jdk.json new file mode 100644 index 00000000000..c9616e93c69 --- /dev/null +++ b/build/platform/java/jdk/jdk25/jdk.json @@ -0,0 +1,19 @@ +{ + "by_platform": { + "darwin-arm64": { + "uri": "sbr:9827500942" + }, + "darwin-x86_64": { + "uri": "sbr:9827500162" + }, + "linux-x86_64": { + "uri": "sbr:9827497712" + }, + "linux-aarch64": { + "uri": "sbr:9827498529" + }, + "win32-x86_64": { + "uri": "sbr:9827499366" + } + } +} diff --git a/build/platform/java/jdk/jdk25/ya.make b/build/platform/java/jdk/jdk25/ya.make new file mode 100644 index 00000000000..f39cf86ebec --- /dev/null +++ b/build/platform/java/jdk/jdk25/ya.make @@ -0,0 +1,17 @@ +RESOURCES_LIBRARY() + +DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK25 jdk.json) +SET_RESOURCE_URI_FROM_JSON(WITH_JDK25_URI jdk.json) + +IF (WITH_JDK25_URI) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK25 ${WITH_JDK25_URI}) +ENDIF() + +END() + +IF (AUTOCHECK) + RECURSE_FOR_TESTS(ut) +ENDIF() +IF(YA_IDE_IDEA) + RECURSE_FOR_TESTS(ut) +ENDIF() diff --git a/build/platform/java/jdk/ya.make b/build/platform/java/jdk/ya.make index 474ffa26a08..93bdc0a9738 100644 --- a/build/platform/java/jdk/ya.make +++ b/build/platform/java/jdk/ya.make @@ -3,6 +3,9 @@ RESOURCES_LIBRARY() # Add new JDK to build/plugins/java.py (2 times) IF(USE_SYSTEM_JDK) MESSAGE(WARNING DEFAULT_JDK are disabled) +ELSEIF(JDK_REAL_VERSION == "25") + DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk25/jdk.json) + SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk25/jdk.json) ELSEIF(JDK_REAL_VERSION == "24") DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk24/jdk.json) SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk24/jdk.json) @@ -42,6 +45,7 @@ RECURSE( jdk22 jdk23 jdk24 + jdk25 testing ) |