|
@@ -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
|
|
|
}
|