diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-25 00:23:38 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-25 00:23:38 +0300 |
| commit | 9e08dc29988aa927698e62abd83d0930c730c464 (patch) | |
| tree | 6703666cbc55b86b8bc4346f6df50ee8682a15dd | |
| parent | 5b4595bc852b68a1b1867965651fbb3c9e24504c (diff) | |
| download | ydb-9e08dc29988aa927698e62abd83d0930c730c464.tar.gz | |
intermediate changes
ref:f4b7ab7a4aab85d765a20b57808e6743450252e9
| -rw-r--r-- | build/platform/java/jdk/ya.make | 5 | ||||
| -rw-r--r-- | build/ymake.core.conf | 62 | ||||
| -rwxr-xr-x | build/ymake_conf.py | 1 |
3 files changed, 38 insertions, 30 deletions
diff --git a/build/platform/java/jdk/ya.make b/build/platform/java/jdk/ya.make index 2d9eb394fa5..f92ec0c79db 100644 --- a/build/platform/java/jdk/ya.make +++ b/build/platform/java/jdk/ya.make @@ -2,8 +2,9 @@ RESOURCES_LIBRARY() OWNER(heretic) INCLUDE(resources.inc) - -IF(JDK_REAL_VERSION == "17") +IF(USE_SYSTEM_JDK) + MESSAGE(WARNING DEFAULT_JDK are disabled) +ELSEIF(JDK_REAL_VERSION == "17") DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( JDK_DEFAULT ${JDK17_DARWIN} FOR DARWIN diff --git a/build/ymake.core.conf b/build/ymake.core.conf index c581c22c8da..b0c390dfc37 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -4300,33 +4300,37 @@ otherwise { # tag:java-specific # remove extra peerdir to jdk11 after https://st.yandex-team.ru/DEVTOOLS-8851 is done -when ($JDK_REAL_VERSION == "17") { - JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk17 -} -when ($JDK_REAL_VERSION == "16") { - JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk16 build/platform/java/jdk/jdk17 -} -when ($JDK_REAL_VERSION == "15") { - JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk15 build/platform/java/jdk/jdk17 -} -when ($JDK_REAL_VERSION == "14") { - JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk14 build/platform/java/jdk/jdk17 -} -when ($JDK_REAL_VERSION == "13") { - JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk13 build/platform/java/jdk/jdk17 -} -when ($JDK_REAL_VERSION == "12") { - JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk12 build/platform/java/jdk/jdk17 -} -when ($JDK_REAL_VERSION == "11") { - JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk11 build/platform/java/jdk/jdk17 -} -when ($JDK_REAL_VERSION == "10") { - JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk10 build/platform/java/jdk/jdk17 +when ($USE_SYSTEM_JDK) { + JDK_RESOURCE_PEERDIR= } -when ($JDK_REAL_VERSION == "8") { - - JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk8 build/platform/java/jdk/jdk17 +otherwise { + when ($JDK_REAL_VERSION == "17") { + JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk17 + } + when ($JDK_REAL_VERSION == "16") { + JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk16 build/platform/java/jdk/jdk17 + } + when ($JDK_REAL_VERSION == "15") { + JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk15 build/platform/java/jdk/jdk17 + } + when ($JDK_REAL_VERSION == "14") { + JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk14 build/platform/java/jdk/jdk17 + } + when ($JDK_REAL_VERSION == "13") { + JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk13 build/platform/java/jdk/jdk17 + } + when ($JDK_REAL_VERSION == "12") { + JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk12 build/platform/java/jdk/jdk17 + } + when ($JDK_REAL_VERSION == "11") { + JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk11 build/platform/java/jdk/jdk17 + } + when ($JDK_REAL_VERSION == "10") { + JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk10 build/platform/java/jdk/jdk17 + } + when ($JDK_REAL_VERSION == "8") { + JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk8 build/platform/java/jdk/jdk17 + } } # tag:java-specific @@ -4488,7 +4492,11 @@ when ($JDK_REAL_VERSION == "8") { # tag:java-specific EXTERNAL_JAVA_JDK_RESOURCE= EXTERNAL_JAVA_EXTRA_PEERDIR= -when ($JDK_VERSION == "") { +when ($USE_SYSTEM_JDK) { + EXTERNAL_JAVA_EXTRA_PEERDIR= + EXTERNAL_JAVA_JDK_RESOURCE=$USE_SYSTEM_JDK +} +elsewhen ($JDK_VERSION == "") { EXTERNAL_JAVA_JDK_RESOURCE=$JDK11_RESOURCE_GLOBAL EXTERNAL_JAVA_EXTRA_PEERDIR=build/platform/java/jdk/jdk11 } diff --git a/build/ymake_conf.py b/build/ymake_conf.py index c889f9a782c..b85cd385982 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -2463,7 +2463,6 @@ class MSVCCompiler(MSVC, Compiler): '-Wno-extern-initializer', '-Wno-format', '-Wno-inconsistent-dllimport', - '-Wno-int-conversion', '-Wno-logical-op-parentheses', '-Wno-macro-redefined', '-Wno-parentheses', |