diff options
author | trenin17 <[email protected]> | 2022-02-10 16:51:09 +0300 |
---|---|---|
committer | Daniil Cherednik <[email protected]> | 2022-02-10 16:51:09 +0300 |
commit | b342c7befcbe40ed54f8d2f8968ad241b71e2701 (patch) | |
tree | 5d5cb817648f650d76cf1076100726fd9b8448e8 /build/platform/java/jdk | |
parent | 7d9e9dd650ccaad923d6b1ce79baaa3a15b740ae (diff) |
Restoring authorship annotation for <[email protected]>. Commit 2 of 2.
Diffstat (limited to 'build/platform/java/jdk')
-rw-r--r-- | build/platform/java/jdk/jdk10/ya.make | 40 | ||||
-rw-r--r-- | build/platform/java/jdk/jdk11/ya.make | 62 | ||||
-rw-r--r-- | build/platform/java/jdk/jdk12/ya.make | 40 | ||||
-rw-r--r-- | build/platform/java/jdk/jdk13/ya.make | 56 | ||||
-rw-r--r-- | build/platform/java/jdk/jdk14/ya.make | 40 | ||||
-rw-r--r-- | build/platform/java/jdk/jdk15/ya.make | 44 | ||||
-rw-r--r-- | build/platform/java/jdk/jdk16/ya.make | 46 | ||||
-rw-r--r-- | build/platform/java/jdk/jdk8/ya.make | 46 | ||||
-rw-r--r-- | build/platform/java/jdk/ya.make | 24 |
9 files changed, 199 insertions, 199 deletions
diff --git a/build/platform/java/jdk/jdk10/ya.make b/build/platform/java/jdk/jdk10/ya.make index cb35bb1dad7..83a420a81f9 100644 --- a/build/platform/java/jdk/jdk10/ya.make +++ b/build/platform/java/jdk/jdk10/ya.make @@ -1,20 +1,20 @@ -OWNER(trenin17) -RESOURCES_LIBRARY() -INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) - -DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - JDK10 - ${JDK10_DARWIN} FOR DARWIN - ${JDK10_LINUX} FOR LINUX - ${JDK10_WINDOWS} FOR WIN32 -) - -IF(OS_DARWIN) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK10 ${JDK10_DARWIN}) -ELSEIF(OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK10 ${JDK10_LINUX}) -ELSEIF(OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK10 ${JDK10_WINDOWS}) -ENDIF() - -END() +OWNER(trenin17) +RESOURCES_LIBRARY() +INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) + +DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + JDK10 + ${JDK10_DARWIN} FOR DARWIN + ${JDK10_LINUX} FOR LINUX + ${JDK10_WINDOWS} FOR WIN32 +) + +IF(OS_DARWIN) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK10 ${JDK10_DARWIN}) +ELSEIF(OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK10 ${JDK10_LINUX}) +ELSEIF(OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK10 ${JDK10_WINDOWS}) +ENDIF() + +END() diff --git a/build/platform/java/jdk/jdk11/ya.make b/build/platform/java/jdk/jdk11/ya.make index 541a23d9cfb..ae450c9c975 100644 --- a/build/platform/java/jdk/jdk11/ya.make +++ b/build/platform/java/jdk/jdk11/ya.make @@ -1,31 +1,31 @@ -OWNER(trenin17) -RESOURCES_LIBRARY() -INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) - -DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - JDK11 - ${JDK11_DARWIN} FOR DARWIN - ${JDK11_DARWIN_ARM64} FOR DARWIN-ARM64 - ${JDK11_LINUX} FOR LINUX - ${JDK11_WINDOWS} FOR WIN32 -) - -IF(OS_DARWIN AND ARCH_ARM64) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_DARWIN_ARM64}) -ELSEIF(OS_DARWIN) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_DARWIN}) -ELSEIF(OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_LINUX}) -ELSEIF(OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_WINDOWS}) -ENDIF() - -IF(SANITIZER_TYPE == "address") - IF(HOST_OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS11 ${JDK11_LINUX_ASAN}) - ELSE() - MESSAGE(FATAL_ERROR Unsupported platform for JDK11 with asan) - ENDIF() -ENDIF() - -END() +OWNER(trenin17) +RESOURCES_LIBRARY() +INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) + +DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + JDK11 + ${JDK11_DARWIN} FOR DARWIN + ${JDK11_DARWIN_ARM64} FOR DARWIN-ARM64 + ${JDK11_LINUX} FOR LINUX + ${JDK11_WINDOWS} FOR WIN32 +) + +IF(OS_DARWIN AND ARCH_ARM64) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_DARWIN_ARM64}) +ELSEIF(OS_DARWIN) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_DARWIN}) +ELSEIF(OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_LINUX}) +ELSEIF(OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_WINDOWS}) +ENDIF() + +IF(SANITIZER_TYPE == "address") + IF(HOST_OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS11 ${JDK11_LINUX_ASAN}) + ELSE() + MESSAGE(FATAL_ERROR Unsupported platform for JDK11 with asan) + ENDIF() +ENDIF() + +END() diff --git a/build/platform/java/jdk/jdk12/ya.make b/build/platform/java/jdk/jdk12/ya.make index 5171199f4ee..3ab35533384 100644 --- a/build/platform/java/jdk/jdk12/ya.make +++ b/build/platform/java/jdk/jdk12/ya.make @@ -1,20 +1,20 @@ -OWNER(trenin17) -RESOURCES_LIBRARY() -INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) - -DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - JDK12 - ${JDK12_DARWIN} FOR DARWIN - ${JDK12_LINUX} FOR LINUX - ${JDK12_WINDOWS} FOR WIN32 -) - -IF(OS_DARWIN) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK12 ${JDK12_DARWIN}) -ELSEIF(OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK12 ${JDK12_LINUX}) -ELSEIF(OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK12 ${JDK12_WINDOWS}) -ENDIF() - -END() +OWNER(trenin17) +RESOURCES_LIBRARY() +INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) + +DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + JDK12 + ${JDK12_DARWIN} FOR DARWIN + ${JDK12_LINUX} FOR LINUX + ${JDK12_WINDOWS} FOR WIN32 +) + +IF(OS_DARWIN) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK12 ${JDK12_DARWIN}) +ELSEIF(OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK12 ${JDK12_LINUX}) +ELSEIF(OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK12 ${JDK12_WINDOWS}) +ENDIF() + +END() diff --git a/build/platform/java/jdk/jdk13/ya.make b/build/platform/java/jdk/jdk13/ya.make index 53aba1bd78d..527af68fb28 100644 --- a/build/platform/java/jdk/jdk13/ya.make +++ b/build/platform/java/jdk/jdk13/ya.make @@ -1,28 +1,28 @@ -OWNER(trenin17) -RESOURCES_LIBRARY() -INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) - -DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - JDK13 - ${JDK13_DARWIN} FOR DARWIN - ${JDK13_LINUX} FOR LINUX - ${JDK13_WINDOWS} FOR WIN32 -) - -IF(OS_DARWIN) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK13 ${JDK13_DARWIN}) -ELSEIF(OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK13 ${JDK13_LINUX}) -ELSEIF(OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK13 ${JDK13_WINDOWS}) -ENDIF() - -IF(SANITIZER_TYPE == "address") - IF(HOST_OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS ${JDK13_LINUX_ASAN}) - ELSE() - MESSAGE(FATAL_ERROR Unsupported platform for JDK13 with asan) - ENDIF() -ENDIF() - -END() +OWNER(trenin17) +RESOURCES_LIBRARY() +INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) + +DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + JDK13 + ${JDK13_DARWIN} FOR DARWIN + ${JDK13_LINUX} FOR LINUX + ${JDK13_WINDOWS} FOR WIN32 +) + +IF(OS_DARWIN) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK13 ${JDK13_DARWIN}) +ELSEIF(OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK13 ${JDK13_LINUX}) +ELSEIF(OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK13 ${JDK13_WINDOWS}) +ENDIF() + +IF(SANITIZER_TYPE == "address") + IF(HOST_OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS ${JDK13_LINUX_ASAN}) + ELSE() + MESSAGE(FATAL_ERROR Unsupported platform for JDK13 with asan) + ENDIF() +ENDIF() + +END() diff --git a/build/platform/java/jdk/jdk14/ya.make b/build/platform/java/jdk/jdk14/ya.make index 4af59f24a78..ed08c1a7fba 100644 --- a/build/platform/java/jdk/jdk14/ya.make +++ b/build/platform/java/jdk/jdk14/ya.make @@ -1,20 +1,20 @@ -OWNER(trenin17) -RESOURCES_LIBRARY() -INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) - -DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - JDK14 - ${JDK14_DARWIN} FOR DARWIN - ${JDK14_LINUX} FOR LINUX - ${JDK14_WINDOWS} FOR WIN32 -) - -IF(OS_DARWIN) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK14 ${JDK14_DARWIN}) -ELSEIF(OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK14 ${JDK14_LINUX}) -ELSEIF(OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK14 ${JDK14_WINDOWS}) -ENDIF() - -END() +OWNER(trenin17) +RESOURCES_LIBRARY() +INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) + +DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + JDK14 + ${JDK14_DARWIN} FOR DARWIN + ${JDK14_LINUX} FOR LINUX + ${JDK14_WINDOWS} FOR WIN32 +) + +IF(OS_DARWIN) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK14 ${JDK14_DARWIN}) +ELSEIF(OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK14 ${JDK14_LINUX}) +ELSEIF(OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK14 ${JDK14_WINDOWS}) +ENDIF() + +END() diff --git a/build/platform/java/jdk/jdk15/ya.make b/build/platform/java/jdk/jdk15/ya.make index 13153e36b26..0746e27405f 100644 --- a/build/platform/java/jdk/jdk15/ya.make +++ b/build/platform/java/jdk/jdk15/ya.make @@ -1,22 +1,22 @@ -OWNER(trenin17) -RESOURCES_LIBRARY() -INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) - -DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - JDK15 - ${JDK15_DARWIN} FOR DARWIN - ${JDK15_DARWIN_ARM64} FOR DARWIN-ARM64 - ${JDK15_LINUX} FOR LINUX - ${JDK15_WINDOWS} FOR WIN32 -) -IF(OS_DARWIN AND ARCH_ARM64) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_DARWIN_ARM64}) -ELSEIF(OS_DARWIN) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_DARWIN}) -ELSEIF(OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_LINUX}) -ELSEIF(OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_WINDOWS}) -ENDIF() - -END() +OWNER(trenin17) +RESOURCES_LIBRARY() +INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) + +DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + JDK15 + ${JDK15_DARWIN} FOR DARWIN + ${JDK15_DARWIN_ARM64} FOR DARWIN-ARM64 + ${JDK15_LINUX} FOR LINUX + ${JDK15_WINDOWS} FOR WIN32 +) +IF(OS_DARWIN AND ARCH_ARM64) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_DARWIN_ARM64}) +ELSEIF(OS_DARWIN) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_DARWIN}) +ELSEIF(OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_LINUX}) +ELSEIF(OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_WINDOWS}) +ENDIF() + +END() diff --git a/build/platform/java/jdk/jdk16/ya.make b/build/platform/java/jdk/jdk16/ya.make index 05131e56ada..2fc2f16418d 100644 --- a/build/platform/java/jdk/jdk16/ya.make +++ b/build/platform/java/jdk/jdk16/ya.make @@ -1,23 +1,23 @@ -OWNER(trenin17) -RESOURCES_LIBRARY() -INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) - -DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - JDK16 - ${JDK16_DARWIN} FOR DARWIN - ${JDK16_DARWIN_ARM64} FOR DARWIN-ARM64 - ${JDK16_LINUX} FOR LINUX - ${JDK16_WINDOWS} FOR WIN32 -) - -IF(OS_DARWIN AND ARCH_ARM64) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_DARWIN_ARM64}) -ELSEIF(OS_DARWIN) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_DARWIN}) -ELSEIF(OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_LINUX}) -ELSEIF(OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_WINDOWS}) -ENDIF() - -END() +OWNER(trenin17) +RESOURCES_LIBRARY() +INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) + +DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + JDK16 + ${JDK16_DARWIN} FOR DARWIN + ${JDK16_DARWIN_ARM64} FOR DARWIN-ARM64 + ${JDK16_LINUX} FOR LINUX + ${JDK16_WINDOWS} FOR WIN32 +) + +IF(OS_DARWIN AND ARCH_ARM64) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_DARWIN_ARM64}) +ELSEIF(OS_DARWIN) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_DARWIN}) +ELSEIF(OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_LINUX}) +ELSEIF(OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_WINDOWS}) +ENDIF() + +END() diff --git a/build/platform/java/jdk/jdk8/ya.make b/build/platform/java/jdk/jdk8/ya.make index 10be961779d..7386b4731c0 100644 --- a/build/platform/java/jdk/jdk8/ya.make +++ b/build/platform/java/jdk/jdk8/ya.make @@ -1,23 +1,23 @@ -OWNER(trenin17) -RESOURCES_LIBRARY() -INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) - -DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - JDK8 - ${JDK8_DARWIN_ARM64} FOR DARWIN-ARM64 - ${JDK8_DARWIN} FOR DARWIN - ${JDK8_LINUX} FOR LINUX - ${JDK8_WINDOWS} FOR WIN32 -) - -IF(OS_DARWIN AND ARCH_ARM64) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK8 ${JDK8_DARWIN_ARM64}) -ELSEIF(OS_DARWIN) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK8 ${JDK8_DARWIN}) -ELSEIF(OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK8 ${JDK8_LINUX}) -ELSEIF(OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK8 ${JDK8_WINDOWS}) -ENDIF() - -END() +OWNER(trenin17) +RESOURCES_LIBRARY() +INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) + +DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + JDK8 + ${JDK8_DARWIN_ARM64} FOR DARWIN-ARM64 + ${JDK8_DARWIN} FOR DARWIN + ${JDK8_LINUX} FOR LINUX + ${JDK8_WINDOWS} FOR WIN32 +) + +IF(OS_DARWIN AND ARCH_ARM64) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK8 ${JDK8_DARWIN_ARM64}) +ELSEIF(OS_DARWIN) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK8 ${JDK8_DARWIN}) +ELSEIF(OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK8 ${JDK8_LINUX}) +ELSEIF(OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK8 ${JDK8_WINDOWS}) +ENDIF() + +END() diff --git a/build/platform/java/jdk/ya.make b/build/platform/java/jdk/ya.make index 155d991f935..909ae36e18a 100644 --- a/build/platform/java/jdk/ya.make +++ b/build/platform/java/jdk/ya.make @@ -98,7 +98,7 @@ ELSEIF(JDK_VERSION == "8") ELSE() MESSAGE(FATAL_ERROR Unsupported JDK version) ENDIF() - + IF(USE_SYSTEM_JDK) MESSAGE(WARNING System JDK $USE_SYSTEM_JDK will be used) ELSEIF(JDK_VERSION == "17") @@ -297,15 +297,15 @@ ELSE() ENDIF() END() - -RECURSE( - jdk8 - jdk10 - jdk11 - jdk12 - jdk13 - jdk14 - jdk15 - jdk16 + +RECURSE( + jdk8 + jdk10 + jdk11 + jdk12 + jdk13 + jdk14 + jdk15 + jdk16 jdk17 -) +) |