diff options
author | heretic <heretic@yandex-team.ru> | 2022-02-10 16:45:43 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:45:43 +0300 |
commit | 397cbe258b9e064f49c4ca575279f02f39fef76e (patch) | |
tree | a0b0eb3cca6a14e4e8ea715393637672fa651284 /build/platform | |
parent | 43f5a35593ebc9f6bcea619bb170394ea7ae468e (diff) | |
download | ydb-397cbe258b9e064f49c4ca575279f02f39fef76e.tar.gz |
Restoring authorship annotation for <heretic@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'build/platform')
41 files changed, 714 insertions, 714 deletions
diff --git a/build/platform/android_sdk/ya.make b/build/platform/android_sdk/ya.make index 1e726065da..c66207788d 100644 --- a/build/platform/android_sdk/ya.make +++ b/build/platform/android_sdk/ya.make @@ -1,20 +1,20 @@ -RESOURCES_LIBRARY() - -OWNER(g:mapkit) - -IF (NOT OS_ANDROID) - MESSAGE(FATAL_ERROR Unsupported platform) -ENDIF() - -IF (HOST_OS_LINUX) +RESOURCES_LIBRARY() + +OWNER(g:mapkit) + +IF (NOT OS_ANDROID) + MESSAGE(FATAL_ERROR Unsupported platform) +ENDIF() + +IF (HOST_OS_LINUX) # Android SDK for linux: Build-Tools 30.0.3, Platform 30 - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - ANDROID_SDK - sbr:2564045529 FOR LINUX - ) - DECLARE_EXTERNAL_RESOURCE(ANDROID_AVD sbr:2563860055) -ELSE() - MESSAGE(FATAL_ERROR Unsupported host platform) -ENDIF() - -END() + DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + ANDROID_SDK + sbr:2564045529 FOR LINUX + ) + DECLARE_EXTERNAL_RESOURCE(ANDROID_AVD sbr:2563860055) +ELSE() + MESSAGE(FATAL_ERROR Unsupported host platform) +ENDIF() + +END() diff --git a/build/platform/bfd/ya.make b/build/platform/bfd/ya.make index 67501f665f..3f92fabc82 100644 --- a/build/platform/bfd/ya.make +++ b/build/platform/bfd/ya.make @@ -2,7 +2,7 @@ RESOURCES_LIBRARY() OWNER(somov) -INCLUDE(${ARCADIA_ROOT}/build/platform/binutils/binutils.resource) +INCLUDE(${ARCADIA_ROOT}/build/platform/binutils/binutils.resource) LDFLAGS(-fuse-ld=$BINUTILS_ROOT_RESOURCE_GLOBAL/bin/ld.bfd) diff --git a/build/platform/binutils/binutils.resource b/build/platform/binutils/binutils.resource index 28823ecd80..32ff6b293c 100644 --- a/build/platform/binutils/binutils.resource +++ b/build/platform/binutils/binutils.resource @@ -1,7 +1,7 @@ -IF (HOST_OS_DARWIN AND OS_LINUX AND ARCH_X86_64) - DECLARE_EXTERNAL_RESOURCE(BINUTILS_ROOT sbr:333256689) -ELSEIF (HOST_OS_LINUX AND OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(BINUTILS_ROOT sbr:360916612) -ELSE() - MESSAGE(FATAL_ERROR "There is no binutils for selected build configuration") -ENDIF() +IF (HOST_OS_DARWIN AND OS_LINUX AND ARCH_X86_64) + DECLARE_EXTERNAL_RESOURCE(BINUTILS_ROOT sbr:333256689) +ELSEIF (HOST_OS_LINUX AND OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(BINUTILS_ROOT sbr:360916612) +ELSE() + MESSAGE(FATAL_ERROR "There is no binutils for selected build configuration") +ENDIF() diff --git a/build/platform/binutils/ya.make b/build/platform/binutils/ya.make index aedcb12f23..1d714b7eed 100644 --- a/build/platform/binutils/ya.make +++ b/build/platform/binutils/ya.make @@ -2,7 +2,7 @@ RESOURCES_LIBRARY() OWNER(g:contrib somov) -INCLUDE(binutils.resource) +INCLUDE(binutils.resource) END() diff --git a/build/platform/cctools/ya.make b/build/platform/cctools/ya.make index c17a6abc67..dbb1d42a94 100644 --- a/build/platform/cctools/ya.make +++ b/build/platform/cctools/ya.make @@ -2,11 +2,11 @@ RESOURCES_LIBRARY() OWNER(somov) -DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - CCTOOLS_ROOT - sbr:2135298496 FOR LINUX - sbr:2135992724 FOR DARWIN - sbr:2135992724 FOR DARWIN-ARM64 -) +DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + CCTOOLS_ROOT + sbr:2135298496 FOR LINUX + sbr:2135992724 FOR DARWIN + sbr:2135992724 FOR DARWIN-ARM64 +) END() diff --git a/build/platform/clang/ya.make b/build/platform/clang/ya.make index 342b928637..6b180fff06 100644 --- a/build/platform/clang/ya.make +++ b/build/platform/clang/ya.make @@ -11,8 +11,8 @@ IF (CLANG10BC AND CLANG10 AND HOST_OS_LINUX) sbr:1844539535 FOR DARWIN ) ELSE() - # Remove -std=c++17 flag from LLVM_COMPILE_CXX and CLANG_EMIT_AST_CXX macro when update clang to 11 - # DEVTOOLS-7845 + # Remove -std=c++17 flag from LLVM_COMPILE_CXX and CLANG_EMIT_AST_CXX macro when update clang to 11 + # DEVTOOLS-7845 DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( CLANG # Clang 7 sbr:707372498 FOR LINUX # In 942524429 and 958916803 llvm-link does not run. diff --git a/build/platform/coverage_push_tool/ya.make b/build/platform/coverage_push_tool/ya.make index 675569dbe5..1b4df90479 100644 --- a/build/platform/coverage_push_tool/ya.make +++ b/build/platform/coverage_push_tool/ya.make @@ -1,10 +1,10 @@ -RESOURCES_LIBRARY() -OWNER(heretic) -IF(USE_SYSTEM_COVERAGE_PUSH_TOOL) - MESSAGE(WARNING System coverage push tool $USE_SYSTEM_COVERAGE_PUSH_TOOL will be used) -ELSEIF(HOST_OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(COVERAGE_PUSH_TOOL sbr:1748856682) -ELSE() - MESSAGE(FATAL_ERROR Unsupported host for COVERAGE_PUSH_TOOL) -ENDIF() -END() +RESOURCES_LIBRARY() +OWNER(heretic) +IF(USE_SYSTEM_COVERAGE_PUSH_TOOL) + MESSAGE(WARNING System coverage push tool $USE_SYSTEM_COVERAGE_PUSH_TOOL will be used) +ELSEIF(HOST_OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(COVERAGE_PUSH_TOOL sbr:1748856682) +ELSE() + MESSAGE(FATAL_ERROR Unsupported host for COVERAGE_PUSH_TOOL) +ENDIF() +END() diff --git a/build/platform/cuda/stdtree/ya.make b/build/platform/cuda/stdtree/ya.make index 01feaee51e..03a0e2f3ee 100644 --- a/build/platform/cuda/stdtree/ya.make +++ b/build/platform/cuda/stdtree/ya.make @@ -1,13 +1,13 @@ -RESOURCES_LIBRARY() - -OWNER(g:contrib heretic) - -IF (OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(STD_TREE sbr:1094784663) -ELSE() - MESSAGE(FATAL_ERROR "No stdc++ tree part for the selected platform found") -ENDIF() -LDFLAGS("-L$STD_TREE_RESOURCE_GLOBAL") -EXTRALIBS(tree) - -END() +RESOURCES_LIBRARY() + +OWNER(g:contrib heretic) + +IF (OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(STD_TREE sbr:1094784663) +ELSE() + MESSAGE(FATAL_ERROR "No stdc++ tree part for the selected platform found") +ENDIF() +LDFLAGS("-L$STD_TREE_RESOURCE_GLOBAL") +EXTRALIBS(tree) + +END() diff --git a/build/platform/cuda/ya.make b/build/platform/cuda/ya.make index 3615f682cd..a4e312502d 100644 --- a/build/platform/cuda/ya.make +++ b/build/platform/cuda/ya.make @@ -26,14 +26,14 @@ IF (USE_ARCADIA_CUDA) ELSE() ENABLE(CUDA_NOT_FOUND) ENDIF() - ELSEIF(OS_LINUX AND ARCH_AARCH64) - IF (CUDA_VERSION == "11.3") - DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2227720086) # CUDA Toolkit 11.3.20210513 (11.3.1) for Linux x86-64 with linux-aarch64 support - # host tools installer https://sandbox.yandex-team.ru/resource/2227828799/view - # cross compile parts installer https://sandbox.yandex-team.ru/resource/2227885870/view - ELSE() - ENABLE(CUDA_NOT_FOUND) - ENDIF() + ELSEIF(OS_LINUX AND ARCH_AARCH64) + IF (CUDA_VERSION == "11.3") + DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2227720086) # CUDA Toolkit 11.3.20210513 (11.3.1) for Linux x86-64 with linux-aarch64 support + # host tools installer https://sandbox.yandex-team.ru/resource/2227828799/view + # cross compile parts installer https://sandbox.yandex-team.ru/resource/2227885870/view + ELSE() + ENABLE(CUDA_NOT_FOUND) + ENDIF() ELSE() ENABLE(CUDA_NOT_FOUND) ENDIF() @@ -89,8 +89,8 @@ IF (USE_ARCADIA_CUDA_HOST_COMPILER) # Equivalent to nvcc -allow-unsupported-compiler (present since 11.0). CFLAGS(GLOBAL "-D__NV_NO_HOST_COMPILER_CHECK") ENDIF() - ELSEIF(OS_LINUX AND ARCH_AARCH64) - DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:1886578148) # Clang 11.0.0 for linux-x86_64 + ELSEIF(OS_LINUX AND ARCH_AARCH64) + DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:1886578148) # Clang 11.0.0 for linux-x86_64 ELSE() ENABLE(CUDA_HOST_COMPILER_NOT_FOUND) ENDIF() @@ -109,16 +109,16 @@ IF (USE_ARCADIA_CUDA_HOST_COMPILER) ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_X86_64) IF (OS_DARWIN AND ARCH_X86_64) - SET(__XCODE_RESOURCE_NAME CUDA_HOST_TOOLCHAIN) + SET(__XCODE_RESOURCE_NAME CUDA_HOST_TOOLCHAIN) IF (CUDA_VERSION == "10.1") SET(__XCODE_TOOLCHAIN_VERSION "9.2") # (not latest) - ELSE() - SET(__XCODE_TOOLCHAIN_VERSION "") - ENABLE(CUDA_HOST_COMPILER_NOT_FOUND) - ENDIF() - IF (__XCODE_TOOLCHAIN_VERSION) - INCLUDE(${ARCADIA_ROOT}/build/platform/xcode/ya.make.inc) + ELSE() + SET(__XCODE_TOOLCHAIN_VERSION "") + ENABLE(CUDA_HOST_COMPILER_NOT_FOUND) ENDIF() + IF (__XCODE_TOOLCHAIN_VERSION) + INCLUDE(${ARCADIA_ROOT}/build/platform/xcode/ya.make.inc) + ENDIF() ELSE() ENABLE(CUDA_HOST_COMPILER_NOT_FOUND) ENDIF() @@ -169,23 +169,23 @@ ENDIF() IF (HOST_OS_WINDOWS) SET_APPEND(LDFLAGS_GLOBAL "\"/LIBPATH:${CUDA_ROOT}/lib/x64\"") -ELSEIF(HOST_OS_LINUX AND OS_LINUX AND ARCH_AARCH64) - LDFLAGS("-L${CUDA_ROOT}/targets/sbsa-linux/lib") +ELSEIF(HOST_OS_LINUX AND OS_LINUX AND ARCH_AARCH64) + LDFLAGS("-L${CUDA_ROOT}/targets/sbsa-linux/lib") ELSEIF(HOST_OS_LINUX) LDFLAGS("-L${CUDA_ROOT}/lib64") ELSE() LDFLAGS("-L${CUDA_ROOT}/lib") ENDIF() -IF (CUDA_REQUIRED) - IF(HOST_OS_LINUX) - LDFLAGS("-L${CUDA_ROOT}/lib64/stubs") - EXTRALIBS(-lcuda) - ELSEIF(HOST_OS_DARWIN) - LDFLAGS("-F${CUDA_ROOT}/lib/stubs -framework CUDA") - ENDIF() -ENDIF() - +IF (CUDA_REQUIRED) + IF(HOST_OS_LINUX) + LDFLAGS("-L${CUDA_ROOT}/lib64/stubs") + EXTRALIBS(-lcuda) + ELSEIF(HOST_OS_DARWIN) + LDFLAGS("-F${CUDA_ROOT}/lib/stubs -framework CUDA") + ENDIF() +ENDIF() + IF (HOST_OS_WINDOWS) LDFLAGS(cudadevrt.lib cudart_static.lib) ELSE() diff --git a/build/platform/gold/ya.make b/build/platform/gold/ya.make index 91f01602f7..59f6d0e123 100644 --- a/build/platform/gold/ya.make +++ b/build/platform/gold/ya.make @@ -2,7 +2,7 @@ RESOURCES_LIBRARY() OWNER(somov) -INCLUDE(${ARCADIA_ROOT}/build/platform/binutils/binutils.resource) +INCLUDE(${ARCADIA_ROOT}/build/platform/binutils/binutils.resource) LDFLAGS( -fuse-ld=$BINUTILS_ROOT_RESOURCE_GLOBAL/bin/ld.gold diff --git a/build/platform/java/error_prone/2.10.0/ya.make b/build/platform/java/error_prone/2.10.0/ya.make index d08a624350..fbe71c80f3 100644 --- a/build/platform/java/error_prone/2.10.0/ya.make +++ b/build/platform/java/error_prone/2.10.0/ya.make @@ -1,4 +1,4 @@ -RESOURCES_LIBRARY() -OWNER(heretic) -DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE_2_10_0 sbr:2649935593) -END() +RESOURCES_LIBRARY() +OWNER(heretic) +DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE_2_10_0 sbr:2649935593) +END() diff --git a/build/platform/java/error_prone/2.3.1/ya.make b/build/platform/java/error_prone/2.3.1/ya.make index 5d2267036f..13800abfd1 100644 --- a/build/platform/java/error_prone/2.3.1/ya.make +++ b/build/platform/java/error_prone/2.3.1/ya.make @@ -1,4 +1,4 @@ -RESOURCES_LIBRARY() -OWNER(heretic) -DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE_2_3_1 sbr:616853779) -END() +RESOURCES_LIBRARY() +OWNER(heretic) +DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE_2_3_1 sbr:616853779) +END() diff --git a/build/platform/java/error_prone/2.7.1/ya.make b/build/platform/java/error_prone/2.7.1/ya.make index 81a345ba98..0d60128316 100644 --- a/build/platform/java/error_prone/2.7.1/ya.make +++ b/build/platform/java/error_prone/2.7.1/ya.make @@ -1,4 +1,4 @@ -RESOURCES_LIBRARY() -OWNER(heretic) -DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE_2_7_1 sbr:2202855601) -END() +RESOURCES_LIBRARY() +OWNER(heretic) +DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE_2_7_1 sbr:2202855601) +END() diff --git a/build/platform/java/error_prone/ya.make b/build/platform/java/error_prone/ya.make index ee2eceafc0..89facf44d1 100644 --- a/build/platform/java/error_prone/ya.make +++ b/build/platform/java/error_prone/ya.make @@ -1,28 +1,28 @@ -RESOURCES_LIBRARY() -OWNER(heretic) -IF(USE_SYSTEM_ERROR_PRONE) - MESSAGE(WARNING System Error Prone $USE_SYSTEM_ERROR_PRONE will be used) +RESOURCES_LIBRARY() +OWNER(heretic) +IF(USE_SYSTEM_ERROR_PRONE) + MESSAGE(WARNING System Error Prone $USE_SYSTEM_ERROR_PRONE will be used) ELSEIF(ERROR_PRONE_VERSION == "2.3.1") - DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE sbr:616853779) + DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE sbr:616853779) ELSEIF(ERROR_PRONE_VERSION == "2.3.2") - DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE sbr:760800655) + DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE sbr:760800655) ELSEIF(ERROR_PRONE_VERSION == "2.3.3") - DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE sbr:919320393) + DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE sbr:919320393) ELSEIF(ERROR_PRONE_VERSION == "2.4.0") - DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE sbr:1585305794) + DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE sbr:1585305794) ELSEIF(ERROR_PRONE_VERSION == "2.6.0") DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE sbr:2139890169) -ELSEIF(ERROR_PRONE_VERSION == "2.7.1") - DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE sbr:2202855601) -ELSEIF(ERROR_PRONE_VERSION == "2.10.0") - DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE sbr:2649935593) -ELSE() - MESSAGE(FATAL_ERROR Unsupported Error Prone version: $ERROR_PRONE_VERSION) -ENDIF() -END() - -RECURSE( - 2.10.0 - 2.7.1 - 2.3.1 -) +ELSEIF(ERROR_PRONE_VERSION == "2.7.1") + DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE sbr:2202855601) +ELSEIF(ERROR_PRONE_VERSION == "2.10.0") + DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE sbr:2649935593) +ELSE() + MESSAGE(FATAL_ERROR Unsupported Error Prone version: $ERROR_PRONE_VERSION) +ENDIF() +END() + +RECURSE( + 2.10.0 + 2.7.1 + 2.3.1 +) diff --git a/build/platform/java/groovy/ya.make b/build/platform/java/groovy/ya.make index 01058729b2..dabe96508a 100644 --- a/build/platform/java/groovy/ya.make +++ b/build/platform/java/groovy/ya.make @@ -1,10 +1,10 @@ -RESOURCES_LIBRARY() -OWNER(heretic) -IF(USE_SYSTEM_GROOVY_COMPILER) - MESSAGE(WARNING System groovy $USE_SYSTEM_GROOVY_COMPILER will be used) +RESOURCES_LIBRARY() +OWNER(heretic) +IF(USE_SYSTEM_GROOVY_COMPILER) + MESSAGE(WARNING System groovy $USE_SYSTEM_GROOVY_COMPILER will be used) ELSEIF(GROOVY_VERSION == "3.0.5") - DECLARE_EXTERNAL_RESOURCE(GROOVY_COMPILER sbr:1710622475) -ELSE() - MESSAGE(FATAL_ERROR Unexpected groovy version ${GROOVY_VERSION}) -ENDIF() -END() + DECLARE_EXTERNAL_RESOURCE(GROOVY_COMPILER sbr:1710622475) +ELSE() + MESSAGE(FATAL_ERROR Unexpected groovy version ${GROOVY_VERSION}) +ENDIF() +END() diff --git a/build/platform/java/jacoco-agent/ya.make b/build/platform/java/jacoco-agent/ya.make index c298dc9020..5c30947de4 100644 --- a/build/platform/java/jacoco-agent/ya.make +++ b/build/platform/java/jacoco-agent/ya.make @@ -1,9 +1,9 @@ -RESOURCES_LIBRARY() -OWNER(heretic) -IF(USE_SYSTEM_JACOCO_AGENT) - MESSAGE(WARNING System jacoco agent $USE_SYSTEM_JACOCO_AGENT will be used) -ELSE() - DECLARE_EXTERNAL_RESOURCE(JACOCO_AGENT sbr:2493693569) -ENDIF() - -END() +RESOURCES_LIBRARY() +OWNER(heretic) +IF(USE_SYSTEM_JACOCO_AGENT) + MESSAGE(WARNING System jacoco agent $USE_SYSTEM_JACOCO_AGENT will be used) +ELSE() + DECLARE_EXTERNAL_RESOURCE(JACOCO_AGENT sbr:2493693569) +ENDIF() + +END() diff --git a/build/platform/java/jdk/jdk17/ya.make b/build/platform/java/jdk/jdk17/ya.make index 97aa391945..9fb611c820 100644 --- a/build/platform/java/jdk/jdk17/ya.make +++ b/build/platform/java/jdk/jdk17/ya.make @@ -1,23 +1,23 @@ -OWNER(heretic) -RESOURCES_LIBRARY() -INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) - -DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - JDK17 - ${JDK17_DARWIN} FOR DARWIN - ${JDK17_DARWIN_ARM64} FOR DARWIN-ARM64 - ${JDK17_LINUX} FOR LINUX - ${JDK17_WINDOWS} FOR WIN32 -) - -IF(OS_DARWIN AND ARCH_ARM64) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK17 ${JDK17_DARWIN_ARM64}) -ELSEIF(OS_DARWIN) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK17 ${JDK17_DARWIN}) -ELSEIF(OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK17 ${JDK17_LINUX}) -ELSEIF(OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK17 ${JDK17_WINDOWS}) -ENDIF() - -END() +OWNER(heretic) +RESOURCES_LIBRARY() +INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) + +DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + JDK17 + ${JDK17_DARWIN} FOR DARWIN + ${JDK17_DARWIN_ARM64} FOR DARWIN-ARM64 + ${JDK17_LINUX} FOR LINUX + ${JDK17_WINDOWS} FOR WIN32 +) + +IF(OS_DARWIN AND ARCH_ARM64) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK17 ${JDK17_DARWIN_ARM64}) +ELSEIF(OS_DARWIN) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK17 ${JDK17_DARWIN}) +ELSEIF(OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK17 ${JDK17_LINUX}) +ELSEIF(OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK17 ${JDK17_WINDOWS}) +ENDIF() + +END() diff --git a/build/platform/java/jdk/resources.inc b/build/platform/java/jdk/resources.inc index 7413263cd9..20e482a53f 100644 --- a/build/platform/java/jdk/resources.inc +++ b/build/platform/java/jdk/resources.inc @@ -1,49 +1,49 @@ -# JDK 17 -SET(JDK17_DARWIN_ARM64 sbr:2720893567) -SET(JDK17_DARWIN sbr:2720886299) -SET(JDK17_LINUX sbr:2720875090) -SET(JDK17_WINDOWS sbr:2720881931) - -# JDK 16 -SET(JDK16_DARWIN_ARM64 sbr:2197985911) -SET(JDK16_DARWIN sbr:2197936962) -SET(JDK16_LINUX sbr:2197854301) -SET(JDK16_WINDOWS sbr:2197964128) - -# JDK 15 -SET(JDK15_DARWIN sbr:1901471162) -SET(JDK15_DARWIN_ARM64 sbr:2107376046) -SET(JDK15_LINUX sbr:1901452000) -SET(JDK15_WINDOWS sbr:1901563630) - -# JDK 14 -SET(JDK14_DARWIN sbr:1714972232) -SET(JDK14_LINUX sbr:1714966923) -SET(JDK14_WINDOWS sbr:1714975688) - -# JDK 13 -SET(JDK13_DARWIN sbr:1327581343) -SET(JDK13_LINUX sbr:1327248424) -SET(JDK13_WINDOWS sbr:1327617393) - -SET(JDK13_LINUX_ASAN sbr:1327513158) -# JDK 12 -SET(JDK12_DARWIN sbr:1128561457) -SET(JDK12_LINUX sbr:1128737735) -SET(JDK12_WINDOWS sbr:1128743394) -# JDK 11 -SET(JDK11_DARWIN sbr:1903539486) -SET(JDK11_DARWIN_ARM64 sbr:2107253283) -SET(JDK11_LINUX sbr:1903522585) -SET(JDK11_WINDOWS sbr:1903567822) - -SET(JDK11_LINUX_ASAN sbr:1323637508) -# JDK 10 -SET(JDK10_DARWIN sbr:545649998) -SET(JDK10_LINUX sbr:545649806) -SET(JDK10_WINDOWS sbr:545648079) -# JDK 8 -SET(JDK8_DARWIN_ARM64 sbr:1901326056) -SET(JDK8_DARWIN sbr:1901326056) -SET(JDK8_LINUX sbr:1901306329) -SET(JDK8_WINDOWS sbr:1901510679) +# JDK 17 +SET(JDK17_DARWIN_ARM64 sbr:2720893567) +SET(JDK17_DARWIN sbr:2720886299) +SET(JDK17_LINUX sbr:2720875090) +SET(JDK17_WINDOWS sbr:2720881931) + +# JDK 16 +SET(JDK16_DARWIN_ARM64 sbr:2197985911) +SET(JDK16_DARWIN sbr:2197936962) +SET(JDK16_LINUX sbr:2197854301) +SET(JDK16_WINDOWS sbr:2197964128) + +# JDK 15 +SET(JDK15_DARWIN sbr:1901471162) +SET(JDK15_DARWIN_ARM64 sbr:2107376046) +SET(JDK15_LINUX sbr:1901452000) +SET(JDK15_WINDOWS sbr:1901563630) + +# JDK 14 +SET(JDK14_DARWIN sbr:1714972232) +SET(JDK14_LINUX sbr:1714966923) +SET(JDK14_WINDOWS sbr:1714975688) + +# JDK 13 +SET(JDK13_DARWIN sbr:1327581343) +SET(JDK13_LINUX sbr:1327248424) +SET(JDK13_WINDOWS sbr:1327617393) + +SET(JDK13_LINUX_ASAN sbr:1327513158) +# JDK 12 +SET(JDK12_DARWIN sbr:1128561457) +SET(JDK12_LINUX sbr:1128737735) +SET(JDK12_WINDOWS sbr:1128743394) +# JDK 11 +SET(JDK11_DARWIN sbr:1903539486) +SET(JDK11_DARWIN_ARM64 sbr:2107253283) +SET(JDK11_LINUX sbr:1903522585) +SET(JDK11_WINDOWS sbr:1903567822) + +SET(JDK11_LINUX_ASAN sbr:1323637508) +# JDK 10 +SET(JDK10_DARWIN sbr:545649998) +SET(JDK10_LINUX sbr:545649806) +SET(JDK10_WINDOWS sbr:545648079) +# JDK 8 +SET(JDK8_DARWIN_ARM64 sbr:1901326056) +SET(JDK8_DARWIN sbr:1901326056) +SET(JDK8_LINUX sbr:1901306329) +SET(JDK8_WINDOWS sbr:1901510679) diff --git a/build/platform/java/jdk/ya.make b/build/platform/java/jdk/ya.make index 909ae36e18..2ba2493e56 100644 --- a/build/platform/java/jdk/ya.make +++ b/build/platform/java/jdk/ya.make @@ -1,302 +1,302 @@ -RESOURCES_LIBRARY() -OWNER(heretic) +RESOURCES_LIBRARY() +OWNER(heretic) + +INCLUDE(resources.inc) + +IF(JDK_VERSION == "17") + DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + JDK_DEFAULT + ${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() +ELSEIF(JDK_VERSION == "16") + DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + JDK_DEFAULT + ${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() +ELSEIF(JDK_VERSION == "15") + DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + JDK_DEFAULT + ${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() +ELSEIF(JDK_VERSION == "14") + DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + JDK_DEFAULT + ${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() +ELSEIF(JDK_VERSION == "13") + DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + JDK_DEFAULT + ${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() +ELSEIF(JDK_VERSION == "12") + DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + JDK_DEFAULT + ${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() +ELSEIF(JDK_VERSION == "11") + DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + JDK_DEFAULT + ${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() +ELSEIF(JDK_VERSION == "10") + DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + JDK_DEFAULT + ${JDK10_DARWIN} FOR DARWIN + ${JDK10_LINUX} FOR LINUX + ${JDK10_WINDOWS} FOR WIN32 + ) +ELSEIF(JDK_VERSION == "8") + DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( + JDK_DEFAULT + ${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() +ELSE() + MESSAGE(FATAL_ERROR Unsupported JDK version) +ENDIF() -INCLUDE(resources.inc) - -IF(JDK_VERSION == "17") - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - JDK_DEFAULT - ${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() -ELSEIF(JDK_VERSION == "16") - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - JDK_DEFAULT - ${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(USE_SYSTEM_JDK) + MESSAGE(WARNING System JDK $USE_SYSTEM_JDK will be used) +ELSEIF(JDK_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) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK17_DARWIN}) + ELSEIF(OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK17_LINUX}) + ELSEIF(OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK17_WINDOWS}) + ENDIF() +ELSEIF(JDK_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) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK16_DARWIN}) + ELSEIF(OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK16_LINUX}) + ELSEIF(OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK16_WINDOWS}) + ENDIF() ELSEIF(JDK_VERSION == "15") - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - JDK_DEFAULT - ${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() + 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) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK15_DARWIN}) + ELSEIF(OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK15_LINUX}) + ELSEIF(OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK15_WINDOWS}) + ENDIF() ELSEIF(JDK_VERSION == "14") - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - JDK_DEFAULT - ${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() + 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) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK14_LINUX}) + ELSEIF(OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK14_WINDOWS}) + ENDIF() ELSEIF(JDK_VERSION == "13") - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - JDK_DEFAULT - ${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() -ELSEIF(JDK_VERSION == "12") - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - JDK_DEFAULT - ${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() -ELSEIF(JDK_VERSION == "11") - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - JDK_DEFAULT - ${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() -ELSEIF(JDK_VERSION == "10") - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - JDK_DEFAULT - ${JDK10_DARWIN} FOR DARWIN - ${JDK10_LINUX} FOR LINUX - ${JDK10_WINDOWS} FOR WIN32 - ) -ELSEIF(JDK_VERSION == "8") - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - JDK_DEFAULT - ${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() -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") - 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) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK17_DARWIN}) - ELSEIF(OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK17_LINUX}) - ELSEIF(OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK17_WINDOWS}) - ENDIF() -ELSEIF(JDK_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) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK16_DARWIN}) - ELSEIF(OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK16_LINUX}) - ELSEIF(OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK16_WINDOWS}) - ENDIF() -ELSEIF(JDK_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) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK15_DARWIN}) - ELSEIF(OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK15_LINUX}) - ELSEIF(OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK15_WINDOWS}) - ENDIF() -ELSEIF(JDK_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) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK14_LINUX}) - ELSEIF(OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK14_WINDOWS}) - ENDIF() -ELSEIF(JDK_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() + 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}) - ELSE() - MESSAGE(FATAL_ERROR Unsupported platform for JDK13 with asan) - ENDIF() - ENDIF() - - IF(OS_DARWIN) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK13_DARWIN}) - ELSEIF(OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK13_LINUX}) - ELSEIF(OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK13_WINDOWS}) - ENDIF() + 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() + + IF(OS_DARWIN) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK13_DARWIN}) + ELSEIF(OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK13_LINUX}) + ELSEIF(OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK13_WINDOWS}) + ENDIF() ELSEIF(JDK_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) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK12_LINUX}) - ELSEIF(OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK12_WINDOWS}) - ENDIF() + 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) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK12_LINUX}) + ELSEIF(OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK12_WINDOWS}) + ENDIF() ELSEIF(JDK_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() + 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) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK11_DARWIN}) - ELSEIF(OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK11_LINUX}) - ELSEIF(OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK11_WINDOWS}) - ENDIF() + 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) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK11_DARWIN}) + ELSEIF(OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK11_LINUX}) + ELSEIF(OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK11_WINDOWS}) + ENDIF() ELSEIF(JDK_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) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK10_LINUX}) - ELSEIF(OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK10_WINDOWS}) - ENDIF() + 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) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK10_LINUX}) + ELSEIF(OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK10_WINDOWS}) + ENDIF() ELSEIF(JDK_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) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK8_DARWIN}) - ELSEIF(OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK8_LINUX}) - ELSEIF(OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK8_WINDOWS}) - ENDIF() -ELSE() - MESSAGE(FATAL_ERROR Unsupported JDK version) -ENDIF() - -END() + 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) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK8_DARWIN}) + ELSEIF(OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK8_LINUX}) + ELSEIF(OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK8_WINDOWS}) + ENDIF() +ELSE() + MESSAGE(FATAL_ERROR Unsupported JDK version) +ENDIF() + +END() RECURSE( jdk8 @@ -307,5 +307,5 @@ RECURSE( jdk14 jdk15 jdk16 - jdk17 + jdk17 ) diff --git a/build/platform/java/jni/ya.make b/build/platform/java/jni/ya.make index 9d8dab98b1..fdee4311c1 100644 --- a/build/platform/java/jni/ya.make +++ b/build/platform/java/jni/ya.make @@ -1,29 +1,29 @@ -LIBRARY() -OWNER(heretic) - +LIBRARY() +OWNER(heretic) + PEERDIR( build/platform/java/jdk ${JDK_RESOURCE_PEERDIR} ) - -IF(OS_DARWIN) - SET(PLATFORM_NAME darwin) -ELSEIF(OS_LINUX) - SET(PLATFORM_NAME linux) -ELSEIF(OS_WINDOWS) - SET(PLATFORM_NAME win32) -ENDIF() - -IF (USE_SYSTEM_JDK) - SET(JDK_ROOT ${USE_SYSTEM_JDK}) -ELSE() + +IF(OS_DARWIN) + SET(PLATFORM_NAME darwin) +ELSEIF(OS_LINUX) + SET(PLATFORM_NAME linux) +ELSEIF(OS_WINDOWS) + SET(PLATFORM_NAME win32) +ENDIF() + +IF (USE_SYSTEM_JDK) + SET(JDK_ROOT ${USE_SYSTEM_JDK}) +ELSE() SET(JDK_ROOT ${JDK_DEFAULT_RESOURCE_GLOBAL}) -ENDIF() -IF (PLATFORM_NAME) - CFLAGS(GLOBAL -I${JDK_ROOT}/include) - CFLAGS(GLOBAL -I${JDK_ROOT}/include/${PLATFORM_NAME}) -ELSE() - MESSAGE(FATAL_ERROR Unsupported platform for jni) -ENDIF() - -END() +ENDIF() +IF (PLATFORM_NAME) + CFLAGS(GLOBAL -I${JDK_ROOT}/include) + CFLAGS(GLOBAL -I${JDK_ROOT}/include/${PLATFORM_NAME}) +ELSE() + MESSAGE(FATAL_ERROR Unsupported platform for jni) +ENDIF() + +END() diff --git a/build/platform/java/jstyle_lib/ya.make b/build/platform/java/jstyle_lib/ya.make index fa55e63071..52ac900a81 100644 --- a/build/platform/java/jstyle_lib/ya.make +++ b/build/platform/java/jstyle_lib/ya.make @@ -1,11 +1,11 @@ -RESOURCES_LIBRARY() +RESOURCES_LIBRARY() -OWNER(heretic) +OWNER(heretic) IF (USE_SYSTEM_JSTYLE_LIB) - MESSAGE(WARNING System java codestyle library $USE_SYSTEM_JSTYLE_LIB will be used) -ELSE() - DECLARE_EXTERNAL_RESOURCE(JSTYLE_LIB sbr:2525400095) -ENDIF() + MESSAGE(WARNING System java codestyle library $USE_SYSTEM_JSTYLE_LIB will be used) +ELSE() + DECLARE_EXTERNAL_RESOURCE(JSTYLE_LIB sbr:2525400095) +ENDIF() -END() +END() diff --git a/build/platform/java/kotlin/ya.make b/build/platform/java/kotlin/ya.make index b4c0b0b83a..4b3b794d29 100644 --- a/build/platform/java/kotlin/ya.make +++ b/build/platform/java/kotlin/ya.make @@ -1,12 +1,12 @@ -# how to build: https://a.yandex-team.ru/arc/trunk/arcadia/devtools/kotlin_compiler_uberjar -RESOURCES_LIBRARY() -OWNER(heretic) -IF(USE_SYSTEM_KOTLIN_COMPILER) - MESSAGE(WARNING System kotlin $USE_SYSTEM_KOTLIN_COMPILER will be used) +# how to build: https://a.yandex-team.ru/arc/trunk/arcadia/devtools/kotlin_compiler_uberjar +RESOURCES_LIBRARY() +OWNER(heretic) +IF(USE_SYSTEM_KOTLIN_COMPILER) + MESSAGE(WARNING System kotlin $USE_SYSTEM_KOTLIN_COMPILER will be used) ELSEIF(KOTLIN_VERSION == "1.3.72") - DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:1463870128) + DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:1463870128) ELSEIF(KOTLIN_VERSION == "1.4.0") - DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:1708283452) + DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:1708283452) ELSEIF(KOTLIN_VERSION == "1.4.10") DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:1730522145) ELSEIF(KOTLIN_VERSION == "1.4.20") @@ -14,7 +14,7 @@ ELSEIF(KOTLIN_VERSION == "1.4.20") ELSEIF(KOTLIN_VERSION == "1.4.30") DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:1974389794) ELSEIF(KOTLIN_VERSION == "1.5.10") - DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:2183338194) + DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:2183338194) ELSEIF(KOTLIN_VERSION == "1.5.20") DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:2257446523) ELSEIF(KOTLIN_VERSION == "1.5.21") @@ -24,8 +24,8 @@ ELSEIF(KOTLIN_VERSION == "1.5.30") ELSEIF(KOTLIN_VERSION == "1.5.31") DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:2444978303) ELSEIF(KOTLIN_VERSION == "1.6.10") - DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:2754878302) -ELSE() - MESSAGE(FATAL_ERROR Unexpected KOTLIN_VERSION ${KOTLIN_VERSION}) -ENDIF() -END() + DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:2754878302) +ELSE() + MESSAGE(FATAL_ERROR Unexpected KOTLIN_VERSION ${KOTLIN_VERSION}) +ENDIF() +END() diff --git a/build/platform/java/scriptgen/ya.make b/build/platform/java/scriptgen/ya.make index d296097f52..ebbf19e3b7 100644 --- a/build/platform/java/scriptgen/ya.make +++ b/build/platform/java/scriptgen/ya.make @@ -10,13 +10,13 @@ DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( SCRIPTGEN ${SCRIPTGEN_LINUX} FOR LINUX ${SCRIPTGEN_DARWIN} FOR DARWIN - ${SCRIPTGEN_DARWIN_ARM64} FOR DARWIN-ARM64 + ${SCRIPTGEN_DARWIN_ARM64} FOR DARWIN-ARM64 ${SCRIPTGEN_WIN32} FOR WIN32 ) -IF(OS_DARWIN AND ARCH_ARM64) - DECLARE_EXTERNAL_RESOURCE(WITH_SCRIPTGEN ${SCRIPTGEN_DARWIN_ARM64}) -ELSEIF(OS_DARWIN AND ARCH_X86_64) +IF(OS_DARWIN AND ARCH_ARM64) + DECLARE_EXTERNAL_RESOURCE(WITH_SCRIPTGEN ${SCRIPTGEN_DARWIN_ARM64}) +ELSEIF(OS_DARWIN AND ARCH_X86_64) DECLARE_EXTERNAL_RESOURCE(WITH_SCRIPTGEN ${SCRIPTGEN_DARWIN}) ELSEIF(OS_LINUX) DECLARE_EXTERNAL_RESOURCE(WITH_SCRIPTGEN ${SCRIPTGEN_LINUX}) @@ -24,4 +24,4 @@ ELSEIF(OS_WINDOWS) DECLARE_EXTERNAL_RESOURCE(WITH_SCRIPTGEN ${SCRIPTGEN_WIN32}) ENDIF() -END() +END() diff --git a/build/platform/java/uberjar/uberjar17/ya.make b/build/platform/java/uberjar/uberjar17/ya.make index bc9bf4411b..21aeffce19 100644 --- a/build/platform/java/uberjar/uberjar17/ya.make +++ b/build/platform/java/uberjar/uberjar17/ya.make @@ -1,6 +1,6 @@ -RESOURCES_LIBRARY() -OWNER(heretic) -# same resource as 16 -DECLARE_EXTERNAL_RESOURCE(UBERJAR17 sbr:2199772343) - -END() +RESOURCES_LIBRARY() +OWNER(heretic) +# same resource as 16 +DECLARE_EXTERNAL_RESOURCE(UBERJAR17 sbr:2199772343) + +END() diff --git a/build/platform/java/uberjar/ya.make b/build/platform/java/uberjar/ya.make index 29c934d5b1..f280dd7bcf 100644 --- a/build/platform/java/uberjar/ya.make +++ b/build/platform/java/uberjar/ya.make @@ -1,31 +1,31 @@ -RESOURCES_LIBRARY() -OWNER(heretic) +RESOURCES_LIBRARY() +OWNER(heretic) -IF(USE_SYSTEM_UBERJAR) - MESSAGE(WARNING System uberjar $USE_SYSTEM_UBERJAR will be used) -ELSEIF(JDK_VERSION == "17") - DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:2199772343) -ELSEIF(JDK_VERSION == "16") - DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:2199772343) -ELSEIF(JDK_VERSION == "15") - DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:2074702997) +IF(USE_SYSTEM_UBERJAR) + MESSAGE(WARNING System uberjar $USE_SYSTEM_UBERJAR will be used) +ELSEIF(JDK_VERSION == "17") + DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:2199772343) +ELSEIF(JDK_VERSION == "16") + DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:2199772343) +ELSEIF(JDK_VERSION == "15") + DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:2074702997) ELSEIF(JDK_VERSION == "14") - DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:1407329657) + DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:1407329657) ELSEIF(JDK_VERSION == "13") - DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:1165818979) + DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:1165818979) ELSEIF(JDK_VERSION == "12") - DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:962498940) + DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:962498940) ELSEIF(JDK_VERSION == "11") - DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:962498940) + DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:962498940) ELSEIF(JDK_VERSION == "10" OR JDK10) # !JDK10 flag is deprecated, this check should be removed later - DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:720309903) + DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:720309903) ELSEIF(JDK_VERSION == "8") - DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:962511340) -ELSE() - MESSAGE(FATAL_ERROR Uberjar is not supported for selected JDK version) -ENDIF() + DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:962511340) +ELSE() + MESSAGE(FATAL_ERROR Uberjar is not supported for selected JDK version) +ENDIF() -END() +END() RECURSE( uberjar8 diff --git a/build/platform/java/ya.make b/build/platform/java/ya.make index 7194053b98..b2f1d09237 100644 --- a/build/platform/java/ya.make +++ b/build/platform/java/ya.make @@ -1,10 +1,10 @@ -RECURSE( - jdk - jni - uberjar - error_prone - jacoco-agent - kotlin - jstyle_lib +RECURSE( + jdk + jni + uberjar + error_prone + jacoco-agent + kotlin + jstyle_lib scriptgen -) +) diff --git a/build/platform/linux_sdk/ya.make b/build/platform/linux_sdk/ya.make index add74eee9e..228d5f9e4a 100644 --- a/build/platform/linux_sdk/ya.make +++ b/build/platform/linux_sdk/ya.make @@ -20,7 +20,7 @@ ELSEIF (ARCH_X86_64) ELSEIF (OS_SDK == "ubuntu-18") DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:617908641) ELSEIF (OS_SDK == "ubuntu-20") - DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:2635714620) + DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:2635714620) ELSE() MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for x86-64") ENDIF() diff --git a/build/platform/macos_sdk/ya.make b/build/platform/macos_sdk/ya.make index 6fb8dc54c0..41ca8261ab 100644 --- a/build/platform/macos_sdk/ya.make +++ b/build/platform/macos_sdk/ya.make @@ -2,19 +2,19 @@ RESOURCES_LIBRARY() OWNER(somov) -# macOS 11.1 Big Sur SDK / Xcode 12.4 (12D4e) -DECLARE_EXTERNAL_RESOURCE(MACOS_SDK sbr:2088833948) +# macOS 11.1 Big Sur SDK / Xcode 12.4 (12D4e) +DECLARE_EXTERNAL_RESOURCE(MACOS_SDK sbr:2088833948) -IF (USE_STL_SYSTEM) - SET(__XCODE_RESOURCE_NAME CPP_XCODE_TOOLCHAIN_ROOT) - SET(__XCODE_TOOLCHAIN_VERSION ${CPP_XCODE_TOOLCHAIN_VERSION}) - INCLUDE(${ARCADIA_ROOT}/build/platform/xcode/ya.make.inc) - CFLAGS( +IF (USE_STL_SYSTEM) + SET(__XCODE_RESOURCE_NAME CPP_XCODE_TOOLCHAIN_ROOT) + SET(__XCODE_TOOLCHAIN_VERSION ${CPP_XCODE_TOOLCHAIN_VERSION}) + INCLUDE(${ARCADIA_ROOT}/build/platform/xcode/ya.make.inc) + CFLAGS( GLOBAL -F$MACOS_SDK_RESOURCE_GLOBAL/System/Library/Frameworks - ) + ) LDFLAGS( -F$MACOS_SDK_RESOURCE_GLOBAL/System/Library/Frameworks ) -ENDIF() - +ENDIF() + END() diff --git a/build/platform/macos_system_stl/ya.make b/build/platform/macos_system_stl/ya.make index 4631bbc57a..be97b8f165 100644 --- a/build/platform/macos_system_stl/ya.make +++ b/build/platform/macos_system_stl/ya.make @@ -1,15 +1,15 @@ -RESOURCES_LIBRARY() - -OWNER(g:cpp-contrib) - -# Taken from the default toolchain of the Xcode 12.5.1 -DECLARE_EXTERNAL_RESOURCE(MACOS_SYSTEM_STL sbr:2561940097) - -# xcode toolchain allready contains system headers -IF (USE_STL_SYSTEM AND NOT XCODE) - CFLAGS( - GLOBAL -I${MACOS_SYSTEM_STL_RESOURCE_GLOBAL}/include - ) -ENDIF() - -END() +RESOURCES_LIBRARY() + +OWNER(g:cpp-contrib) + +# Taken from the default toolchain of the Xcode 12.5.1 +DECLARE_EXTERNAL_RESOURCE(MACOS_SYSTEM_STL sbr:2561940097) + +# xcode toolchain allready contains system headers +IF (USE_STL_SYSTEM AND NOT XCODE) + CFLAGS( + GLOBAL -I${MACOS_SYSTEM_STL_RESOURCE_GLOBAL}/include + ) +ENDIF() + +END() diff --git a/build/platform/python/python310/ya.make b/build/platform/python/python310/ya.make index fea3696e6d..1c5fee1308 100644 --- a/build/platform/python/python310/ya.make +++ b/build/platform/python/python310/ya.make @@ -1,12 +1,12 @@ -RESOURCES_LIBRARY() - -OWNER( - g:contrib - g:yatool -) - -INCLUDE(${ARCADIA_ROOT}/build/platform/python/resources.inc) - +RESOURCES_LIBRARY() + +OWNER( + g:contrib + g:yatool +) + +INCLUDE(${ARCADIA_ROOT}/build/platform/python/resources.inc) + DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( PYTHON310 ${PYTHON310_DARWIN} FOR DARWIN @@ -15,16 +15,16 @@ DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( ${PYTHON310_WINDOWS} FOR WIN32 ) -IF (OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON310 ${PYTHON310_LINUX}) -ELSEIF (OS_DARWIN) +IF (OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON310 ${PYTHON310_LINUX}) +ELSEIF (OS_DARWIN) IF (ARCH_ARM64) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON310 ${PYTHON310_DARWIN_ARM64}) ELSEIF(ARCH_X86_64) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON310 ${PYTHON310_DARWIN}) ENDIF() -ELSEIF (OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON310 ${PYTHON310_WINDOWS}) -ENDIF() - -END() +ELSEIF (OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON310 ${PYTHON310_WINDOWS}) +ENDIF() + +END() diff --git a/build/platform/python/resources.inc b/build/platform/python/resources.inc index a730a5039b..35e568ab82 100644 --- a/build/platform/python/resources.inc +++ b/build/platform/python/resources.inc @@ -5,7 +5,7 @@ SET(PYTHON36_LINUX sbr:2569180519) # Different from others(compatible with runn SET(PYTHON37_LINUX sbr:616675620) SET(PYTHON38_LINUX sbr:1211259884) SET(PYTHON39_LINUX sbr:2019057022) -SET(PYTHON310_LINUX sbr:2505611617) +SET(PYTHON310_LINUX sbr:2505611617) SET(PYTHON27_LINUX_ARM64 sbr:2145006545) @@ -16,7 +16,7 @@ SET(PYTHON36_DARWIN sbr:426412777) SET(PYTHON37_DARWIN sbr:616740054) SET(PYTHON38_DARWIN sbr:1211286783) SET(PYTHON39_DARWIN sbr:2046345566) -SET(PYTHON310_DARWIN sbr:2505677448) +SET(PYTHON310_DARWIN sbr:2505677448) SET(PYTHON38_DARWIN_ARM64 sbr:2577173323) SET(PYTHON39_DARWIN_ARM64 sbr:2533263197) @@ -29,4 +29,4 @@ SET(PYTHON36_WINDOWS sbr:410161131) SET(PYTHON37_WINDOWS sbr:629042628) SET(PYTHON38_WINDOWS sbr:1211466284) SET(PYTHON39_WINDOWS sbr:2018972280) -SET(PYTHON310_WINDOWS sbr:2506068927) +SET(PYTHON310_WINDOWS sbr:2506068927) diff --git a/build/platform/python/tests/ya.make b/build/platform/python/tests/ya.make index 0d8965240e..8fd335ebd1 100644 --- a/build/platform/python/tests/ya.make +++ b/build/platform/python/tests/ya.make @@ -30,7 +30,7 @@ PEERDIR( build/platform/python/python37 build/platform/python/python38 build/platform/python/python39 - build/platform/python/python310 + build/platform/python/python310 ) END() diff --git a/build/platform/python/ya.make b/build/platform/python/ya.make index 247e65f4c9..f5954e343a 100644 --- a/build/platform/python/ya.make +++ b/build/platform/python/ya.make @@ -30,8 +30,8 @@ IF (USE_SYSTEM_PYTHON) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON38_LINUX}) ELSEIF (_SYSTEM_PYTHON39) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON39_LINUX}) - ELSEIF (_SYSTEM_PYTHON310) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON310_LINUX}) + ELSEIF (_SYSTEM_PYTHON310) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON310_LINUX}) ELSE() ENABLE(PYTHON_NOT_FOUND) ENDIF() @@ -71,8 +71,8 @@ IF (USE_SYSTEM_PYTHON) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON38_DARWIN}) ELSEIF (_SYSTEM_PYTHON39) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON39_DARWIN}) - ELSEIF (_SYSTEM_PYTHON310) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON310_DARWIN}) + ELSEIF (_SYSTEM_PYTHON310) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON310_DARWIN}) ELSE() ENABLE(PYTHON_NOT_FOUND) ENDIF() @@ -107,8 +107,8 @@ IF (USE_SYSTEM_PYTHON) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON38_WINDOWS}) ELSEIF (_SYSTEM_PYTHON39) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON39_WINDOWS}) - ELSEIF (_SYSTEM_PYTHON310) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON310_WINDOWS}) + ELSEIF (_SYSTEM_PYTHON310) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON310_WINDOWS}) ELSE() ENABLE(PYTHON_NOT_FOUND) ENDIF() diff --git a/build/platform/qt/ya.make b/build/platform/qt/ya.make index 750e319b84..0110995dba 100644 --- a/build/platform/qt/ya.make +++ b/build/platform/qt/ya.make @@ -1,22 +1,22 @@ -RESOURCES_LIBRARY() - -OWNER(g:contrib heretic) - -IF (NOT QT_REQUIRED) - MESSAGE(FATAL_ERROR "No QT Toolkit for your build") -ELSE() - IF (OS_LINUX) +RESOURCES_LIBRARY() + +OWNER(g:contrib heretic) + +IF (NOT QT_REQUIRED) + MESSAGE(FATAL_ERROR "No QT Toolkit for your build") +ELSE() + IF (OS_LINUX) # Qt version 5.15.2 for linux DECLARE_EXTERNAL_RESOURCE(QT sbr:2773138831) - ELSEIF (OS_DARWIN) + ELSEIF (OS_DARWIN) CFLAGS(GLOBAL "-F$QT_RESOURCE_GLOBAL/lib") LDFLAGS("-F$QT_RESOURCE_GLOBAL/lib") # Qt version 5.15.2 for darwin DECLARE_EXTERNAL_RESOURCE(QT sbr:2773128565) - ELSE() - ENABLE(QT_NOT_FOUND) - ENDIF() - + ELSE() + ENABLE(QT_NOT_FOUND) + ENDIF() + IF (HOST_OS_LINUX) DECLARE_EXTERNAL_RESOURCE(HOST_QT sbr:2773138831) ELSEIF (HOST_OS_DARWIN) @@ -25,12 +25,12 @@ ELSE() ENABLE(QT_NOT_FOUND) ENDIF() - IF (QT_NOT_FOUND) - MESSAGE(FATAL_ERROR "No QT Toolkit for the selected platform") - ELSE() + IF (QT_NOT_FOUND) + MESSAGE(FATAL_ERROR "No QT Toolkit for the selected platform") + ELSE() CFLAGS(GLOBAL "-isystem$QT_RESOURCE_GLOBAL/include") - LDFLAGS("-L$QT_RESOURCE_GLOBAL/lib") - ENDIF() -ENDIF() - -END() + LDFLAGS("-L$QT_RESOURCE_GLOBAL/lib") + ENDIF() +ENDIF() + +END() diff --git a/build/platform/test_tool/host.ya.make.inc b/build/platform/test_tool/host.ya.make.inc index c25f2b1326..de1e63ba4f 100644 --- a/build/platform/test_tool/host.ya.make.inc +++ b/build/platform/test_tool/host.ya.make.inc @@ -13,4 +13,4 @@ ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64) ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64) DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2764984404) DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2764989842) -ENDIF() +ENDIF() diff --git a/build/platform/test_tool/ya.make b/build/platform/test_tool/ya.make index fd97d51ed8..c678eb83d8 100644 --- a/build/platform/test_tool/ya.make +++ b/build/platform/test_tool/ya.make @@ -1,20 +1,20 @@ -RESOURCES_LIBRARY() +RESOURCES_LIBRARY() OWNER( g:yatest heretic ) - -IF (TEST_TOOL_HOST_LOCAL) - MESSAGE(WARNING Host test tool $TEST_TOOL_HOST_LOCAL will be used) -ENDIF() -INCLUDE(host.ya.make.inc) -IF (TEST_TOOL_TARGET_LOCAL) - MESSAGE(WARNING Target test tool $TEST_TOOL_TARGET_LOCAL will be used) -ENDIF() -IF (OS_IOS AND NOT BUILD_IOS_APP) - DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_TARGET sbr:707351393) - INCLUDE(${ARCADIA_ROOT}/build/platform/xcode/tools/ya.make.inc) -ENDIF() - -END() - + +IF (TEST_TOOL_HOST_LOCAL) + MESSAGE(WARNING Host test tool $TEST_TOOL_HOST_LOCAL will be used) +ENDIF() +INCLUDE(host.ya.make.inc) +IF (TEST_TOOL_TARGET_LOCAL) + MESSAGE(WARNING Target test tool $TEST_TOOL_TARGET_LOCAL will be used) +ENDIF() +IF (OS_IOS AND NOT BUILD_IOS_APP) + DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_TARGET sbr:707351393) + INCLUDE(${ARCADIA_ROOT}/build/platform/xcode/tools/ya.make.inc) +ENDIF() + +END() + diff --git a/build/platform/wine/ya.make b/build/platform/wine/ya.make index 7d74cb279b..226fd6c358 100644 --- a/build/platform/wine/ya.make +++ b/build/platform/wine/ya.make @@ -2,9 +2,9 @@ RESOURCES_LIBRARY() OWNER(neksard) -# do not forget to update resources in ya.conf.json +# do not forget to update resources in ya.conf.json DECLARE_EXTERNAL_RESOURCE(WINE_TOOL sbr:1093314933) -DECLARE_EXTERNAL_RESOURCE(WINE32_TOOL sbr:2264052281) +DECLARE_EXTERNAL_RESOURCE(WINE32_TOOL sbr:2264052281) SET(NEED_PLATFORM_PEERDIRS no) END() diff --git a/build/platform/xcode/swift/ya.make b/build/platform/xcode/swift/ya.make index 3d50525acb..5222da3d9e 100644 --- a/build/platform/xcode/swift/ya.make +++ b/build/platform/xcode/swift/ya.make @@ -1,12 +1,12 @@ -RESOURCES_LIBRARY() -OWNER(heretic) - -IF (HOST_OS_DARWIN) - SET(__XCODE_RESOURCE_NAME SWIFT_XCODE_TOOLCHAIN_ROOT) - SET(__XCODE_TOOLCHAIN_VERSION ${SWIFT_XCODE_TOOLCHAIN_VERSION}) - INCLUDE(${ARCADIA_ROOT}/build/platform/xcode/ya.make.inc) -ELSE() - MESSAGE(FATAL_ERROR Unsupported host platform for swift compiler) -ENDIF() - -END() +RESOURCES_LIBRARY() +OWNER(heretic) + +IF (HOST_OS_DARWIN) + SET(__XCODE_RESOURCE_NAME SWIFT_XCODE_TOOLCHAIN_ROOT) + SET(__XCODE_TOOLCHAIN_VERSION ${SWIFT_XCODE_TOOLCHAIN_VERSION}) + INCLUDE(${ARCADIA_ROOT}/build/platform/xcode/ya.make.inc) +ELSE() + MESSAGE(FATAL_ERROR Unsupported host platform for swift compiler) +ENDIF() + +END() diff --git a/build/platform/xcode/tools/ya.make b/build/platform/xcode/tools/ya.make index 4c4e135179..699fc4f123 100644 --- a/build/platform/xcode/tools/ya.make +++ b/build/platform/xcode/tools/ya.make @@ -1,4 +1,4 @@ -RESOURCES_LIBRARY() -OWNER(heretic) -INCLUDE(ya.make.inc) -END() +RESOURCES_LIBRARY() +OWNER(heretic) +INCLUDE(ya.make.inc) +END() diff --git a/build/platform/xcode/tools/ya.make.inc b/build/platform/xcode/tools/ya.make.inc index a154917e33..d8fa3a9c92 100644 --- a/build/platform/xcode/tools/ya.make.inc +++ b/build/platform/xcode/tools/ya.make.inc @@ -1,9 +1,9 @@ -IF (NOT HOST_OS_DARWIN) - MESSAGE(FATAL_ERROR Unsupported host platform for Xcode tools) -ENDIF() +IF (NOT HOST_OS_DARWIN) + MESSAGE(FATAL_ERROR Unsupported host platform for Xcode tools) +ENDIF() IF (LOCAL_XCODE_TOOLS) # Local XCode installation is used instead. ELSEIF (XCODE_TOOLS_VERSION == "10.1") - DECLARE_EXTERNAL_RESOURCE(XCODE_TOOLS_ROOT sbr:799017771) -ELSE() - MESSAGE(FATAL_ERROR Unsupported Xcode tools version: $XCODE_TOOLS_VERSION) -ENDIF() + DECLARE_EXTERNAL_RESOURCE(XCODE_TOOLS_ROOT sbr:799017771) +ELSE() + MESSAGE(FATAL_ERROR Unsupported Xcode tools version: $XCODE_TOOLS_VERSION) +ENDIF() diff --git a/build/platform/xcode/ya.make.inc b/build/platform/xcode/ya.make.inc index 3b24e18448..3387a3cc70 100644 --- a/build/platform/xcode/ya.make.inc +++ b/build/platform/xcode/ya.make.inc @@ -1,16 +1,16 @@ -IF (NOT __XCODE_RESOURCE_NAME) - MESSAGE(FATAL_ERROR "Unspecified __XCODE_RESOURCE_NAME variable") -ENDIF() -IF (NOT __XCODE_TOOLCHAIN_VERSION) - MESSAGE(FATAL_ERROR "Unspecified Xcode toolchain version for" $XCODE_RESOURCE_NAME) +IF (NOT __XCODE_RESOURCE_NAME) + MESSAGE(FATAL_ERROR "Unspecified __XCODE_RESOURCE_NAME variable") +ENDIF() +IF (NOT __XCODE_TOOLCHAIN_VERSION) + MESSAGE(FATAL_ERROR "Unspecified Xcode toolchain version for" $XCODE_RESOURCE_NAME) ELSEIF (__XCODE_TOOLCHAIN_VERSION == "10.2.1") - DECLARE_EXTERNAL_RESOURCE(${__XCODE_RESOURCE_NAME} sbr:971159365) + DECLARE_EXTERNAL_RESOURCE(${__XCODE_RESOURCE_NAME} sbr:971159365) ELSEIF (__XCODE_TOOLCHAIN_VERSION == "9.2") - DECLARE_EXTERNAL_RESOURCE(${__XCODE_RESOURCE_NAME} sbr:498971125) + DECLARE_EXTERNAL_RESOURCE(${__XCODE_RESOURCE_NAME} sbr:498971125) ELSEIF (__XCODE_TOOLCHAIN_VERSION == "8.3.3") - DECLARE_EXTERNAL_RESOURCE(${__XCODE_RESOURCE_NAME} sbr:701155000) + DECLARE_EXTERNAL_RESOURCE(${__XCODE_RESOURCE_NAME} sbr:701155000) ELSEIF (__XCODE_TOOLCHAIN_VERSION == "8.2.1") - DECLARE_EXTERNAL_RESOURCE(${__XCODE_RESOURCE_NAME} sbr:500014407) -ELSE() - MESSAGE(FATAL_ERROR "Unsupported Xcode toolchain version" $__XCODE_TOOLCHAIN_VERSION "for" $XCODE_RESOURCE_NAME) -ENDIF() + DECLARE_EXTERNAL_RESOURCE(${__XCODE_RESOURCE_NAME} sbr:500014407) +ELSE() + MESSAGE(FATAL_ERROR "Unsupported Xcode toolchain version" $__XCODE_TOOLCHAIN_VERSION "for" $XCODE_RESOURCE_NAME) +ENDIF() |