intermediate changes

ref:a1d60b05b4c90e118f3e697bfa8e9255ad9b83c0
catboost · Oct 14, 2022 · 479b2ba · 479b2ba
1 parent 2c4a3fa
commit 479b2ba
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 115 deletions.
diff --git a/build/conf/docs.conf b/build/conf/docs.conf
@@ -22,7 +22,7 @@ _DOCS_ENV=
 _DOCS_KV=${kv;hide:"p DO"} ${kv;hide:"pc light-cyan"} ${kv;hide:"show_out yes"}
 
 _DOCS_PLANTUML_ENV=\
-${env:"JAVA_PATH=$JDK_RESOURCE_GLOBAL/bin/java"} \
+${env:"JAVA_PATH=$JDK_DEFAULT_RESOURCE_GLOBAL/bin/java"} \
 ${env:"PLANTUML_PATH=contrib/tools/plantuml/plantuml.run.cp.jar"} \
 ${env:"_JAVA_OPTIONS='-Dsun.awt.fontconfig=contrib/java/openjdk-fontconfig/fontconfig.properties -Djava.awt.headless=true'"} \
 ${env:"LANG=en_US.UTF-8"} \

diff --git a/build/platform/java/jdk/ya.make b/build/platform/java/jdk/ya.make
@@ -114,17 +114,6 @@ ENDIF()
 IF(USE_SYSTEM_JDK)
     MESSAGE(WARNING System JDK $USE_SYSTEM_JDK will be used)
 ELSEIF(JDK_REAL_VERSION == "18")
-    DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-        JDK
-        ${JDK18_DARWIN} FOR DARWIN
-        ${JDK18_DARWIN_ARM64} FOR DARWIN-ARM64
-        ${JDK18_LINUX} FOR LINUX
-        ${JDK18_WINDOWS} FOR WIN32
-    )
-    IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
-        MESSAGE(FATAL_ERROR Unsupported platform for JDK18)
-    ENDIF()
-
     IF(OS_DARWIN AND ARCH_ARM64)
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK18_DARWIN_ARM64})
     ELSEIF(OS_DARWIN)
@@ -135,17 +124,6 @@ ELSEIF(JDK_REAL_VERSION == "18")
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK18_WINDOWS})
     ENDIF()
 ELSEIF(JDK_REAL_VERSION == "17")
-    DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-        JDK
-        ${JDK17_DARWIN} FOR DARWIN
-        ${JDK17_DARWIN_ARM64} FOR DARWIN-ARM64
-        ${JDK17_LINUX} FOR LINUX
-        ${JDK17_WINDOWS} FOR WIN32
-    )
-    IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
-        MESSAGE(FATAL_ERROR Unsupported platform for JDK17)
-    ENDIF()
-
     IF(OS_DARWIN AND ARCH_ARM64)
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK17_DARWIN_ARM64})
     ELSEIF(OS_DARWIN)
@@ -156,17 +134,6 @@ ELSEIF(JDK_REAL_VERSION == "17")
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK17_WINDOWS})
     ENDIF()
 ELSEIF(JDK_REAL_VERSION == "16")
-    DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-        JDK
-        ${JDK16_DARWIN} FOR DARWIN
-        ${JDK16_DARWIN_ARM64} FOR DARWIN-ARM64
-        ${JDK16_LINUX} FOR LINUX
-        ${JDK16_WINDOWS} FOR WIN32
-    )
-    IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
-        MESSAGE(FATAL_ERROR Unsupported platform for JDK16)
-    ENDIF()
-
     IF(OS_DARWIN AND ARCH_ARM64)
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK16_DARWIN_ARM64})
     ELSEIF(OS_DARWIN)
@@ -177,17 +144,6 @@ ELSEIF(JDK_REAL_VERSION == "16")
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK16_WINDOWS})
     ENDIF()
 ELSEIF(JDK_REAL_VERSION == "15")
-    DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-        JDK
-        ${JDK15_DARWIN} FOR DARWIN
-        ${JDK15_DARWIN_ARM64} FOR DARWIN-ARM64
-        ${JDK15_LINUX} FOR LINUX
-        ${JDK15_WINDOWS} FOR WIN32
-    )
-    IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
-        MESSAGE(FATAL_ERROR Unsupported platform for JDK15)
-    ENDIF()
-
     IF(OS_DARWIN AND ARCH_ARM64)
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK15_DARWIN_ARM64})
     ELSEIF(OS_DARWIN)
@@ -198,16 +154,6 @@ ELSEIF(JDK_REAL_VERSION == "15")
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK15_WINDOWS})
     ENDIF()
 ELSEIF(JDK_REAL_VERSION == "14")
-    DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-        JDK
-        ${JDK14_DARWIN} FOR DARWIN
-        ${JDK14_LINUX} FOR LINUX
-        ${JDK14_WINDOWS} FOR WIN32
-    )
-    IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
-        MESSAGE(FATAL_ERROR Unsupported platform for JDK14)
-    ENDIF()
-
     IF(OS_DARWIN)
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK14_DARWIN})
     ELSEIF(OS_LINUX)
@@ -216,15 +162,6 @@ ELSEIF(JDK_REAL_VERSION == "14")
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK14_WINDOWS})
     ENDIF()
 ELSEIF(JDK_REAL_VERSION == "13")
-    DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-        JDK
-        ${JDK13_DARWIN} FOR DARWIN
-        ${JDK13_LINUX} FOR LINUX
-        ${JDK13_WINDOWS} FOR WIN32
-    )
-    IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
-        MESSAGE(FATAL_ERROR Unsupported platform for JDK13)
-    ENDIF()
     IF(SANITIZER_TYPE == "address")
         IF(HOST_OS_LINUX)
             DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS ${JDK13_LINUX_ASAN})
@@ -241,16 +178,6 @@ ELSEIF(JDK_REAL_VERSION == "13")
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK13_WINDOWS})
     ENDIF()
 ELSEIF(JDK_REAL_VERSION == "12")
-    DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-        JDK
-        ${JDK12_DARWIN} FOR DARWIN
-        ${JDK12_LINUX} FOR LINUX
-        ${JDK12_WINDOWS} FOR WIN32
-    )
-    IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
-        MESSAGE(FATAL_ERROR Unsupported platform for JDK12)
-    ENDIF()
-
     IF(OS_DARWIN)
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK12_DARWIN})
     ELSEIF(OS_LINUX)
@@ -259,24 +186,6 @@ ELSEIF(JDK_REAL_VERSION == "12")
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK12_WINDOWS})
     ENDIF()
 ELSEIF(JDK_REAL_VERSION == "11")
-    DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-        JDK
-        ${JDK11_DARWIN} FOR DARWIN
-        ${JDK11_DARWIN_ARM64} FOR DARWIN-ARM64
-        ${JDK11_LINUX} FOR LINUX
-        ${JDK11_WINDOWS} FOR WIN32
-    )
-    IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
-        MESSAGE(FATAL_ERROR Unsupported platform for JDK11)
-    ENDIF()
-    IF(SANITIZER_TYPE == "address")
-        IF(HOST_OS_LINUX)
-            DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS ${JDK11_LINUX_ASAN})
-        ELSE()
-            MESSAGE(FATAL_ERROR Unsupported platform for JDK11 with asan)
-        ENDIF()
-    ENDIF()
-
     IF(OS_DARWIN AND ARCH_ARM64)
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK11_DARWIN_ARM64})
     ELSEIF(OS_DARWIN)
@@ -287,16 +196,6 @@ ELSEIF(JDK_REAL_VERSION == "11")
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK11_WINDOWS})
     ENDIF()
 ELSEIF(JDK_REAL_VERSION == "10")
-    DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-        JDK
-        ${JDK10_DARWIN} FOR DARWIN
-        ${JDK10_LINUX} FOR LINUX
-        ${JDK10_WINDOWS} FOR WIN32
-    )
-    IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
-        MESSAGE(FATAL_ERROR Unsupported platform for JDK10)
-    ENDIF()
-
     IF(OS_DARWIN)
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK10_DARWIN})
     ELSEIF(OS_LINUX)
@@ -305,17 +204,6 @@ ELSEIF(JDK_REAL_VERSION == "10")
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK10_WINDOWS})
     ENDIF()
 ELSEIF(JDK_REAL_VERSION == "8")
-    DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-        JDK
-        ${JDK8_DARWIN_ARM64} FOR DARWIN-ARM64
-        ${JDK8_DARWIN} FOR DARWIN
-        ${JDK8_LINUX} FOR LINUX
-        ${JDK8_WINDOWS} FOR WIN32
-    )
-    IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
-        MESSAGE(FATAL_ERROR Unsupported platform for JDK8)
-    ENDIF()
-
     IF(OS_DARWIN AND ARCH_ARM64)
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK8_DARWIN_ARM64})
     ELSEIF(OS_DARWIN)

diff --git a/ya b/ya
@@ -23,8 +23,8 @@ import sys
 import platform
 import json
 
-URLS = ["https://storage.mds.yandex.net/get-devtools-opensource/471749/4cd3ee51870f2d39c230c35a2831ad7a"]
-MD5 = "4cd3ee51870f2d39c230c35a2831ad7a"
+URLS = ["https://storage.mds.yandex.net/get-devtools-opensource/233854/fba20aeabae11002ead119f4c9117e0f"]
+MD5 = "fba20aeabae11002ead119f4c9117e0f"
 
 RETRIES = 5
 HASH_PREFIX = 10