diff options
| author | thegeorg <thegeorg@yandex-team.ru> | 2022-02-10 16:45:12 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:45:12 +0300 |
| commit | 49116032d905455a7b1c994e4a696afc885c1e71 (patch) | |
| tree | be835aa92c6248212e705f25388ebafcf84bc7a1 /build | |
| parent | 4e839db24a3bbc9f1c610c43d6faaaa99824dcca (diff) | |
| download | ydb-49116032d905455a7b1c994e4a696afc885c1e71.tar.gz | |
Restoring authorship annotation for <thegeorg@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'build')
65 files changed, 738 insertions, 738 deletions
diff --git a/build/conf/license.conf b/build/conf/license.conf index fb7b597d36..f2fb576b0d 100644 --- a/build/conf/license.conf +++ b/build/conf/license.conf @@ -19,9 +19,9 @@ EXPLICIT_LICENSE_PREFIXES= # one of them. Putting some license into this list is equivalent to putting it into both # LICENSES_<PROP_NAME>_STATIC and LICENSES_<PROP_NAME>_DYNAMIC lists. LICENSE_PROPERTIES= \ - FORBIDDEN NDA REQUIRE_DISCLOSURE PERMISSIVE REQUIRE_CITATION SERVICE + FORBIDDEN NDA REQUIRE_DISCLOSURE PERMISSIVE REQUIRE_CITATION SERVICE -LICENSES_UNATTRIBUTED= \ +LICENSES_UNATTRIBUTED= \ AFL-2.0 \ AML \ APSL-1.0 \ @@ -105,7 +105,7 @@ LICENSES_UNATTRIBUTED= \ JAMon-BSD-3-Clause \ LGPL-3.0-or-later WITH ZeroMQ-Exception \ LPL-1.02 \ - LicenseRef-scancode-bsd-new-nomod \ + LicenseRef-scancode-bsd-new-nomod \ LicenseRef-scancode-cc-by-2.0-uk \ LicenseRef-scancode-cc-devnations-2.0 \ LicenseRef-scancode-cc-sampling-1.0 \ @@ -152,13 +152,13 @@ LICENSES_UNATTRIBUTED= \ LICENSES_PATCHES_FORBIDDEN= \ Unicode -LICENSES_FORBIDDEN= \ - AGPL-3.0-only \ - AGPL-3.0-or-later \ +LICENSES_FORBIDDEN= \ + AGPL-3.0-only \ + AGPL-3.0-or-later \ Artistic-1.0 \ Musl-Exception \ - ${LICENSES_UNATTRIBUTED} - + ${LICENSES_UNATTRIBUTED} + # Group for proprietary code licenses LICENSES_NDA= \ Intel-NDA \ @@ -237,7 +237,7 @@ LICENSES_PERMISSIVE= \ Cmu-Computing-Services \ CUP-Parser \ curl \ - Custom-Punycode \ + Custom-Punycode \ Facebook-SDK \ FDK \ FSFAP \ @@ -245,7 +245,7 @@ LICENSES_PERMISSIVE= \ H2 \ IBM-pibs \ ICU \ - Ietf \ + Ietf \ IJG \ Intel-Simplified \ ISC \ @@ -260,10 +260,10 @@ LICENSES_PERMISSIVE= \ libtiff \ Martin-Birgmeier \ MIT \ - MIT-0 \ + MIT-0 \ MIT-CMU \ MIT-Modern-Variant \ - MIT-Nagy \ + MIT-Nagy \ MIT-open-group \ Mit-Old-Style \ Mit-Veillard-Variant \ @@ -283,7 +283,7 @@ LICENSES_PERMISSIVE= \ PCRE \ PD \ Public-Domain \ - Public-Domain-US-Govt \ + Public-Domain-US-Govt \ PHP-3.01 \ PIL \ Plexus \ @@ -338,18 +338,18 @@ CUSTOM_LICENSE_LIBSSH2_AGENT_WIN=Libssh2-Agent-Win CUSTOM_LICENSE_MUSL_EXCEPTION=Musl-Exception-in-Musllib # TODO: this list is almost empty. needed for DEVRULES-151 -LICENSES_REQUIRE_CITATION= \ +LICENSES_REQUIRE_CITATION= \ Apache-2.0 \ Cmu-Computing-Services \ OpenSSL \ Spencer-94 \ ${CUSTOM_LICENSE_LIBSSH2_AGENT_WIN} -LICENSES_SERVICE= \ - Service-Dll-Harness \ - Service-Prebuilt-Tool \ - Service-Py23-Proxy - +LICENSES_SERVICE= \ + Service-Dll-Harness \ + Service-Prebuilt-Tool \ + Service-Py23-Proxy + macro _REQUIRE_EXPLICIT_LICENSE(Prefix...) { SET(EXPLICIT_LICENSE_PREFIXES ${Prefix}) } diff --git a/build/conf_fatal_error/ya.make b/build/conf_fatal_error/ya.make index d31c53e7f8..40c85f1079 100644 --- a/build/conf_fatal_error/ya.make +++ b/build/conf_fatal_error/ya.make @@ -1,7 +1,7 @@ OWNER(g:ymake kikht) RESOURCES_LIBRARY() SET(FATAL_ERROR_MODULE yes) -IF (FATAL_ERROR_MESSAGE != "") +IF (FATAL_ERROR_MESSAGE != "") MESSAGE(FATAL_ERROR $FATAL_ERROR_MESSAGE) ENDIF() END() diff --git a/build/config/tests/clang_tidy/config.yaml b/build/config/tests/clang_tidy/config.yaml index 2f0b298d77..d55707592c 100644 --- a/build/config/tests/clang_tidy/config.yaml +++ b/build/config/tests/clang_tidy/config.yaml @@ -6,16 +6,16 @@ Checks: > CheckOptions: - key: readability-identifier-naming.ClassCase value: CamelCase - - key: readability-identifier-naming.PublicMemberCase - value: CamelCase - - key: readability-identifier-naming.ProtectedMemberCase - value: CamelCase - - key: readability-identifier-naming.ProtectedMemberSuffix - value: _ + - key: readability-identifier-naming.PublicMemberCase + value: CamelCase + - key: readability-identifier-naming.ProtectedMemberCase + value: CamelCase + - key: readability-identifier-naming.ProtectedMemberSuffix + value: _ - key: readability-identifier-naming.PrivateMemberCase value: CamelCase - - key: readability-identifier-naming.PrivateMemberSuffix - value: _ + - key: readability-identifier-naming.PrivateMemberSuffix + value: _ - key: readability-identifier-naming.FunctionCase value: CamelCase # do not tide public begin / end methods to workaround clang-tidy bug in range-based for loops diff --git a/build/external_resources/antlr4/ya.make b/build/external_resources/antlr4/ya.make index 7e3bca6c7c..222d799d9c 100644 --- a/build/external_resources/antlr4/ya.make +++ b/build/external_resources/antlr4/ya.make @@ -2,6 +2,6 @@ RESOURCES_LIBRARY() OWNER(g:yatool) -DECLARE_EXTERNAL_RESOURCE(ANTLR4 sbr:1861632725) +DECLARE_EXTERNAL_RESOURCE(ANTLR4 sbr:1861632725) END() diff --git a/build/platform/cuda/ya.make b/build/platform/cuda/ya.make index f477a03a3b..3615f682cd 100644 --- a/build/platform/cuda/ya.make +++ b/build/platform/cuda/ya.make @@ -19,7 +19,7 @@ IF (USE_ARCADIA_CUDA) DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2073566375) # CUDA Toolkit 11.2.2 for Linux x86-64 ELSEIF (CUDA_VERSION == "11.1") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:1882836946) # CUDA Toolkit 11.1.1 for Linux x86-64 - ELSEIF (CUDA_VERSION == "11.0") + ELSEIF (CUDA_VERSION == "11.0") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:1647896014) # CUDA Toolkit 11.0.2 for Linux x86-64 ELSEIF (CUDA_VERSION == "10.1") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2077988857) # CUDA Toolkit 10.1.168 for Linux x86-64 @@ -152,15 +152,15 @@ IF (CUDA_HOST_COMPILER_NOT_FOUND) MESSAGE(FATAL_ERROR "No CUDA host compiler for the selected platform and CUDA Toolkit version ${CUDA_VERSION}") ENDIF() -# Use thrust and cub from Arcadia, not from HPC SDK -# NB: -# it would be better to use PEERDIR instead, -# but ymake does not allow PEERDIRs from RESOURCES_LIBRARY. -ADDINCL( - GLOBAL contrib/libs/nvidia/thrust - GLOBAL contrib/libs/nvidia/cub -) - +# Use thrust and cub from Arcadia, not from HPC SDK +# NB: +# it would be better to use PEERDIR instead, +# but ymake does not allow PEERDIRs from RESOURCES_LIBRARY. +ADDINCL( + GLOBAL contrib/libs/nvidia/thrust + GLOBAL contrib/libs/nvidia/cub +) + IF (HOST_OS_WINDOWS) SET_APPEND_WITH_GLOBAL(USER_CFLAGS GLOBAL "\"-I${CUDA_ROOT}/include\"") ELSE() diff --git a/build/platform/java/error_prone/ya.make b/build/platform/java/error_prone/ya.make index 1643c2e44f..ee2eceafc0 100644 --- a/build/platform/java/error_prone/ya.make +++ b/build/platform/java/error_prone/ya.make @@ -2,16 +2,16 @@ 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") +ELSEIF(ERROR_PRONE_VERSION == "2.3.1") DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE sbr:616853779) -ELSEIF(ERROR_PRONE_VERSION == "2.3.2") +ELSEIF(ERROR_PRONE_VERSION == "2.3.2") DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE sbr:760800655) -ELSEIF(ERROR_PRONE_VERSION == "2.3.3") +ELSEIF(ERROR_PRONE_VERSION == "2.3.3") DECLARE_EXTERNAL_RESOURCE(ERROR_PRONE sbr:919320393) -ELSEIF(ERROR_PRONE_VERSION == "2.4.0") +ELSEIF(ERROR_PRONE_VERSION == "2.4.0") 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.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") diff --git a/build/platform/java/groovy/ya.make b/build/platform/java/groovy/ya.make index 32f87c0625..01058729b2 100644 --- a/build/platform/java/groovy/ya.make +++ b/build/platform/java/groovy/ya.make @@ -2,7 +2,7 @@ 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") +ELSEIF(GROOVY_VERSION == "3.0.5") DECLARE_EXTERNAL_RESOURCE(GROOVY_COMPILER sbr:1710622475) ELSE() MESSAGE(FATAL_ERROR Unexpected groovy version ${GROOVY_VERSION}) diff --git a/build/platform/java/jdk/ya.make b/build/platform/java/jdk/ya.make index 51c4ea6e4e..909ae36e18 100644 --- a/build/platform/java/jdk/ya.make +++ b/build/platform/java/jdk/ya.make @@ -143,7 +143,7 @@ ELSEIF(JDK_VERSION == "16") ELSEIF(OS_WINDOWS) DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK16_WINDOWS}) ENDIF() -ELSEIF(JDK_VERSION == "15") +ELSEIF(JDK_VERSION == "15") DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( JDK ${JDK15_DARWIN} FOR DARWIN @@ -164,7 +164,7 @@ ELSEIF(JDK_VERSION == "15") ELSEIF(OS_WINDOWS) DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK15_WINDOWS}) ENDIF() -ELSEIF(JDK_VERSION == "14") +ELSEIF(JDK_VERSION == "14") DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( JDK ${JDK14_DARWIN} FOR DARWIN @@ -182,7 +182,7 @@ ELSEIF(JDK_VERSION == "14") ELSEIF(OS_WINDOWS) DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK14_WINDOWS}) ENDIF() -ELSEIF(JDK_VERSION == "13") +ELSEIF(JDK_VERSION == "13") DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( JDK ${JDK13_DARWIN} FOR DARWIN @@ -192,7 +192,7 @@ ELSEIF(JDK_VERSION == "13") 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(SANITIZER_TYPE == "address") IF(HOST_OS_LINUX) DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS ${JDK13_LINUX_ASAN}) ELSE() @@ -207,7 +207,7 @@ ELSEIF(JDK_VERSION == "13") ELSEIF(OS_WINDOWS) DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK13_WINDOWS}) ENDIF() -ELSEIF(JDK_VERSION == "12") +ELSEIF(JDK_VERSION == "12") DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( JDK ${JDK12_DARWIN} FOR DARWIN @@ -225,7 +225,7 @@ ELSEIF(JDK_VERSION == "12") ELSEIF(OS_WINDOWS) DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK12_WINDOWS}) ENDIF() -ELSEIF(JDK_VERSION == "11") +ELSEIF(JDK_VERSION == "11") DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( JDK ${JDK11_DARWIN} FOR DARWIN @@ -236,7 +236,7 @@ ELSEIF(JDK_VERSION == "11") 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(SANITIZER_TYPE == "address") IF(HOST_OS_LINUX) DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS ${JDK11_LINUX_ASAN}) ELSE() @@ -253,7 +253,7 @@ ELSEIF(JDK_VERSION == "11") ELSEIF(OS_WINDOWS) DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK11_WINDOWS}) ENDIF() -ELSEIF(JDK_VERSION == "10") +ELSEIF(JDK_VERSION == "10") DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( JDK ${JDK10_DARWIN} FOR DARWIN @@ -271,7 +271,7 @@ ELSEIF(JDK_VERSION == "10") ELSEIF(OS_WINDOWS) DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK10_WINDOWS}) ENDIF() -ELSEIF(JDK_VERSION == "8") +ELSEIF(JDK_VERSION == "8") DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( JDK ${JDK8_DARWIN_ARM64} FOR DARWIN-ARM64 diff --git a/build/platform/java/kotlin/ya.make b/build/platform/java/kotlin/ya.make index 641365fbeb..b4c0b0b83a 100644 --- a/build/platform/java/kotlin/ya.make +++ b/build/platform/java/kotlin/ya.make @@ -3,13 +3,13 @@ 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") +ELSEIF(KOTLIN_VERSION == "1.3.72") DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:1463870128) -ELSEIF(KOTLIN_VERSION == "1.4.0") +ELSEIF(KOTLIN_VERSION == "1.4.0") DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:1708283452) -ELSEIF(KOTLIN_VERSION == "1.4.10") +ELSEIF(KOTLIN_VERSION == "1.4.10") DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:1730522145) -ELSEIF(KOTLIN_VERSION == "1.4.20") +ELSEIF(KOTLIN_VERSION == "1.4.20") DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:1869719387) ELSEIF(KOTLIN_VERSION == "1.4.30") DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:1974389794) diff --git a/build/platform/java/uberjar/ya.make b/build/platform/java/uberjar/ya.make index a81c4860c8..29c934d5b1 100644 --- a/build/platform/java/uberjar/ya.make +++ b/build/platform/java/uberjar/ya.make @@ -9,17 +9,17 @@ ELSEIF(JDK_VERSION == "16") DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:2199772343) ELSEIF(JDK_VERSION == "15") DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:2074702997) -ELSEIF(JDK_VERSION == "14") +ELSEIF(JDK_VERSION == "14") DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:1407329657) -ELSEIF(JDK_VERSION == "13") +ELSEIF(JDK_VERSION == "13") DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:1165818979) -ELSEIF(JDK_VERSION == "12") +ELSEIF(JDK_VERSION == "12") DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:962498940) -ELSEIF(JDK_VERSION == "11") +ELSEIF(JDK_VERSION == "11") DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:962498940) -ELSEIF(JDK_VERSION == "10" OR JDK10) # !JDK10 flag is deprecated, this check should be removed later +ELSEIF(JDK_VERSION == "10" OR JDK10) # !JDK10 flag is deprecated, this check should be removed later DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:720309903) -ELSEIF(JDK_VERSION == "8") +ELSEIF(JDK_VERSION == "8") DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:962511340) ELSE() MESSAGE(FATAL_ERROR Uberjar is not supported for selected JDK version) diff --git a/build/platform/linux_sdk/ya.make b/build/platform/linux_sdk/ya.make index ef6ac45389..add74eee9e 100644 --- a/build/platform/linux_sdk/ya.make +++ b/build/platform/linux_sdk/ya.make @@ -6,32 +6,32 @@ NO_PLATFORM_RESOURCES() SET(NEED_PLATFORM_PEERDIRS no) -IF (OS_SDK == "local") +IF (OS_SDK == "local") # Implementation is in $S/build/ymake.core.conf ELSEIF (ARCH_X86_64) - IF (OS_SDK == "ubuntu-10") + IF (OS_SDK == "ubuntu-10") DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:244388930) - ELSEIF (OS_SDK == "ubuntu-12") + ELSEIF (OS_SDK == "ubuntu-12") DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:244387436) - ELSEIF (OS_SDK == "ubuntu-14") + ELSEIF (OS_SDK == "ubuntu-14") DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:1966560555) - ELSEIF (OS_SDK == "ubuntu-16") + ELSEIF (OS_SDK == "ubuntu-16") DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:243881345) - ELSEIF (OS_SDK == "ubuntu-18") + ELSEIF (OS_SDK == "ubuntu-18") DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:617908641) - ELSEIF (OS_SDK == "ubuntu-20") + ELSEIF (OS_SDK == "ubuntu-20") DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:2635714620) ELSE() MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for x86-64") ENDIF() ELSEIF (ARCH_AARCH64) - IF (OS_SDK == "ubuntu-16") + IF (OS_SDK == "ubuntu-16") DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:309054781) ELSE() MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for AArch64/ARMv8 64 bit") ENDIF() ELSEIF (ARCH_PPC64LE) - IF (OS_SDK == "ubuntu-14") + IF (OS_SDK == "ubuntu-14") IF (HOST_ARCH_PPC64LE) DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:1570528338) ELSE() diff --git a/build/platform/lld/ya.make b/build/platform/lld/ya.make index edb4a78a66..c046e89098 100644 --- a/build/platform/lld/ya.make +++ b/build/platform/lld/ya.make @@ -1,7 +1,7 @@ RESOURCES_LIBRARY() -LICENSE(Service-Prebuilt-Tool) - +LICENSE(Service-Prebuilt-Tool) + OWNER(somov) IF (USE_LTO OR USE_THINLTO) diff --git a/build/platform/msvc/ya.make b/build/platform/msvc/ya.make index bf041f8183..ccb602c280 100644 --- a/build/platform/msvc/ya.make +++ b/build/platform/msvc/ya.make @@ -2,9 +2,9 @@ RESOURCES_LIBRARY() OWNER(somov) -IF (WINDOWS_KITS_VERSION == "10.0.10586.0") +IF (WINDOWS_KITS_VERSION == "10.0.10586.0") DECLARE_EXTERNAL_RESOURCE(WINDOWS_KITS sbr:544779014) -ELSEIF (WINDOWS_KITS_VERSION == "10.0.16299.0") +ELSEIF (WINDOWS_KITS_VERSION == "10.0.16299.0") DECLARE_EXTERNAL_RESOURCE(WINDOWS_KITS sbr:1379398385) ELSEIF (WINDOWS_KITS_VERSION == "10.0.18362.0") DECLARE_EXTERNAL_RESOURCE(WINDOWS_KITS sbr:1939557911) diff --git a/build/platform/opengl/ya.make b/build/platform/opengl/ya.make index dbf0f45362..94f0431d18 100644 --- a/build/platform/opengl/ya.make +++ b/build/platform/opengl/ya.make @@ -6,7 +6,7 @@ IF (NOT OPENGL_REQUIRED) MESSAGE(FATAL_ERROR "No OpenGL Toolkit for your build") ELSE() IF (OS_LINUX) - IF (OPENGL_VERSION == "18.0.5") + IF (OPENGL_VERSION == "18.0.5") DECLARE_EXTERNAL_RESOURCE(OPENGL sbr:1271121094) SET(OS_SUFFIX "x86_64-linux-gnu") ELSE() diff --git a/build/platform/perl/ya.make b/build/platform/perl/ya.make index 3e45d93f98..cc50c05c26 100644 --- a/build/platform/perl/ya.make +++ b/build/platform/perl/ya.make @@ -15,14 +15,14 @@ IF (USE_PERL_SYSTEM) PEERDIR(build/platform/perl/5.26) ELSEIF (PERL_SDK == "ubuntu-20") PEERDIR(build/platform/perl/5.30) - ELSE() + ELSE() MESSAGE(FATAL_ERROR "Building against system perl is not supported on ${PERL_SDK}") ENDIF() ELSE() - - MESSAGE(FATAL_ERROR "There is no perl ready for static linkage. Try using the system one.") - + + MESSAGE(FATAL_ERROR "There is no perl ready for static linkage. Try using the system one.") + ENDIF() END() diff --git a/build/platform/python/ya.make b/build/platform/python/ya.make index ac5bc7921a..247e65f4c9 100644 --- a/build/platform/python/ya.make +++ b/build/platform/python/ya.make @@ -39,11 +39,11 @@ IF (USE_SYSTEM_PYTHON) ENABLE(PYTHON_NOT_FOUND) ENDIF() CFLAGS( - GLOBAL "-isystem$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/include" - GLOBAL "-isystem$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/include/python${PY_VERSION}" + GLOBAL "-isystem$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/include" + GLOBAL "-isystem$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/include/python${PY_VERSION}" ) ELSEIF (OS_DARWIN) - IF (PYTHON_DISTR == "macos-brew") + IF (PYTHON_DISTR == "macos-brew") IF (ARCH_X86_64) IF (_SYSTEM_PYTHON27) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON sbr:562720527) @@ -90,7 +90,7 @@ IF (USE_SYSTEM_PYTHON) ENABLE(PYTHON_NOT_FOUND) ENDIF() ENDIF() - CFLAGS(GLOBAL "-isystem$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/Python.framework/Versions/${PY_FRAMEWORK_VERSION}/include/python${PY_VERSION}") + CFLAGS(GLOBAL "-isystem$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/Python.framework/Versions/${PY_FRAMEWORK_VERSION}/include/python${PY_VERSION}") ELSEIF (OS_WINDOWS) IF (ARCH_X86_64) IF (_SYSTEM_PYTHON27) diff --git a/build/platform/qt/ya.make b/build/platform/qt/ya.make index 1174082ffa..750e319b84 100644 --- a/build/platform/qt/ya.make +++ b/build/platform/qt/ya.make @@ -28,7 +28,7 @@ ELSE() IF (QT_NOT_FOUND) MESSAGE(FATAL_ERROR "No QT Toolkit for the selected platform") ELSE() - CFLAGS(GLOBAL "-isystem$QT_RESOURCE_GLOBAL/include") + CFLAGS(GLOBAL "-isystem$QT_RESOURCE_GLOBAL/include") LDFLAGS("-L$QT_RESOURCE_GLOBAL/lib") ENDIF() ENDIF() diff --git a/build/platform/xcode/ya.make.inc b/build/platform/xcode/ya.make.inc index a108bd6849..3b24e18448 100644 --- a/build/platform/xcode/ya.make.inc +++ b/build/platform/xcode/ya.make.inc @@ -3,13 +3,13 @@ IF (NOT __XCODE_RESOURCE_NAME) ENDIF() IF (NOT __XCODE_TOOLCHAIN_VERSION) MESSAGE(FATAL_ERROR "Unspecified Xcode toolchain version for" $XCODE_RESOURCE_NAME) -ELSEIF (__XCODE_TOOLCHAIN_VERSION == "10.2.1") +ELSEIF (__XCODE_TOOLCHAIN_VERSION == "10.2.1") DECLARE_EXTERNAL_RESOURCE(${__XCODE_RESOURCE_NAME} sbr:971159365) -ELSEIF (__XCODE_TOOLCHAIN_VERSION == "9.2") +ELSEIF (__XCODE_TOOLCHAIN_VERSION == "9.2") DECLARE_EXTERNAL_RESOURCE(${__XCODE_RESOURCE_NAME} sbr:498971125) -ELSEIF (__XCODE_TOOLCHAIN_VERSION == "8.3.3") +ELSEIF (__XCODE_TOOLCHAIN_VERSION == "8.3.3") DECLARE_EXTERNAL_RESOURCE(${__XCODE_RESOURCE_NAME} sbr:701155000) -ELSEIF (__XCODE_TOOLCHAIN_VERSION == "8.2.1") +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) diff --git a/build/plugins/pybuild.py b/build/plugins/pybuild.py index b2f47fc890..f32a2d39a0 100644 --- a/build/plugins/pybuild.py +++ b/build/plugins/pybuild.py @@ -483,19 +483,19 @@ def onpy_srcs(unit, *args): unit.onresource(res) add_python_lint_checks(unit, 2, [path for path, mod in pys] + unit.get(['_PY_EXTRA_LINT_FILES_VALUE']).split()) - use_vanilla_protoc = unit.get('USE_VANILLA_PROTOC') == 'yes' - if use_vanilla_protoc: - cpp_runtime_path = 'contrib/libs/protobuf_std' - py_runtime_path = 'contrib/python/protobuf_std' - builtin_proto_path = cpp_runtime_path + '/' + BUILTIN_PROTO - else: - cpp_runtime_path = 'contrib/libs/protobuf' - py_runtime_path = 'contrib/python/protobuf' - builtin_proto_path = cpp_runtime_path + '/' + BUILTIN_PROTO + use_vanilla_protoc = unit.get('USE_VANILLA_PROTOC') == 'yes' + if use_vanilla_protoc: + cpp_runtime_path = 'contrib/libs/protobuf_std' + py_runtime_path = 'contrib/python/protobuf_std' + builtin_proto_path = cpp_runtime_path + '/' + BUILTIN_PROTO + else: + cpp_runtime_path = 'contrib/libs/protobuf' + py_runtime_path = 'contrib/python/protobuf' + builtin_proto_path = cpp_runtime_path + '/' + BUILTIN_PROTO if protos: - if not upath.startswith(py_runtime_path) and not upath.startswith(builtin_proto_path): - unit.onpeerdir(py_runtime_path) + if not upath.startswith(py_runtime_path) and not upath.startswith(builtin_proto_path): + unit.onpeerdir(py_runtime_path) unit.onpeerdir(unit.get("PY_PROTO_DEPS").split()) @@ -511,7 +511,7 @@ def onpy_srcs(unit, *args): unit.onpeerdir(['kernel/gazetteer/proto']) if evs: - unit.onpeerdir([cpp_runtime_path]) + unit.onpeerdir([cpp_runtime_path]) unit.on_generate_py_evs_internal([path for path, mod in evs]) unit.onpy_srcs([ev_arg(path, mod, unit) for path, mod in evs]) diff --git a/build/plugins/ytest.py b/build/plugins/ytest.py index f8ba5d834e..8970837f0f 100644 --- a/build/plugins/ytest.py +++ b/build/plugins/ytest.py @@ -136,7 +136,7 @@ def validate_test(unit, kw): elif valid_kw.get('SCRIPT-REL-PATH') == 'gtest': project_path = valid_kw.get('BUILD-FOLDER-PATH', "") if not project_path.startswith(("contrib", "devtools", "mail", "mds", "taxi")): - errors.append("GTEST_UGLY is not allowed here, use GTEST instead") + errors.append("GTEST_UGLY is not allowed here, use GTEST instead") size_timeout = collections.OrderedDict(sorted(consts.TestSize.DefaultTimeouts.items(), key=lambda t: t[1])) diff --git a/build/prebuilt/contrib/libs/libmysql_r/strings/uca9dump/ya.make.prebuilt b/build/prebuilt/contrib/libs/libmysql_r/strings/uca9dump/ya.make.prebuilt index d015db3b37..907121ce31 100644 --- a/build/prebuilt/contrib/libs/libmysql_r/strings/uca9dump/ya.make.prebuilt +++ b/build/prebuilt/contrib/libs/libmysql_r/strings/uca9dump/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM() diff --git a/build/prebuilt/contrib/tools/flatc/ya.make.prebuilt b/build/prebuilt/contrib/tools/flatc/ya.make.prebuilt index 37db32d447..029dbb9a3e 100644 --- a/build/prebuilt/contrib/tools/flatc/ya.make.prebuilt +++ b/build/prebuilt/contrib/tools/flatc/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM() diff --git a/build/prebuilt/contrib/tools/flatc/ya.make.resource b/build/prebuilt/contrib/tools/flatc/ya.make.resource index 60b8f2485c..9be11f95f2 100644 --- a/build/prebuilt/contrib/tools/flatc/ya.make.resource +++ b/build/prebuilt/contrib/tools/flatc/ya.make.resource @@ -1,9 +1,9 @@ IF (OS_DARWIN AND ARCH_X86_64) - SET(SANDBOX_RESOURCE_ID 2266417119) + SET(SANDBOX_RESOURCE_ID 2266417119) ELSEIF (OS_LINUX AND ARCH_X86_64) - SET(SANDBOX_RESOURCE_ID 2266417608) + SET(SANDBOX_RESOURCE_ID 2266417608) ELSEIF (OS_WINDOWS AND ARCH_X86_64) - SET(SANDBOX_RESOURCE_ID 2266416624) + SET(SANDBOX_RESOURCE_ID 2266416624) ELSE() SET(SANDBOX_RESOURCE_ID) ENDIF() diff --git a/build/prebuilt/contrib/tools/flatc64/ya.make.prebuilt b/build/prebuilt/contrib/tools/flatc64/ya.make.prebuilt index 6977830ad6..fbd09edcd1 100644 --- a/build/prebuilt/contrib/tools/flatc64/ya.make.prebuilt +++ b/build/prebuilt/contrib/tools/flatc64/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM() diff --git a/build/prebuilt/contrib/tools/flatc64/ya.make.resource b/build/prebuilt/contrib/tools/flatc64/ya.make.resource index 6aae311bde..49e1fe8cf5 100644 --- a/build/prebuilt/contrib/tools/flatc64/ya.make.resource +++ b/build/prebuilt/contrib/tools/flatc64/ya.make.resource @@ -1,9 +1,9 @@ IF (OS_DARWIN AND ARCH_X86_64) - SET(SANDBOX_RESOURCE_ID 2266401575) + SET(SANDBOX_RESOURCE_ID 2266401575) ELSEIF (OS_LINUX AND ARCH_X86_64) - SET(SANDBOX_RESOURCE_ID 2266402127) + SET(SANDBOX_RESOURCE_ID 2266402127) ELSEIF (OS_WINDOWS AND ARCH_X86_64) - SET(SANDBOX_RESOURCE_ID 2266400964) + SET(SANDBOX_RESOURCE_ID 2266400964) ELSE() SET(SANDBOX_RESOURCE_ID) ENDIF() diff --git a/build/prebuilt/contrib/tools/protoc/plugins/cpp_styleguide/ya.make.prebuilt b/build/prebuilt/contrib/tools/protoc/plugins/cpp_styleguide/ya.make.prebuilt index 8c598fe3b8..e853626aea 100644 --- a/build/prebuilt/contrib/tools/protoc/plugins/cpp_styleguide/ya.make.prebuilt +++ b/build/prebuilt/contrib/tools/protoc/plugins/cpp_styleguide/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM() diff --git a/build/prebuilt/contrib/tools/protoc/plugins/cpp_styleguide/ya.make.resource b/build/prebuilt/contrib/tools/protoc/plugins/cpp_styleguide/ya.make.resource index 805713c8e2..48d9ac46cb 100644 --- a/build/prebuilt/contrib/tools/protoc/plugins/cpp_styleguide/ya.make.resource +++ b/build/prebuilt/contrib/tools/protoc/plugins/cpp_styleguide/ya.make.resource @@ -1,9 +1,9 @@ IF (OS_DARWIN AND ARCH_X86_64) - SET(SANDBOX_RESOURCE_ID 2340617812) + SET(SANDBOX_RESOURCE_ID 2340617812) ELSEIF (OS_LINUX AND ARCH_X86_64) - SET(SANDBOX_RESOURCE_ID 2340619844) + SET(SANDBOX_RESOURCE_ID 2340619844) ELSEIF (OS_WINDOWS AND ARCH_X86_64) - SET(SANDBOX_RESOURCE_ID 2340616765) + SET(SANDBOX_RESOURCE_ID 2340616765) ELSE() SET(SANDBOX_RESOURCE_ID) ENDIF() diff --git a/build/prebuilt/contrib/tools/protoc/plugins/grpc_cpp/ya.make.prebuilt b/build/prebuilt/contrib/tools/protoc/plugins/grpc_cpp/ya.make.prebuilt index 90068db8fb..3b18d1c192 100644 --- a/build/prebuilt/contrib/tools/protoc/plugins/grpc_cpp/ya.make.prebuilt +++ b/build/prebuilt/contrib/tools/protoc/plugins/grpc_cpp/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM() diff --git a/build/prebuilt/contrib/tools/protoc/plugins/grpc_java/ya.make.prebuilt b/build/prebuilt/contrib/tools/protoc/plugins/grpc_java/ya.make.prebuilt index 1b8bc9d077..4636c8594c 100644 --- a/build/prebuilt/contrib/tools/protoc/plugins/grpc_java/ya.make.prebuilt +++ b/build/prebuilt/contrib/tools/protoc/plugins/grpc_java/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM() diff --git a/build/prebuilt/contrib/tools/protoc/plugins/grpc_python/ya.make.prebuilt b/build/prebuilt/contrib/tools/protoc/plugins/grpc_python/ya.make.prebuilt index 4c80ae1791..81fccbc086 100644 --- a/build/prebuilt/contrib/tools/protoc/plugins/grpc_python/ya.make.prebuilt +++ b/build/prebuilt/contrib/tools/protoc/plugins/grpc_python/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM() diff --git a/build/prebuilt/contrib/tools/protoc/ya.make.induced_deps b/build/prebuilt/contrib/tools/protoc/ya.make.induced_deps index eeacef68f5..fe5a21c374 100644 --- a/build/prebuilt/contrib/tools/protoc/ya.make.induced_deps +++ b/build/prebuilt/contrib/tools/protoc/ya.make.induced_deps @@ -1,29 +1,29 @@ INDUCED_DEPS(cpp ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/descriptor.h ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/generated_message_reflection.h - ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/io/coded_stream.h + ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/io/coded_stream.h ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/reflection_ops.h - ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/stubs/common.h - ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/stubs/once.h - ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/stubs/port.h + ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/stubs/common.h + ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/stubs/once.h + ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/stubs/port.h ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/wire_format.h ) INDUCED_DEPS(h+cpp ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/arena.h ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/arenastring.h - ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/extension_set.h - ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/generated_enum_reflection.h + ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/extension_set.h + ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/generated_enum_reflection.h ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/generated_message_table_driven.h ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/generated_message_util.h - ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/io/coded_stream.h + ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/io/coded_stream.h ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/map.h ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/map_entry.h ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/map_field_inl.h - ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/message.h - ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/metadata_lite.h - ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/port_def.inc - ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/port_undef.inc - ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/repeated_field.h - ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/stubs/common.h + ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/message.h + ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/metadata_lite.h + ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/port_def.inc + ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/port_undef.inc + ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/repeated_field.h + ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/stubs/common.h ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/unknown_field_set.h ) diff --git a/build/prebuilt/contrib/tools/protoc/ya.make.prebuilt b/build/prebuilt/contrib/tools/protoc/ya.make.prebuilt index 87f66e1b24..f3500a0e13 100644 --- a/build/prebuilt/contrib/tools/protoc/ya.make.prebuilt +++ b/build/prebuilt/contrib/tools/protoc/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM() diff --git a/build/prebuilt/contrib/tools/protoc/ya.make.resource b/build/prebuilt/contrib/tools/protoc/ya.make.resource index 19cd9feac9..dea93b0d30 100644 --- a/build/prebuilt/contrib/tools/protoc/ya.make.resource +++ b/build/prebuilt/contrib/tools/protoc/ya.make.resource @@ -1,9 +1,9 @@ IF (OS_DARWIN AND ARCH_X86_64) - SET(SANDBOX_RESOURCE_ID 2318808466) + SET(SANDBOX_RESOURCE_ID 2318808466) ELSEIF (OS_LINUX AND ARCH_X86_64) - SET(SANDBOX_RESOURCE_ID 2318809046) + SET(SANDBOX_RESOURCE_ID 2318809046) ELSEIF (OS_WINDOWS AND ARCH_X86_64) - SET(SANDBOX_RESOURCE_ID 2318807898) + SET(SANDBOX_RESOURCE_ID 2318807898) ELSE() SET(SANDBOX_RESOURCE_ID) ENDIF() diff --git a/build/prebuilt/contrib/tools/protoc_std/ya.make.induced_deps b/build/prebuilt/contrib/tools/protoc_std/ya.make.induced_deps index 43278cfeee..6b33b300bb 100644 --- a/build/prebuilt/contrib/tools/protoc_std/ya.make.induced_deps +++ b/build/prebuilt/contrib/tools/protoc_std/ya.make.induced_deps @@ -1,24 +1,24 @@ INDUCED_DEPS(cpp - ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/extension_set.h + ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/extension_set.h ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/io/coded_stream.h ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/io/zero_copy_stream_impl_lite.h ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/port_def.inc ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/port_undef.inc - ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/reflection_ops.h - ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/wire_format.h - ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/wire_format_lite.h + ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/reflection_ops.h + ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/wire_format.h + ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/wire_format_lite.h ) INDUCED_DEPS(h+cpp ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/arena.h ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/arenastring.h - ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/extension_set.h - ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/generated_enum_util.h + ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/extension_set.h + ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/generated_enum_util.h ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/generated_message_table_driven.h ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/generated_message_util.h - ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/io/coded_stream.h - ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/message_lite.h + ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/io/coded_stream.h + ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/message_lite.h ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/metadata_lite.h ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/port_def.inc ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/port_undef.inc - ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/repeated_field.h + ${ARCADIA_ROOT}/contrib/libs/protobuf_std/src/google/protobuf/repeated_field.h ) diff --git a/build/prebuilt/contrib/tools/protoc_std/ya.make.prebuilt b/build/prebuilt/contrib/tools/protoc_std/ya.make.prebuilt index 6838fb5162..b0706a1100 100644 --- a/build/prebuilt/contrib/tools/protoc_std/ya.make.prebuilt +++ b/build/prebuilt/contrib/tools/protoc_std/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM(protoc) diff --git a/build/prebuilt/contrib/tools/python/bootstrap/ya.make.prebuilt b/build/prebuilt/contrib/tools/python/bootstrap/ya.make.prebuilt index 084ec1da59..b913fc767a 100644 --- a/build/prebuilt/contrib/tools/python/bootstrap/ya.make.prebuilt +++ b/build/prebuilt/contrib/tools/python/bootstrap/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM() diff --git a/build/prebuilt/contrib/tools/python3/pycc/ya.make.prebuilt b/build/prebuilt/contrib/tools/python3/pycc/ya.make.prebuilt index 0314f616f3..94be584928 100644 --- a/build/prebuilt/contrib/tools/python3/pycc/ya.make.prebuilt +++ b/build/prebuilt/contrib/tools/python3/pycc/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM() diff --git a/build/prebuilt/contrib/tools/ragel6/ya.make.prebuilt b/build/prebuilt/contrib/tools/ragel6/ya.make.prebuilt index 267f0440b8..51ee82f82e 100644 --- a/build/prebuilt/contrib/tools/ragel6/ya.make.prebuilt +++ b/build/prebuilt/contrib/tools/ragel6/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM() diff --git a/build/prebuilt/contrib/tools/yasm/ya.make.prebuilt b/build/prebuilt/contrib/tools/yasm/ya.make.prebuilt index e88066004c..7bb58bd669 100644 --- a/build/prebuilt/contrib/tools/yasm/ya.make.prebuilt +++ b/build/prebuilt/contrib/tools/yasm/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM() diff --git a/build/prebuilt/tools/enum_parser/enum_parser/ya.make.prebuilt b/build/prebuilt/tools/enum_parser/enum_parser/ya.make.prebuilt index ec7dd154fc..1a027f4421 100644 --- a/build/prebuilt/tools/enum_parser/enum_parser/ya.make.prebuilt +++ b/build/prebuilt/tools/enum_parser/enum_parser/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM() diff --git a/build/prebuilt/tools/event2cpp/ya.make.prebuilt b/build/prebuilt/tools/event2cpp/ya.make.prebuilt index 0c129f0fe0..038cad6f79 100644 --- a/build/prebuilt/tools/event2cpp/ya.make.prebuilt +++ b/build/prebuilt/tools/event2cpp/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM() diff --git a/build/prebuilt/tools/event2cpp/ya.make.resource b/build/prebuilt/tools/event2cpp/ya.make.resource index 45f0482c88..d5fac1e52c 100644 --- a/build/prebuilt/tools/event2cpp/ya.make.resource +++ b/build/prebuilt/tools/event2cpp/ya.make.resource @@ -1,9 +1,9 @@ IF (OS_DARWIN AND ARCH_X86_64) - SET(SANDBOX_RESOURCE_ID 2313657675) + SET(SANDBOX_RESOURCE_ID 2313657675) ELSEIF (OS_LINUX AND ARCH_X86_64) - SET(SANDBOX_RESOURCE_ID 2313658137) + SET(SANDBOX_RESOURCE_ID 2313658137) ELSEIF (OS_WINDOWS AND ARCH_X86_64) - SET(SANDBOX_RESOURCE_ID 2313657255) + SET(SANDBOX_RESOURCE_ID 2313657255) ELSE() SET(SANDBOX_RESOURCE_ID) ENDIF() diff --git a/build/prebuilt/tools/fix_elf/ya.make.prebuilt b/build/prebuilt/tools/fix_elf/ya.make.prebuilt index eb011827c8..c12328f97e 100644 --- a/build/prebuilt/tools/fix_elf/ya.make.prebuilt +++ b/build/prebuilt/tools/fix_elf/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM() diff --git a/build/prebuilt/tools/rescompiler/ya.make.prebuilt b/build/prebuilt/tools/rescompiler/ya.make.prebuilt index 43d214d25a..23fa86ce01 100644 --- a/build/prebuilt/tools/rescompiler/ya.make.prebuilt +++ b/build/prebuilt/tools/rescompiler/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM() diff --git a/build/prebuilt/tools/rescompressor/ya.make.prebuilt b/build/prebuilt/tools/rescompressor/ya.make.prebuilt index 4b7aec736d..0b522fdc0d 100644 --- a/build/prebuilt/tools/rescompressor/ya.make.prebuilt +++ b/build/prebuilt/tools/rescompressor/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM() diff --git a/build/prebuilt/tools/rorescompiler/ya.make.prebuilt b/build/prebuilt/tools/rorescompiler/ya.make.prebuilt index ce559670a9..208d7a0338 100644 --- a/build/prebuilt/tools/rorescompiler/ya.make.prebuilt +++ b/build/prebuilt/tools/rorescompiler/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM() diff --git a/build/prebuilt/vendor/github.com/golang/protobuf/protoc-gen-go/ya.make.prebuilt b/build/prebuilt/vendor/github.com/golang/protobuf/protoc-gen-go/ya.make.prebuilt index 9ea2ad0425..49eea1305e 100644 --- a/build/prebuilt/vendor/github.com/golang/protobuf/protoc-gen-go/ya.make.prebuilt +++ b/build/prebuilt/vendor/github.com/golang/protobuf/protoc-gen-go/ya.make.prebuilt @@ -1,6 +1,6 @@ INCLUDE(ya.make.resource) -IF (SANDBOX_RESOURCE_ID != "") +IF (SANDBOX_RESOURCE_ID != "") ENABLE(PREBUILT) PREBUILT_PROGRAM() diff --git a/build/rules/contrib_deprecated.policy b/build/rules/contrib_deprecated.policy index d3f06e8232..5f6f93ac4f 100644 --- a/build/rules/contrib_deprecated.policy +++ b/build/rules/contrib_deprecated.policy @@ -1,53 +1,53 @@ -# == Rules for contrib/deprecated section == -# -# NOTE: rules should be ordered from specific to generic (first matching rule is used) -# See rule syntax docs: https://wiki.yandex-team.ru/devrules/overall/peerdirprohibition/ - -ALLOW library/cpp/tf/mkldnn -> contrib/deprecated/onednn - -ALLOW mds/libs/blackhole -> contrib/deprecated/libcds -ALLOW mds -> contrib/deprecated/folly -ALLOW mds -> contrib/deprecated/wangle - -# Use newer version from contrib/libs/mongo-cxx-driver instead -ALLOW mds/mastermind/ -> contrib/deprecated/mongo-cxx-driver - -# libpqtypes is not being developed since 2016 and is known to have bugs. -# Consider using libpqxx / maps/libs/sql_chemistry instread. -ALLOW mds/libs/postgres -> contrib/deprecated/libpqtypes -ALLOW mds/libs/s3 -> contrib/deprecated/libpqtypes - -# Use library/cpp/json (a rapidjson proxy) instead -ALLOW alice/cuttlefish/library/client_proto_converter -> contrib/deprecated/jsoncpp -ALLOW mail/ -> contrib/deprecated/jsoncpp -ALLOW quasar/backend/ -> contrib/deprecated/jsoncpp -ALLOW smart_devices/ -> contrib/deprecated/jsoncpp -ALLOW speechkit/ -> contrib/deprecated/jsoncpp -ALLOW yandex_io/ -> contrib/deprecated/jsoncpp - -# mimepp is not being developed since 2012 and requires paid license -ALLOW mail/so/ -> contrib/deprecated/mimepp -ALLOW mail/so/spamstop/ -> contrib/deprecated/udns - -# TODO(thegeorg@): remove this specifying better policies -ALLOW .* -> contrib/deprecated/python - -ALLOW metrika/core/programs/mobile-redirect -> contrib/deprecated/libctpp - -# argon2 is not maintained since 20190702 and can not be build for ARMv8. -# consider using library/cpp/digest/argonish instead -# -# Remove this exception after KIKIMR-13008 -ALLOW kikimr/library/login -> contrib/deprecated/argon2 - -# Though galloc is unmaintained version of tcmalloc, -# it can not be universally replaced with the latter. -ALLOW library/cpp/malloc/galloc -> contrib/deprecated/galloc - -# Default policies: -# -# Do not restrict contrib -# All peerdirs to contrib/deprecated from outside are prohibited -# -ALLOW contrib -> contrib/deprecated -DENY .* -> contrib/deprecated +# == Rules for contrib/deprecated section == +# +# NOTE: rules should be ordered from specific to generic (first matching rule is used) +# See rule syntax docs: https://wiki.yandex-team.ru/devrules/overall/peerdirprohibition/ + +ALLOW library/cpp/tf/mkldnn -> contrib/deprecated/onednn + +ALLOW mds/libs/blackhole -> contrib/deprecated/libcds +ALLOW mds -> contrib/deprecated/folly +ALLOW mds -> contrib/deprecated/wangle + +# Use newer version from contrib/libs/mongo-cxx-driver instead +ALLOW mds/mastermind/ -> contrib/deprecated/mongo-cxx-driver + +# libpqtypes is not being developed since 2016 and is known to have bugs. +# Consider using libpqxx / maps/libs/sql_chemistry instread. +ALLOW mds/libs/postgres -> contrib/deprecated/libpqtypes +ALLOW mds/libs/s3 -> contrib/deprecated/libpqtypes + +# Use library/cpp/json (a rapidjson proxy) instead +ALLOW alice/cuttlefish/library/client_proto_converter -> contrib/deprecated/jsoncpp +ALLOW mail/ -> contrib/deprecated/jsoncpp +ALLOW quasar/backend/ -> contrib/deprecated/jsoncpp +ALLOW smart_devices/ -> contrib/deprecated/jsoncpp +ALLOW speechkit/ -> contrib/deprecated/jsoncpp +ALLOW yandex_io/ -> contrib/deprecated/jsoncpp + +# mimepp is not being developed since 2012 and requires paid license +ALLOW mail/so/ -> contrib/deprecated/mimepp +ALLOW mail/so/spamstop/ -> contrib/deprecated/udns + +# TODO(thegeorg@): remove this specifying better policies +ALLOW .* -> contrib/deprecated/python + +ALLOW metrika/core/programs/mobile-redirect -> contrib/deprecated/libctpp + +# argon2 is not maintained since 20190702 and can not be build for ARMv8. +# consider using library/cpp/digest/argonish instead +# +# Remove this exception after KIKIMR-13008 +ALLOW kikimr/library/login -> contrib/deprecated/argon2 + +# Though galloc is unmaintained version of tcmalloc, +# it can not be universally replaced with the latter. +ALLOW library/cpp/malloc/galloc -> contrib/deprecated/galloc + +# Default policies: +# +# Do not restrict contrib +# All peerdirs to contrib/deprecated from outside are prohibited +# +ALLOW contrib -> contrib/deprecated +DENY .* -> contrib/deprecated diff --git a/build/rules/contrib_deps.policy b/build/rules/contrib_deps.policy index bfb6a03d14..9af4b85cc2 100644 --- a/build/rules/contrib_deps.policy +++ b/build/rules/contrib_deps.policy @@ -1,4 +1,4 @@ -ALLOW contrib/clickhouse -> library/cpp/consistent_hashing +ALLOW contrib/clickhouse -> library/cpp/consistent_hashing ALLOW contrib -> contrib ALLOW contrib -> build ALLOW contrib -> library/python/resource @@ -54,23 +54,23 @@ ALLOW contrib/python/psycopg2/tests -> mail/devpack ALLOW contrib/python/asn1crypto -> library/python/symbols/crypto ALLOW contrib/python/win_unicode_console -> library/python/symbols/win_unicode_console ALLOW contrib/python/pycryptodome -> library/python/symbols/registry - -ALLOW contrib/tests/python -> library/python/fs - -ALLOW contrib/tests/subversion -> vcs/svn/run -ALLOW contrib/tests/subversion -> vcs/svn/test - -ALLOW contrib/tests/subvertpy -> devtools/ya/exts -ALLOW contrib/tests/subvertpy -> devtools/ya/yalibrary/svn/testing -ALLOW contrib/tests/subvertpy -> library/python/windows -ALLOW contrib/tests/subvertpy -> vcs/svn/wc/client - + +ALLOW contrib/tests/python -> library/python/fs + +ALLOW contrib/tests/subversion -> vcs/svn/run +ALLOW contrib/tests/subversion -> vcs/svn/test + +ALLOW contrib/tests/subvertpy -> devtools/ya/exts +ALLOW contrib/tests/subvertpy -> devtools/ya/yalibrary/svn/testing +ALLOW contrib/tests/subvertpy -> library/python/windows +ALLOW contrib/tests/subvertpy -> vcs/svn/wc/client + ALLOW contrib/tools/unbound -> infra/libs ALLOW contrib/tools/unbound -> library/cpp/proto_config ALLOW contrib/python/marshmallow-mongoengine/py[23]/tests -> library/python/pytest-mongodb -# contrib tests is written by us, hence everything is allowed -ALLOW contrib/tests -> .* - +# contrib tests is written by us, hence everything is allowed +ALLOW contrib/tests -> .* + DENY contrib -> .* diff --git a/build/rules/contrib_python.policy b/build/rules/contrib_python.policy index 3b74d891d0..60fd149753 100644 --- a/build/rules/contrib_python.policy +++ b/build/rules/contrib_python.policy @@ -686,12 +686,12 @@ ALLOW quality/ab_testing/cofe/bin/lib/files/py3/cofe_kernel_yql -> contrib/pytho ALLOW yql/udfs/common/python/python3 -> contrib/python/sqlalchemy/sqlalchemy-1.2 ALLOW yql/udfs/common/python/python_arc -> contrib/python/sqlalchemy/sqlalchemy-1.2 DENY .* -> contrib/python/sqlalchemy/sqlalchemy-1.2 - -# As agreed in https://st.yandex-team.ru/CONTRIB-2183 -# (use contrib/python/marshmallow_dataclass instead) -ALLOW education/ -> contrib/python/dataclasses-json -DENY .* -> contrib/python/dataclasses-json - + +# As agreed in https://st.yandex-team.ru/CONTRIB-2183 +# (use contrib/python/marshmallow_dataclass instead) +ALLOW education/ -> contrib/python/dataclasses-json +DENY .* -> contrib/python/dataclasses-json + # https://st.yandex-team.ru/CONTRIB-2222 ALLOW browser/infra/.* -> contrib/python/hurry.filesize DENY .* -> contrib/python/hurry.filesize diff --git a/build/rules/contrib_restricted.policy b/build/rules/contrib_restricted.policy index 43aace8fe7..a83ead1904 100644 --- a/build/rules/contrib_restricted.policy +++ b/build/rules/contrib_restricted.policy @@ -8,8 +8,8 @@ ALLOW strm/cv/ffmpeg_adcv/toshik_filters -> contrib/restricted/ffmpeg-3-scale-ip # CityHash-1.0.2 is a specific version hardwired into ClickHouse public interface ALLOW clickhouse -> contrib/restricted/cityhash-1.0.2 -ALLOW library/cpp/clickhouse -> contrib/restricted/cityhash-1.0.2 -ALLOW saas/library/hash_to_block_mode -> contrib/restricted/cityhash-1.0.2 +ALLOW library/cpp/clickhouse -> contrib/restricted/cityhash-1.0.2 +ALLOW saas/library/hash_to_block_mode -> contrib/restricted/cityhash-1.0.2 # dragonbox is a specific library for float formatting ALLOW clickhouse -> contrib/restricted/dragonbox @@ -39,7 +39,7 @@ ALLOW passport/infra -> contrib/restricted/thrift ALLOW passport/infra -> contrib/restricted/keyutils # For Apache Arrow: CONTRIB-1662 -ALLOW mds -> contrib/restricted/uriparser +ALLOW mds -> contrib/restricted/uriparser # https://st.yandex-team.ru/CONTRIB-2020 ALLOW weather -> contrib/restricted/range-v3 @@ -92,27 +92,27 @@ ALLOW smart_devices/tools/updater -> contrib/restricted/spdlog # cmph is a limited-use library ALLOW ads/yacontext -> contrib/restricted/cmph -# http-parser is a low-level parser for http bytestream. -# Consider using high-level alternatives. +# http-parser is a low-level parser for http bytestream. +# Consider using high-level alternatives. ALLOW mds -> contrib/restricted/http-parser ALLOW taxi/uservices -> contrib/restricted/http-parser ALLOW yt/yt/core/http -> contrib/restricted/http-parser ALLOW yweb/robot/fetcher/fetcher/user/http -> contrib/restricted/http-parser - + # Prefer using skynet for data distribution ALLOW maps/infra/ecstatic -> contrib/restricted/libtorrent -# Consider using util / library/cpp/digest versions instead of a raw murmurhash functions. -# -# strm/common/go/pkg/murmur3 is a CGO binding to murmurhash, thus dependency is allowed -ALLOW strm/common/go/pkg/murmur3 -> contrib/restricted/murmurhash +# Consider using util / library/cpp/digest versions instead of a raw murmurhash functions. +# +# strm/common/go/pkg/murmur3 is a CGO binding to murmurhash, thus dependency is allowed +ALLOW strm/common/go/pkg/murmur3 -> contrib/restricted/murmurhash ALLOW clickhouse -> contrib/restricted/murmurhash - -# exiv2 is GPL-licensed. Only small subset of our libraries can use it. -ALLOW extsearch/images/chunks/exiftags -> contrib/restricted/exiv2 -ALLOW maps/wikimap/mapspro/services/mrc/libs/common -> contrib/restricted/exiv2 -ALLOW yweb/disk/ocraas -> contrib/restricted/exiv2 - + +# exiv2 is GPL-licensed. Only small subset of our libraries can use it. +ALLOW extsearch/images/chunks/exiftags -> contrib/restricted/exiv2 +ALLOW maps/wikimap/mapspro/services/mrc/libs/common -> contrib/restricted/exiv2 +ALLOW yweb/disk/ocraas -> contrib/restricted/exiv2 + # Only allow boost in yandex projects listed below ALLOW adfox -> contrib/restricted/boost ALLOW ads -> contrib/restricted/boost @@ -125,8 +125,8 @@ ALLOW extsearch/geo/poi_service/tools/storage_reader -> contrib/restricted/boost ALLOW infra/contrib/pdns -> contrib/restricted/boost ALLOW juggler/pongerd -> contrib/restricted/boost ALLOW lbs/locator -> contrib/restricted/boost -ALLOW library/cpp/testing/boost_test$ -> contrib/restricted/boost/libs/test -ALLOW library/cpp/testing/boost_test_main$ -> contrib/restricted/boost/libs/test +ALLOW library/cpp/testing/boost_test$ -> contrib/restricted/boost/libs/test +ALLOW library/cpp/testing/boost_test_main$ -> contrib/restricted/boost/libs/test ALLOW library/cpp/testing/gtest_boost_extensions -> contrib/restricted/boost ALLOW logbroker/pipe-parser -> contrib/restricted/boost ALLOW mail -> contrib/restricted/boost @@ -157,7 +157,7 @@ ALLOW sdg/library/cpp/ros_msg_parser -> contrib/restricted/boost ALLOW search/meta/scatter/ant -> contrib/restricted/boost ALLOW search/meta/scatter/ut -> contrib/restricted/boost -# use GTEST target in ya.make instead of PEERDIRing contrib/restricted/googletest +# use GTEST target in ya.make instead of PEERDIRing contrib/restricted/googletest # and include <library/cpp/testing/gtest.h> instead of <gtest/gtest.h> (<gmock/gmock.h>) ALLOW contrib -> contrib/restricted/googletest ALLOW library/cpp/testing/gmock_in_unittest -> contrib/restricted/googletest @@ -172,9 +172,9 @@ ALLOW mail -> contrib/restricted/googletest ALLOW maps/mobile/libs -> contrib/restricted/googletest ALLOW maps/mobile/bundle -> contrib/restricted/googletest ALLOW mds -> contrib/restricted/googletest -# A mere proxy to allow using gmock in libraries without being bound to specific test framework -# See IGNIETFERRO-1827 for details. -ALLOW library/cpp/testing/gmock -> contrib/restricted/googletest/googlemock +# A mere proxy to allow using gmock in libraries without being bound to specific test framework +# See IGNIETFERRO-1827 for details. +ALLOW library/cpp/testing/gmock -> contrib/restricted/googletest/googlemock # allow usage of MIT part ALLOW .* -> contrib/restricted/librseq/headeronly @@ -185,9 +185,9 @@ ALLOW cloud/filestore/gateway/nfs -> contrib/restricted/nfs_ganesha ALLOW yandex_io -> contrib/restricted/patched/hostap_client # Default policies: -# -# Do not restrict contrib -# All peerdirs to contrib/restricted from outside are prohibited -# +# +# Do not restrict contrib +# All peerdirs to contrib/restricted from outside are prohibited +# ALLOW contrib -> contrib/restricted DENY .* -> contrib/restricted diff --git a/build/rules/maps/maps.policy b/build/rules/maps/maps.policy index 4e93f7d152..8abf3fbbd7 100644 --- a/build/rules/maps/maps.policy +++ b/build/rules/maps/maps.policy @@ -5,37 +5,37 @@ ALLOW taxi/tools/dorblu -> maps/libs/deprecated/bson ALLOW maps/masstransit/info -> maps/libs/deprecated/mongo ALLOW taxi/tools/dorblu -> maps/libs/deprecated/mongo -# Use maps/libs/locale instead -ALLOW maps/automotive/remote_access/libs/i18n -> maps/libs/deprecated/localeutils -ALLOW maps/carparks/renderer/datasource -> maps/libs/deprecated/localeutils -ALLOW maps/fastcgi/tilerenderer-serv -> maps/libs/deprecated/localeutils -ALLOW maps/garden/modules/renderer_denormalization -> maps/libs/deprecated/localeutils -ALLOW maps/infopoint -> maps/libs/deprecated/localeutils -ALLOW maps/jams/renderer2 -> maps/libs/deprecated/localeutils -ALLOW maps/libs/i18n -> maps/libs/deprecated/localeutils -ALLOW maps/libs/i18n-geobase -> maps/libs/deprecated/localeutils -ALLOW maps/libs/jams/static-graph -> maps/libs/deprecated/localeutils -ALLOW maps/libs/locale/compatibility -> maps/libs/deprecated/localeutils -ALLOW maps/libs/road_graph -> maps/libs/deprecated/localeutils -ALLOW maps/poi/personalized_poi -> maps/libs/deprecated/localeutils -ALLOW maps/renderer -> maps/libs/deprecated/localeutils -ALLOW maps/routing/router -> maps/libs/deprecated/localeutils -ALLOW maps/routing/graph-tile-builder -> maps/libs/deprecated/localeutils -ALLOW maps/snippets/tools/masstransit -> maps/libs/deprecated/localeutils -ALLOW maps/tools/indoor -> maps/libs/deprecated/localeutils -ALLOW maps/wikimap/mapspro/services/mrc -> maps/libs/deprecated/localeutils -ALLOW netsys/tiles-vcdiff/gen-tiles -> maps/libs/deprecated/localeutils +# Use maps/libs/locale instead +ALLOW maps/automotive/remote_access/libs/i18n -> maps/libs/deprecated/localeutils +ALLOW maps/carparks/renderer/datasource -> maps/libs/deprecated/localeutils +ALLOW maps/fastcgi/tilerenderer-serv -> maps/libs/deprecated/localeutils +ALLOW maps/garden/modules/renderer_denormalization -> maps/libs/deprecated/localeutils +ALLOW maps/infopoint -> maps/libs/deprecated/localeutils +ALLOW maps/jams/renderer2 -> maps/libs/deprecated/localeutils +ALLOW maps/libs/i18n -> maps/libs/deprecated/localeutils +ALLOW maps/libs/i18n-geobase -> maps/libs/deprecated/localeutils +ALLOW maps/libs/jams/static-graph -> maps/libs/deprecated/localeutils +ALLOW maps/libs/locale/compatibility -> maps/libs/deprecated/localeutils +ALLOW maps/libs/road_graph -> maps/libs/deprecated/localeutils +ALLOW maps/poi/personalized_poi -> maps/libs/deprecated/localeutils +ALLOW maps/renderer -> maps/libs/deprecated/localeutils +ALLOW maps/routing/router -> maps/libs/deprecated/localeutils +ALLOW maps/routing/graph-tile-builder -> maps/libs/deprecated/localeutils +ALLOW maps/snippets/tools/masstransit -> maps/libs/deprecated/localeutils +ALLOW maps/tools/indoor -> maps/libs/deprecated/localeutils +ALLOW maps/wikimap/mapspro/services/mrc -> maps/libs/deprecated/localeutils +ALLOW netsys/tiles-vcdiff/gen-tiles -> maps/libs/deprecated/localeutils + +# Use maps/libs/geolib instead +ALLOW maps/streetview/backoffice/lib -> maps/libs/deprecated/coordtrans_pymod -# Use maps/libs/geolib instead -ALLOW maps/streetview/backoffice/lib -> maps/libs/deprecated/coordtrans_pymod - # Use std::chrono or util/datetime instead ALLOW maps/analyzer -> maps/libs/deprecated/boost_time ALLOW maps/routing -> maps/libs/deprecated/boost_time ALLOW maps/tools/naviguide/lib -> maps/libs/deprecated/boost_time # Stop spreading deprecated stuff -ALLOW maps/libs/deprecated -> maps/libs/deprecated +ALLOW maps/libs/deprecated -> maps/libs/deprecated DENY .* -> maps/libs/deprecated # maps/doc/proto holds proto interface for maps backends. Anyone can use them. @@ -44,7 +44,7 @@ ALLOW .* -> maps/doc/proto # These libraries are allowed for general use ALLOW .* -> maps/libs/common ALLOW .* -> maps/libs/csv -ALLOW .* -> maps/libs/enum_io +ALLOW .* -> maps/libs/enum_io ALLOW .* -> maps/libs/geolib ALLOW .* -> maps/libs/http ALLOW .* -> maps/libs/json @@ -57,7 +57,7 @@ ALLOW .* -> maps/libs/sql_chemistry ALLOW .* -> maps/libs/st ALLOW .* -> maps/libs/tile ALLOW .* -> maps/libs/ttl_cache -ALLOW .* -> maps/pylibs/local_postgres +ALLOW .* -> maps/pylibs/local_postgres # Fix current PEERDIRs and prevent any further growth ALLOW media/road-graph-tool -> maps/libs/road_graph @@ -156,12 +156,12 @@ ALLOW sandbox/projects/masstransit -> maps/ ALLOW sprav/altay/panorama -> maps/streetview/libs ALLOW yql/udfs/maps -> maps/ -# maps_adv will be split into maps and smb -ALLOW maps_adv/ -> maps/ -ALLOW maps_adv/ -> maps_adv/ -ALLOW smb/ -> maps_adv/ -DENY .* -> maps_adv/ - +# maps_adv will be split into maps and smb +ALLOW maps_adv/ -> maps/ +ALLOW maps_adv/ -> maps_adv/ +ALLOW smb/ -> maps_adv/ +DENY .* -> maps_adv/ + ALLOW sdg/library/python/revision_manager -> maps/wikimap/mapspro/libs/common ALLOW sdg/library/python/revision_manager -> maps/wikimap/mapspro/libs/revision @@ -172,8 +172,8 @@ ALLOW ydo/libs/dispatch -> maps/libs/kdtree # use of privacy_detector ALLOW toloka -> maps/wikimap/mapspro/services/mrc/libs/ -# allow using yacare to implement piglet sync service -ALLOW devtools/contrib -> maps/infra/yacare - +# allow using yacare to implement piglet sync service +ALLOW devtools/contrib -> maps/infra/yacare + # Do not allow PEERDIRs into maps unless such PEERDIRs have be explicitly allowed above DENY .* -> maps/ diff --git a/build/stdafx.hpp b/build/stdafx.hpp index cb746b226b..98b15adda0 100644 --- a/build/stdafx.hpp +++ b/build/stdafx.hpp @@ -206,7 +206,7 @@ #include <util/generic/va_args.h> #include <util/generic/refcount.h> #include <util/generic/list.h> -#include <util/generic/array_ref.h> +#include <util/generic/array_ref.h> #include <util/generic/noncopyable.h> #include <util/generic/strbuf.h> #include <util/generic/lazy_value.h> diff --git a/build/sysincl/android.yml b/build/sysincl/android.yml index f156bcdcba..97cfbf38d2 100644 --- a/build/sysincl/android.yml +++ b/build/sysincl/android.yml @@ -5,7 +5,7 @@ - android/log.h - android/native_window_jni.h - cpu-features.h: contrib/libs/android_cpufeatures/cpu-features.h - - ifaddrs.h: contrib/libs/libc_compat/include/ifaddrs/ifaddrs.h + - ifaddrs.h: contrib/libs/libc_compat/include/ifaddrs/ifaddrs.h - jni.h: contrib/libs/jdk/include/jni.h - vulkan/vulkan.h - vulkan/vk_sdk_platform.h diff --git a/build/sysincl/darwin.yml b/build/sysincl/darwin.yml index 4a85b79043..582c7e1202 100644 --- a/build/sysincl/darwin.yml +++ b/build/sysincl/darwin.yml @@ -59,7 +59,7 @@ - mach-o/loader.h - mach/clock.h - mach/clock_types.h - - mach/error.h + - mach/error.h - mach/host_info.h - mach/kern_return.h - mach/mach.h @@ -118,7 +118,7 @@ - pthread_spis.h - readline/history.h - readline/readline.h - - readpassphrase.h + - readpassphrase.h - runetype.h - simd/simd.h - strhash.h diff --git a/build/sysincl/intrinsic.yml b/build/sysincl/intrinsic.yml index d5681c27a6..9355b61c13 100644 --- a/build/sysincl/intrinsic.yml +++ b/build/sysincl/intrinsic.yml @@ -10,7 +10,7 @@ - bmi2intrin.h - bmiintrin.h - cmnintrin.h - - e2kbuiltin.h + - e2kbuiltin.h - emmintrin.h - f16cintrin.h - fma4intrin.h diff --git a/build/sysincl/libc-to-compat.yml b/build/sysincl/libc-to-compat.yml index 0b7dea7522..02bd7508dc 100644 --- a/build/sysincl/libc-to-compat.yml +++ b/build/sysincl/libc-to-compat.yml @@ -1,6 +1,6 @@ -# We want musl to resolve itself without these sysincls, but its test must have them -- source_filter: "^(?!contrib/libs/musl).*|^contrib/libs/musl/tests" - includes: - # sys/random.h was added in glibc=2.25 / Ubuntu 16.04 - - sys/random.h: "contrib/libs/libc_compat/include/random/sys/random.h" - - readpassphrase.h: "contrib/libs/libc_compat/include/readpassphrase/readpassphrase.h" +# We want musl to resolve itself without these sysincls, but its test must have them +- source_filter: "^(?!contrib/libs/musl).*|^contrib/libs/musl/tests" + includes: + # sys/random.h was added in glibc=2.25 / Ubuntu 16.04 + - sys/random.h: "contrib/libs/libc_compat/include/random/sys/random.h" + - readpassphrase.h: "contrib/libs/libc_compat/include/readpassphrase/readpassphrase.h" diff --git a/build/sysincl/misc-win.yml b/build/sysincl/misc-win.yml index 33819b5867..e53d4be782 100644 --- a/build/sysincl/misc-win.yml +++ b/build/sysincl/misc-win.yml @@ -51,12 +51,12 @@ - spawn.h: contrib/tools/watchman/winbuild/spawn.h - sys/time.h: contrib/tools/watchman/winbuild/sys/time.h -- source_filter: "^contrib/libs/libpq" - includes: - - dirent.h: contrib/libs/libpq/src/include/port/win32_msvc/dirent.h - - sys/wait.h: contrib/libs/libpq/src/include/port/win32/sys/wait.h - - win32.h: contrib/libs/libpq/src/include/port/win32.h - +- source_filter: "^contrib/libs/libpq" + includes: + - dirent.h: contrib/libs/libpq/src/include/port/win32_msvc/dirent.h + - sys/wait.h: contrib/libs/libpq/src/include/port/win32/sys/wait.h + - win32.h: contrib/libs/libpq/src/include/port/win32.h + - source_filter: "^contrib/libs/curl" includes: - nghttp2/nghttp2.h diff --git a/build/sysincl/misc.yml b/build/sysincl/misc.yml index b89622eb94..e9e6095888 100644 --- a/build/sysincl/misc.yml +++ b/build/sysincl/misc.yml @@ -7,13 +7,13 @@ # DB2_ODBC_CLI - sqlcli1.h - -- includes: - - gelf.h: contrib/restricted/libelf/include/libelf/gelf.h - - libelf.h: contrib/restricted/libelf/include/libelf/libelf.h - - libelf/libelf.h: contrib/restricted/libelf/include/libelf/libelf.h - - libelf/sys_elf.h: contrib/restricted/libelf/include/libelf/sys_elf.h - + +- includes: + - gelf.h: contrib/restricted/libelf/include/libelf/gelf.h + - libelf.h: contrib/restricted/libelf/include/libelf/libelf.h + - libelf/libelf.h: contrib/restricted/libelf/include/libelf/libelf.h + - libelf/sys_elf.h: contrib/restricted/libelf/include/libelf/sys_elf.h + # We have lots of ADDINCLs to contrib/libs/libiconv all around the repo # so we need to add it to sysincl for consistent resolving. # We can go the other way here and remove iconv.h from all sysincl configs @@ -147,10 +147,10 @@ - atomic.h: contrib/libs/zeromq/missing_includes/atomic.h - Mstcpip.h: contrib/libs/zeromq/missing_includes/Mstcpip.h -- source_filter: "^contrib/restricted/openal-soft" - includes: - - atomic.h: contrib/restricted/openal-soft/common/atomic.h - +- source_filter: "^contrib/restricted/openal-soft" + includes: + - atomic.h: contrib/restricted/openal-soft/common/atomic.h + - source_filter: "^contrib/libs/ffmpeg-3" includes: - fontconfig/fontconfig.h @@ -161,7 +161,7 @@ includes: - port.h: contrib/libs/glog/missing_includes/port.h -- source_filter: "^contrib/(deprecated/onednn|libs/intel/onednn)" +- source_filter: "^contrib/(deprecated/onednn|libs/intel/onednn)" includes: - mkl_cblas.h: contrib/libs/intel/mkl/include/mkl_cblas.h - mkl_version.h: contrib/libs/intel/mkl/include/mkl_version.h diff --git a/build/sysincl/nvidia.yml b/build/sysincl/nvidia.yml index 1652ded6de..3d6fac79b6 100644 --- a/build/sysincl/nvidia.yml +++ b/build/sysincl/nvidia.yml @@ -2,16 +2,16 @@ - includes: - cooperative_groups.h - cuComplex.h - # Though cub is provided as a part of CUDA HPC SDK, - # we would like to be updatable independently. - # Hence we are using it directly from Arcadia. - # This sysincl enforces such usage. - - cub/cub.cuh: contrib/libs/nvidia/cub/cub/cub.cuh + # Though cub is provided as a part of CUDA HPC SDK, + # we would like to be updatable independently. + # Hence we are using it directly from Arcadia. + # This sysincl enforces such usage. + - cub/cub.cuh: contrib/libs/nvidia/cub/cub/cub.cuh - cublas.h - cublasLt.h - cublas_v2.h - cuda.h - - cuda_bf16.h + - cuda_bf16.h - cuda_fp16.h - cuda_gl_interop.h - cuda_runtime.h @@ -31,18 +31,18 @@ - npp.h - nppi.h - nvToolsExt.h - # Though thrust is provided as a part of CUDA HPC SDK, - # we would like to be updatable independently. - # Hence we are using it directly from Arcadia. - # This sysincl enforces such usage. - - thrust/iterator/iterator_traits.h: contrib/libs/nvidia/thrust/thrust/iterator/iterator_traits.h - - thrust/iterator/iterator_facade.h: contrib/libs/nvidia/thrust/thrust/iterator/iterator_facade.h - - thrust/system/cuda/detail/core/triple_chevron_launch.h: contrib/libs/nvidia/thrust/thrust/system/cuda/detail/core/triple_chevron_launch.h - - thrust/version.h: contrib/libs/nvidia/thrust/thrust/version.h + # Though thrust is provided as a part of CUDA HPC SDK, + # we would like to be updatable independently. + # Hence we are using it directly from Arcadia. + # This sysincl enforces such usage. + - thrust/iterator/iterator_traits.h: contrib/libs/nvidia/thrust/thrust/iterator/iterator_traits.h + - thrust/iterator/iterator_facade.h: contrib/libs/nvidia/thrust/thrust/iterator/iterator_facade.h + - thrust/system/cuda/detail/core/triple_chevron_launch.h: contrib/libs/nvidia/thrust/thrust/system/cuda/detail/core/triple_chevron_launch.h + - thrust/version.h: contrib/libs/nvidia/thrust/thrust/version.h - vector_types.h -# These headers should be provided by TensorRT. -# Proper solution must be found in DTCC-171 -- source_filter: "^contrib/libs/tf-2.4/.*" - includes: - - NvInfer.h - - NvInferPlugin.h +# These headers should be provided by TensorRT. +# Proper solution must be found in DTCC-171 +- source_filter: "^contrib/libs/tf-2.4/.*" + includes: + - NvInfer.h + - NvInferPlugin.h diff --git a/build/sysincl/stl-to-libcxx.yml b/build/sysincl/stl-to-libcxx.yml index 04ff0de4b9..7d9600f345 100644 --- a/build/sysincl/stl-to-libcxx.yml +++ b/build/sysincl/stl-to-libcxx.yml @@ -51,7 +51,7 @@ - any: contrib/libs/cxxsupp/libcxx/include/any - array: contrib/libs/cxxsupp/libcxx/include/array - atomic: contrib/libs/cxxsupp/libcxx/include/atomic - - bit: contrib/libs/cxxsupp/libcxx/include/bit + - bit: contrib/libs/cxxsupp/libcxx/include/bit - bitset: contrib/libs/cxxsupp/libcxx/include/bitset - cassert: contrib/libs/cxxsupp/libcxx/include/cassert - ccomplex: contrib/libs/cxxsupp/libcxx/include/ccomplex @@ -59,7 +59,7 @@ - cerrno: contrib/libs/cxxsupp/libcxx/include/cerrno - cfenv: contrib/libs/cxxsupp/libcxx/include/cfenv - cfloat: contrib/libs/cxxsupp/libcxx/include/cfloat - - charconv: contrib/libs/cxxsupp/libcxx/include/charconv + - charconv: contrib/libs/cxxsupp/libcxx/include/charconv - chrono: contrib/libs/cxxsupp/libcxx/include/chrono - cinttypes: contrib/libs/cxxsupp/libcxx/include/cinttypes - ciso646: contrib/libs/cxxsupp/libcxx/include/ciso646 @@ -67,9 +67,9 @@ - clocale: contrib/libs/cxxsupp/libcxx/include/clocale - cmath: contrib/libs/cxxsupp/libcxx/include/cmath - codecvt: contrib/libs/cxxsupp/libcxx/include/codecvt - - compare: contrib/libs/cxxsupp/libcxx/include/compare + - compare: contrib/libs/cxxsupp/libcxx/include/compare - complex: contrib/libs/cxxsupp/libcxx/include/complex - - concepts: contrib/libs/cxxsupp/libcxx/include/concepts + - concepts: contrib/libs/cxxsupp/libcxx/include/concepts - condition_variable: contrib/libs/cxxsupp/libcxx/include/condition_variable - csetjmp: contrib/libs/cxxsupp/libcxx/include/csetjmp - csignal: contrib/libs/cxxsupp/libcxx/include/csignal @@ -115,7 +115,7 @@ - scoped_allocator: contrib/libs/cxxsupp/libcxx/include/scoped_allocator - set: contrib/libs/cxxsupp/libcxx/include/set - shared_mutex: contrib/libs/cxxsupp/libcxx/include/shared_mutex - - span: contrib/libs/cxxsupp/libcxx/include/span + - span: contrib/libs/cxxsupp/libcxx/include/span - sstream: contrib/libs/cxxsupp/libcxx/include/sstream - stack: contrib/libs/cxxsupp/libcxx/include/stack - stdexcept: contrib/libs/cxxsupp/libcxx/include/stdexcept @@ -136,22 +136,22 @@ - valarray: contrib/libs/cxxsupp/libcxx/include/valarray - variant: contrib/libs/cxxsupp/libcxx/include/variant - vector: contrib/libs/cxxsupp/libcxx/include/vector - - -# Though these are headers provided by libcxx, we do not want to allow them to be included. -# We are using non-existent filename to generate error instead, as there is no specific syntax for this case. -- includes: - - ext/hash_map: DO_NOT_INCLUDE_NON_STANDARD_EXT_HASH_MAP - - ext/hash_set: DO_NOT_INCLUDE_NON_STANDARD_EXT_HASH_SET - - experimental/any: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_ANY - - experimental/chrono: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_CHRONO - - experimental/numeric: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_NUMERIC - - experimental/optional: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_OPTIONAL - - experimental/ratio: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_RATIO - - experimental/source_location: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_SOURCE_LOCATION - - experimental/string_view: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_STRING_VIEW - - experimental/system_error: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_SYSTEM_ERROR - - experimental/tuple: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_TUPLE - - # TODO: there is no <corouine> in libc++. Disable this include upon its appearance - - experimental/coroutine: contrib/libs/cxxsupp/libcxx/include/experimental/coroutine + + +# Though these are headers provided by libcxx, we do not want to allow them to be included. +# We are using non-existent filename to generate error instead, as there is no specific syntax for this case. +- includes: + - ext/hash_map: DO_NOT_INCLUDE_NON_STANDARD_EXT_HASH_MAP + - ext/hash_set: DO_NOT_INCLUDE_NON_STANDARD_EXT_HASH_SET + - experimental/any: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_ANY + - experimental/chrono: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_CHRONO + - experimental/numeric: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_NUMERIC + - experimental/optional: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_OPTIONAL + - experimental/ratio: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_RATIO + - experimental/source_location: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_SOURCE_LOCATION + - experimental/string_view: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_STRING_VIEW + - experimental/system_error: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_SYSTEM_ERROR + - experimental/tuple: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_TUPLE + + # TODO: there is no <corouine> in libc++. Disable this include upon its appearance + - experimental/coroutine: contrib/libs/cxxsupp/libcxx/include/experimental/coroutine diff --git a/build/sysincl/stl-to-nothing.yml b/build/sysincl/stl-to-nothing.yml index 383daf93c0..c7e27d1411 100644 --- a/build/sysincl/stl-to-nothing.yml +++ b/build/sysincl/stl-to-nothing.yml @@ -34,7 +34,7 @@ - any - array - atomic - - bit + - bit - bitset - cassert - ccomplex @@ -50,9 +50,9 @@ - clocale - cmath - codecvt - - compare + - compare - complex - - concepts + - concepts - condition_variable - csetjmp - csignal @@ -99,7 +99,7 @@ - scoped_allocator - set - shared_mutex - - span + - span - sstream - stack - stdexcept @@ -122,22 +122,22 @@ - vector - unwind.h: - contrib/libs/libunwind/include/unwind.h - - -# Though these are headers provided by libcxx, we do not want to allow them to be included. -# We are using non-existent filename to generate error instead, as there is no specific syntax for this case. -- includes: - - ext/hash_map: DO_NOT_INCLUDE_NON_STANDARD_EXT_HASH_MAP - - ext/hash_set: DO_NOT_INCLUDE_NON_STANDARD_EXT_HASH_SET - - experimental/any: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_ANY - - experimental/chrono: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_CHRONO - - experimental/numeric: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_NUMERIC - - experimental/optional: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_OPTIONAL - - experimental/ratio: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_RATIO - - experimental/source_location: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_SOURCE_LOCATION - - experimental/string_view: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_STRING_VIEW - - experimental/system_error: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_SYSTEM_ERROR - - experimental/tuple: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_TUPLE - - # TODO: there is no <corouine> in system stl. Disable this include upon its appearance - - experimental/coroutine + + +# Though these are headers provided by libcxx, we do not want to allow them to be included. +# We are using non-existent filename to generate error instead, as there is no specific syntax for this case. +- includes: + - ext/hash_map: DO_NOT_INCLUDE_NON_STANDARD_EXT_HASH_MAP + - ext/hash_set: DO_NOT_INCLUDE_NON_STANDARD_EXT_HASH_SET + - experimental/any: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_ANY + - experimental/chrono: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_CHRONO + - experimental/numeric: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_NUMERIC + - experimental/optional: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_OPTIONAL + - experimental/ratio: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_RATIO + - experimental/source_location: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_SOURCE_LOCATION + - experimental/string_view: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_STRING_VIEW + - experimental/system_error: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_SYSTEM_ERROR + - experimental/tuple: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_TUPLE + + # TODO: there is no <corouine> in system stl. Disable this include upon its appearance + - experimental/coroutine diff --git a/build/ya.conf.json b/build/ya.conf.json index ee33f3eb45..5f7cc875d6 100644 --- a/build/ya.conf.json +++ b/build/ya.conf.json @@ -958,73 +958,73 @@ "wine": "yes" } }, - "clang-format": { - "tools": { - "clang-format": { - "bottle": "clang-format", - "executable": "clang-format" - } - }, - "platforms": [ - { - "host": { - "os": "LINUX" - }, - "default": true - }, - { - "host": { - "os": "WIN" - }, - "default": true - }, - { - "host": { - "os": "DARWIN" - }, - "default": true - }, - { - "host": { - "os": "DARWIN", - "arch": "arm64" - }, - "default": true - } - ] - }, - "clang-tidy": { - "tools": { - "clang-tidy": { - "bottle": "clang-tidy", - "executable": "clang-tidy" - }, - "clang-apply-replacements": { - "bottle": "clang-tidy", - "executable": "clang-apply-replacements" - } - }, - "platforms": [ - { - "host": { - "os": "LINUX" - }, - "default": true - }, - { - "host": { - "os": "DARWIN" - }, - "default": true - }, - { - "host": { - "os": "WIN" - }, - "default": true - } - ] - }, + "clang-format": { + "tools": { + "clang-format": { + "bottle": "clang-format", + "executable": "clang-format" + } + }, + "platforms": [ + { + "host": { + "os": "LINUX" + }, + "default": true + }, + { + "host": { + "os": "WIN" + }, + "default": true + }, + { + "host": { + "os": "DARWIN" + }, + "default": true + }, + { + "host": { + "os": "DARWIN", + "arch": "arm64" + }, + "default": true + } + ] + }, + "clang-tidy": { + "tools": { + "clang-tidy": { + "bottle": "clang-tidy", + "executable": "clang-tidy" + }, + "clang-apply-replacements": { + "bottle": "clang-tidy", + "executable": "clang-apply-replacements" + } + }, + "platforms": [ + { + "host": { + "os": "LINUX" + }, + "default": true + }, + { + "host": { + "os": "DARWIN" + }, + "default": true + }, + { + "host": { + "os": "WIN" + }, + "default": true + } + ] + }, "ymake": { "tools": { "ymake": { @@ -1423,7 +1423,7 @@ "werror_mode": "compiler_specific", "c_compiler": "$(GCC)/gcc/bin/gcc", "cxx_compiler": "$(GCC)/gcc/bin/g++", - "cxx_std": "c++17", + "cxx_std": "c++17", "gcc_version": "8.2.0", "arch_opt": [ "-w" @@ -2233,7 +2233,7 @@ "werror_mode": "all", "c_compiler": "$(CLANG)/usr/bin/clang", "cxx_compiler": "$(CLANG)/usr/bin/clang++", - "cxx_std": "c++17", + "cxx_std": "c++17", "ar": "$(CLANG)/usr/bin/libtool", "inplace_tools": true, "gcc_version": "8.0", @@ -5751,39 +5751,39 @@ ] } }, - "clang-format": { - "formula": { + "clang-format": { + "formula": { "sandbox_id": [ 1042773541 ], - "match": "clang-format" - }, - "executable": { - "clang-format": [ - "clang-format" - ] - } - }, - "clang-tidy": { - "formula": { - "sandbox_id": [ + "match": "clang-format" + }, + "executable": { + "clang-format": [ + "clang-format" + ] + } + }, + "clang-tidy": { + "formula": { + "sandbox_id": [ 1073581733, 1073610805, 1073627148 - ], - "match": "CLANG_TIDY" - }, - "executable": { - "clang-tidy": [ - "bin", - "clang-tidy" - ], - "clang-apply-replacements": [ - "bin", - "clang-apply-replacements" - ] - } - }, + ], + "match": "CLANG_TIDY" + }, + "executable": { + "clang-tidy": [ + "bin", + "clang-tidy" + ], + "clang-apply-replacements": [ + "bin", + "clang-apply-replacements" + ] + } + }, "maven_import_sandbox_uploader": { "formula": { "sandbox_id": 1031028343, @@ -8094,6 +8094,6 @@ "toolchain_aliases": { "clang-win-x86_64": "clang12-win-x86_64", "clang-win-i686": "clang12-win-i686", - "gcc-linux-x86_64": "gcc82-linux-x86_64" + "gcc-linux-x86_64": "gcc82-linux-x86_64" } } diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 9c6212905b..081833998b 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -60,7 +60,7 @@ LD_REQUIREMENTS=$DEFAULT_REQUIREMENTS JAVA_REQUIREMENTS=$DEFAULT_REQUIREMENTS PY_REQUIREMENTS=$DEFAULT_REQUIREMENTS BISON_DATA_DIR=contrib/tools/bison/bison/data -CPP_BISON_SKELS=${BISON_DATA_DIR}/glr.cc ${BISON_DATA_DIR}/lalr1.cc ${BISON_DATA_DIR}/yacc.c ${BISON_DATA_DIR}/stack.hh ${BISON_DATA_DIR}/variant.hh ${BISON_DATA_DIR}/c++.m4 ${BISON_DATA_DIR}/c++-skel.m4 +CPP_BISON_SKELS=${BISON_DATA_DIR}/glr.cc ${BISON_DATA_DIR}/lalr1.cc ${BISON_DATA_DIR}/yacc.c ${BISON_DATA_DIR}/stack.hh ${BISON_DATA_DIR}/variant.hh ${BISON_DATA_DIR}/c++.m4 ${BISON_DATA_DIR}/c++-skel.m4 USE_PREBUILT_TOOLS=yes when ($OPENSOURCE == "yes") { @@ -774,23 +774,23 @@ GO_PROTOBUF_IMPORTS=\ ${GOSTD}/fmt \ ${GOSTD}/math \ vendor/github.com/golang/protobuf/proto \ - vendor/google.golang.org/protobuf/types/descriptorpb \ + vendor/google.golang.org/protobuf/types/descriptorpb \ vendor/google.golang.org/protobuf/runtime/protoimpl \ vendor/google.golang.org/protobuf/runtime/protoiface \ vendor/google.golang.org/protobuf/reflect/protoreflect # tag:go-specific tag:proto GO_PROTOBUF_WELLKNOWN_TYPES=\ - vendor/google.golang.org/protobuf/types/known/anypb \ - vendor/google.golang.org/protobuf/types/known/apipb \ - vendor/google.golang.org/protobuf/types/known/durationpb \ - vendor/google.golang.org/protobuf/types/known/emptypb \ - vendor/google.golang.org/protobuf/types/known/fieldmaskpb \ - vendor/google.golang.org/protobuf/types/known/sourcecontextpb \ - vendor/google.golang.org/protobuf/types/known/structpb \ - vendor/google.golang.org/protobuf/types/known/timestamppb \ - vendor/google.golang.org/protobuf/types/known/typepb \ - vendor/google.golang.org/protobuf/types/known/wrapperspb + vendor/google.golang.org/protobuf/types/known/anypb \ + vendor/google.golang.org/protobuf/types/known/apipb \ + vendor/google.golang.org/protobuf/types/known/durationpb \ + vendor/google.golang.org/protobuf/types/known/emptypb \ + vendor/google.golang.org/protobuf/types/known/fieldmaskpb \ + vendor/google.golang.org/protobuf/types/known/sourcecontextpb \ + vendor/google.golang.org/protobuf/types/known/structpb \ + vendor/google.golang.org/protobuf/types/known/timestamppb \ + vendor/google.golang.org/protobuf/types/known/typepb \ + vendor/google.golang.org/protobuf/types/known/wrapperspb # tag:go-specific tag:proto ### @usage: GO_PROTO_PLUGIN(Name Ext Tool [DEPS dependencies...]) @@ -838,7 +838,7 @@ macro _GO_PROTO_CMD(File) { ### ### Genereate .yson.go from .proto using yp/go/yson/internal/proto-yson-gen/cmd/proto-yson-gen macro YP_PROTO_YSON(OUT_OPTS[], Files...) { - .CMD=${cwd:BINDIR} $PROTOC --plugin=protoc-gen-custom=${tool:"yp/go/yson/internal/proto-yson-gen/cmd/proto-yson-gen"} -I=${ARCADIA_ROOT}/${PROTO_NAMESPACE} ${pre=-I=:_PROTO__INCLUDE} -I=${ARCADIA_ROOT} --custom_out="$OUT_OPTS paths=base_name:." --custom_opt="goroot=${GO_TOOLS_ROOT}" ${input:Files} ${output;hide;noauto;nopath;noext;suf=.yson.go:Files} + .CMD=${cwd:BINDIR} $PROTOC --plugin=protoc-gen-custom=${tool:"yp/go/yson/internal/proto-yson-gen/cmd/proto-yson-gen"} -I=${ARCADIA_ROOT}/${PROTO_NAMESPACE} ${pre=-I=:_PROTO__INCLUDE} -I=${ARCADIA_ROOT} --custom_out="$OUT_OPTS paths=base_name:." --custom_opt="goroot=${GO_TOOLS_ROOT}" ${input:Files} ${output;hide;noauto;nopath;noext;suf=.yson.go:Files} .ADDINCL=FOR proto ${ARCADIA_ROOT}/${MODDIR} FOR proto ${ARCADIA_ROOT}/${GO_TEST_IMPORT_PATH} FOR proto yt ${ARCADIA_BUILD_ROOT}/yt FOR proto contrib/libs/protobuf/src .PEERDIR=$GOSTD/strings $GOSTD/fmt $GOSTD/errors $GOSTD/encoding/json library/go/core/xerrors yt/go/yson yt/go/yterrors yp/go/yson/ytypes contrib/libs/protobuf @@ -917,17 +917,17 @@ macro USE_JAVALITE() { } # tag:proto tag:java-specific -JAVA_PROTO_RUNTIME_VERSION = 3.18.2 -JAVA_PROTO_COMMON_VERSION = 1.12.0 +JAVA_PROTO_RUNTIME_VERSION = 3.18.2 +JAVA_PROTO_COMMON_VERSION = 1.12.0 when ($JAVA_PROTO_RUNTIME == "javalite") { _JAVA_PROTO_OUT_ARG=--java_out=lite: - JAVA_PROTOBUF_PEERS=contrib/java/com/google/protobuf/protobuf-javalite/${JAVA_PROTO_RUNTIME_VERSION} + JAVA_PROTOBUF_PEERS=contrib/java/com/google/protobuf/protobuf-javalite/${JAVA_PROTO_RUNTIME_VERSION} JAVA_GRPC_STUB=contrib/java/io/grpc/grpc-stub/1.19.0 JAVA_GRPC_PROTOBUF=contrib/java/io/grpc/grpc-protobuf/1.19.0 } otherwise { _JAVA_PROTO_OUT_ARG=--java_out= - JAVA_PROTOBUF_PEERS=contrib/java/com/google/protobuf/protobuf-java/${JAVA_PROTO_RUNTIME_VERSION} + JAVA_PROTOBUF_PEERS=contrib/java/com/google/protobuf/protobuf-java/${JAVA_PROTO_RUNTIME_VERSION} JAVA_GRPC_STUB=contrib/java/io/grpc/grpc-stub/1.26.0 JAVA_GRPC_PROTOBUF=contrib/java/io/grpc/grpc-protobuf/1.26.0 } @@ -1175,7 +1175,7 @@ module _BASE_UNIT: _BARE_UNIT { SANITIZER_DEFINED=no - when ($SANITIZER_TYPE && $SANITIZER_TYPE != "no") { + when ($SANITIZER_TYPE && $SANITIZER_TYPE != "no") { CFLAGS+=-fsanitize=$SANITIZER_TYPE -D${SANITIZER_TYPE}_sanitizer_enabled $SANITIZER_CFLAGS -fno-omit-frame-pointer LDFLAGS+=-fsanitize=$SANITIZER_TYPE SANITIZER_DEFINED=yes @@ -1716,7 +1716,7 @@ module PY2_PROGRAM: _PY2_PROGRAM { ### Use the macro if module contains python2-only files (or other python sources which shouldn't be imported by python3 interpreter) ### which resides in the same directories with python 3 usefull code. contrib/python/future is a example. ### Anyway, preferred way is to move such files into separate dir and don't use this macro at all. -### +### ### Also see: https://docs.yandex-team.ru/ya-make/manual/python/vars#y_python_extended_source_search for details macro NO_EXTENDED_SOURCE_SEARCH() { SET(NO_EXTENDED_SOURCE_SEARCH yes) @@ -1877,13 +1877,13 @@ module UNITTEST_WITH_CUSTOM_ENTRY_POINT: _BASE_UNITTEST { } # tag:cpp-specific tag:test -### @usage: GTEST([name]) +### @usage: GTEST([name]) ### ### Unit test module based on library/cpp/testing/gtest. ### It is recommended not to specify the name. ### ### Documentation: https://docs.yandex-team.ru/arcadia-cpp/cpp_test -module GTEST: _BASE_UNITTEST { +module GTEST: _BASE_UNITTEST { .SEM=UNITTEST_SEM PEERDIR(library/cpp/testing/gtest library/cpp/testing/gtest_main) ADD_YTEST($MODULE_PREFIX$REALPRJNAME gunittest) @@ -1907,7 +1907,7 @@ module FUZZ: _BASE_PROGRAM { .FINAL_TARGET=no .ALLOWED=FUZZ_DICTS FUZZ_OPTS - DEFAULT(LIBFUZZER_PATH contrib/libs/libfuzzer12) + DEFAULT(LIBFUZZER_PATH contrib/libs/libfuzzer12) when ($USE_AFL == "no") { PEERDIR+=$LIBFUZZER_PATH } @@ -1950,7 +1950,7 @@ module BOOSTTEST: _BASE_PROGRAM { .NODE_TYPE=Program .FINAL_TARGET=no .CMD=LINK_BOOSTTEST_CMD - PEERDIR(library/cpp/testing/boost_test) + PEERDIR(library/cpp/testing/boost_test) when ($BOOSTTEST_IS_FAT_OBJECT) { MODULE_SUFFIX=.a } @@ -1963,13 +1963,13 @@ module BOOSTTEST: _BASE_PROGRAM { } # tag:deprecated -### @usage BOOSTTEST_WITH_MAIN([name]) #deprecated -### -### Same as BOOSTTEST (see above), but comes with builtin int main(argc, argv) implementation -module BOOSTTEST_WITH_MAIN: BOOSTTEST { - PEERDIR(library/cpp/testing/boost_test_main) -} - +### @usage BOOSTTEST_WITH_MAIN([name]) #deprecated +### +### Same as BOOSTTEST (see above), but comes with builtin int main(argc, argv) implementation +module BOOSTTEST_WITH_MAIN: BOOSTTEST { + PEERDIR(library/cpp/testing/boost_test_main) +} + FUZZ_DICTS_VALUE= ### @usage: FUZZ_DICTS(path1 [path2...]) ### @@ -2244,7 +2244,7 @@ macro STYLE(Globs...) { } # tag:cpp-specific tag:deprecated tag:test -### @usage: GTEST_UGLY([name]) +### @usage: GTEST_UGLY([name]) ### ### Deprecated, do not use in new projects. Use GTEST instead. ### @@ -2252,7 +2252,7 @@ macro STYLE(Globs...) { ### Use public documentation on gtest for details. ### ### Documentation about the Arcadia test system: https://wiki.yandex-team.ru/yatool/test/ -module GTEST_UGLY: _BASE_PROGRAM { +module GTEST_UGLY: _BASE_PROGRAM { .NODE_TYPE=Program .FINAL_TARGET=no PEERDIR(contrib/restricted/googletest/googlemock contrib/restricted/googletest/googletest) @@ -2923,7 +2923,7 @@ multimodule DYNAMIC_LIBRARY { MODULE_SUFFIX=.pkg.fake PEERDIR+=build/platform/local_so - RESTRICT_PATH(contrib devtools/dummy_arcadia MSG Use of this module type outside contrib/libs is prohibited) + RESTRICT_PATH(contrib devtools/dummy_arcadia MSG Use of this module type outside contrib/libs is prohibited) # disable credits generation for static library SET(CREDITS_FLAGS) @@ -3729,32 +3729,32 @@ macro JAVA_RESOURCE(JAR, SOURCES="") { } # tag:java-specific tag:fbs -JAVA_FLATBUFFERS_VERSION = 2.0.0 - +JAVA_FLATBUFFERS_VERSION = 2.0.0 + # tag:java-specific -module _COMPILABLE_JAR_BASE : _JAR_BASE { - # flatbuffers-java - DEPENDENCY_MANAGEMENT(contrib/java/com/google/flatbuffers/flatbuffers-java/${JAVA_FLATBUFFERS_VERSION}) - CHECK_DEPENDENT_DIRS(DENY PEERDIRS contrib/java/com/google/flatbuffers/flatbuffers-java EXCEPT contrib/java/com/google/flatbuffers/flatbuffers-java/${JAVA_FLATBUFFERS_VERSION}) - - # protobuf-java - DEPENDENCY_MANAGEMENT(contrib/java/com/google/protobuf/protobuf-java/${JAVA_PROTO_RUNTIME_VERSION}) - CHECK_DEPENDENT_DIRS(DENY PEERDIRS contrib/java/com/google/protobuf/protobuf-java EXCEPT contrib/java/com/google/protobuf/protobuf-java/${JAVA_PROTO_RUNTIME_VERSION}) - - # protobuf-javalite - DEPENDENCY_MANAGEMENT(contrib/java/com/google/protobuf/protobuf-javalite/${JAVA_PROTO_RUNTIME_VERSION}) - CHECK_DEPENDENT_DIRS(DENY PEERDIRS contrib/java/com/google/protobuf/protobuf-javalite EXCEPT contrib/java/com/google/protobuf/protobuf-javalite/${JAVA_PROTO_RUNTIME_VERSION}) - - # protobuf-java-util - DEPENDENCY_MANAGEMENT(contrib/java/com/google/protobuf/protobuf-java-util/${JAVA_PROTO_RUNTIME_VERSION}) - CHECK_DEPENDENT_DIRS(DENY PEERDIRS contrib/java/com/google/protobuf/protobuf-java-util EXCEPT contrib/java/com/google/protobuf/protobuf-java-util/${JAVA_PROTO_RUNTIME_VERSION}) -} - +module _COMPILABLE_JAR_BASE : _JAR_BASE { + # flatbuffers-java + DEPENDENCY_MANAGEMENT(contrib/java/com/google/flatbuffers/flatbuffers-java/${JAVA_FLATBUFFERS_VERSION}) + CHECK_DEPENDENT_DIRS(DENY PEERDIRS contrib/java/com/google/flatbuffers/flatbuffers-java EXCEPT contrib/java/com/google/flatbuffers/flatbuffers-java/${JAVA_FLATBUFFERS_VERSION}) + + # protobuf-java + DEPENDENCY_MANAGEMENT(contrib/java/com/google/protobuf/protobuf-java/${JAVA_PROTO_RUNTIME_VERSION}) + CHECK_DEPENDENT_DIRS(DENY PEERDIRS contrib/java/com/google/protobuf/protobuf-java EXCEPT contrib/java/com/google/protobuf/protobuf-java/${JAVA_PROTO_RUNTIME_VERSION}) + + # protobuf-javalite + DEPENDENCY_MANAGEMENT(contrib/java/com/google/protobuf/protobuf-javalite/${JAVA_PROTO_RUNTIME_VERSION}) + CHECK_DEPENDENT_DIRS(DENY PEERDIRS contrib/java/com/google/protobuf/protobuf-javalite EXCEPT contrib/java/com/google/protobuf/protobuf-javalite/${JAVA_PROTO_RUNTIME_VERSION}) + + # protobuf-java-util + DEPENDENCY_MANAGEMENT(contrib/java/com/google/protobuf/protobuf-java-util/${JAVA_PROTO_RUNTIME_VERSION}) + CHECK_DEPENDENT_DIRS(DENY PEERDIRS contrib/java/com/google/protobuf/protobuf-java-util EXCEPT contrib/java/com/google/protobuf/protobuf-java-util/${JAVA_PROTO_RUNTIME_VERSION}) +} + # tag:java-specific tag:internal ### @usage: JAR_LIBRARY() #internal ### ### Reimplementation of the JAVA_LIBRARY with ymake.core.conf and ymake based dependency management -module JAR_LIBRARY: _COMPILABLE_JAR_BASE { +module JAR_LIBRARY: _COMPILABLE_JAR_BASE { .EXTS=.jsrc .java .jar .mf .gentar .kt .CMD=LINK_JAR .FINAL_TARGET=yes @@ -3905,7 +3905,7 @@ macro _MARK_JAVA_PROG_WITH_SOURCES(Args...) { } # tag:java-specific -module _JAR_RUNABLE: _COMPILABLE_JAR_BASE { +module _JAR_RUNABLE: _COMPILABLE_JAR_BASE { .FINAL_TARGET=yes .CMD=LINK_JAR_PROGRAM .ALIASES=JAVA_SRCS=_MARK_JAVA_PROG_WITH_SOURCES GENERATE_SCRIPT=_YMAKE_GENERATE_SCRIPT @@ -4904,22 +4904,22 @@ module _JAVA_PLACEHOLDER: _BASE_UNIT { DISABLE(NEED_PLATFORM_PEERDIRS) NO_PLATFORM() JAVA_MODULE() - - # flatbuffers-java - DEPENDENCY_MANAGEMENT(contrib/java/com/google/flatbuffers/flatbuffers-java/${JAVA_FLATBUFFERS_VERSION}) - CHECK_DEPENDENT_DIRS(DENY PEERDIRS contrib/java/com/google/flatbuffers/flatbuffers-java EXCEPT contrib/java/com/google/flatbuffers/flatbuffers-java/${JAVA_FLATBUFFERS_VERSION}) - - # protobuf-java - DEPENDENCY_MANAGEMENT(contrib/java/com/google/protobuf/protobuf-java/${JAVA_PROTO_RUNTIME_VERSION}) - CHECK_DEPENDENT_DIRS(DENY PEERDIRS contrib/java/com/google/protobuf/protobuf-java EXCEPT contrib/java/com/google/protobuf/protobuf-java/${JAVA_PROTO_RUNTIME_VERSION}) - - # protobuf-javalite - DEPENDENCY_MANAGEMENT(contrib/java/com/google/protobuf/protobuf-javalite/${JAVA_PROTO_RUNTIME_VERSION}) - CHECK_DEPENDENT_DIRS(DENY PEERDIRS contrib/java/com/google/protobuf/protobuf-javalite EXCEPT contrib/java/com/google/protobuf/protobuf-javalite/${JAVA_PROTO_RUNTIME_VERSION}) - - # protobuf-java-util - DEPENDENCY_MANAGEMENT(contrib/java/com/google/protobuf/protobuf-java-util/${JAVA_PROTO_RUNTIME_VERSION}) - CHECK_DEPENDENT_DIRS(DENY PEERDIRS contrib/java/com/google/protobuf/protobuf-java-util EXCEPT contrib/java/com/google/protobuf/protobuf-java-util/${JAVA_PROTO_RUNTIME_VERSION}) + + # flatbuffers-java + DEPENDENCY_MANAGEMENT(contrib/java/com/google/flatbuffers/flatbuffers-java/${JAVA_FLATBUFFERS_VERSION}) + CHECK_DEPENDENT_DIRS(DENY PEERDIRS contrib/java/com/google/flatbuffers/flatbuffers-java EXCEPT contrib/java/com/google/flatbuffers/flatbuffers-java/${JAVA_FLATBUFFERS_VERSION}) + + # protobuf-java + DEPENDENCY_MANAGEMENT(contrib/java/com/google/protobuf/protobuf-java/${JAVA_PROTO_RUNTIME_VERSION}) + CHECK_DEPENDENT_DIRS(DENY PEERDIRS contrib/java/com/google/protobuf/protobuf-java EXCEPT contrib/java/com/google/protobuf/protobuf-java/${JAVA_PROTO_RUNTIME_VERSION}) + + # protobuf-javalite + DEPENDENCY_MANAGEMENT(contrib/java/com/google/protobuf/protobuf-javalite/${JAVA_PROTO_RUNTIME_VERSION}) + CHECK_DEPENDENT_DIRS(DENY PEERDIRS contrib/java/com/google/protobuf/protobuf-javalite EXCEPT contrib/java/com/google/protobuf/protobuf-javalite/${JAVA_PROTO_RUNTIME_VERSION}) + + # protobuf-java-util + DEPENDENCY_MANAGEMENT(contrib/java/com/google/protobuf/protobuf-java-util/${JAVA_PROTO_RUNTIME_VERSION}) + CHECK_DEPENDENT_DIRS(DENY PEERDIRS contrib/java/com/google/protobuf/protobuf-java-util EXCEPT contrib/java/com/google/protobuf/protobuf-java-util/${JAVA_PROTO_RUNTIME_VERSION}) SET(MODULE_LANG JAVA) } @@ -5612,7 +5612,7 @@ PCLMUL_CFLAGS= CX16_FLAGS= AVX_CFLAGS= AVX2_CFLAGS= -AVX512_CFLAGS= +AVX512_CFLAGS= # tag:cpu SSE_DEFINES= @@ -5632,21 +5632,21 @@ when (($ARCH_X86_64 || $ARCH_I386) && $DISABLE_INSTRUCTION_SETS != "yes") { POPCNT_CFLAGS=-mpopcnt PCLMUL_CFLAGS=-mpclmul AVX_CFLAGS=-mavx - - # On Intel FMA3 instruction set comes together with AVX-2 extension starting with Broadwell / Haswell. - # See: - # https://en.wikipedia.org/wiki/FMA_instruction_set - # - # AMD implemented it in Piledriver architecture over AVX prior to AVX-2 which was introduced in Zen. - # See: - # https://en.wikipedia.org/wiki/Template:AMD_x86_CPU_features - AVX2_CFLAGS=-mavx2 -mfma - - # All Intel CPUS with AVX-512 have these instructions except for the Knights Landing / Knights Mill - # (these are Xeon Phi) - # See: - # https://en.wikichip.org/wiki/x86/avx-512 - AVX512_CFLAGS=-mavx512f -mavx512cd -mavx512bw -mavx512dq -mavx512vl + + # On Intel FMA3 instruction set comes together with AVX-2 extension starting with Broadwell / Haswell. + # See: + # https://en.wikipedia.org/wiki/FMA_instruction_set + # + # AMD implemented it in Piledriver architecture over AVX prior to AVX-2 which was introduced in Zen. + # See: + # https://en.wikipedia.org/wiki/Template:AMD_x86_CPU_features + AVX2_CFLAGS=-mavx2 -mfma + + # All Intel CPUS with AVX-512 have these instructions except for the Knights Landing / Knights Mill + # (these are Xeon Phi) + # See: + # https://en.wikichip.org/wiki/x86/avx-512 + AVX512_CFLAGS=-mavx512f -mavx512cd -mavx512bw -mavx512dq -mavx512vl when ($ARCH_X86_64 && $OS_ANDROID != "yes") { CX16_FLAGS=-mcx16 } @@ -5663,7 +5663,7 @@ when (($ARCH_X86_64 || $ARCH_I386) && $DISABLE_INSTRUCTION_SETS != "yes") { PCLMUL_CFLAGS=/D__PCLMUL__=1 AVX_CFLAGS=/arch:AVX /DAVX_ENABLED=1 AVX2_CFLAGS=/arch:AVX2 /DAVX2_ENABLED=1 - AVX512_CFLAGS=/arch:AVX512 /DAVX512_ENABLED=1 + AVX512_CFLAGS=/arch:AVX512 /DAVX512_ENABLED=1 SSE_DEFINES=/DSSE_ENABLED=1 /DSSE3_ENABLED=1 /DSSSE3_ENABLED=1 SSE4_DEFINES=/DSSE41_ENABLED=1 /DSSE42_ENABLED=1 /DPOPCNT_ENABLED=1 /DCX16_ENABLED=1 } @@ -5735,7 +5735,7 @@ macro _SRC(EXT, SRC, SRCFLAGS...) { # tag:src-processing macro _SRC("S", SRC, SRCFLAGS...) { - .CMD=$C_COMPILER $C_FLAGS_PLATFORM $CFLAGS $SFLAGS $SRCFLAGS -c -o ${output:SRC.o} ${input:SRC} ${pre=-I:_C__INCLUDE} + .CMD=$C_COMPILER $C_FLAGS_PLATFORM $CFLAGS $SFLAGS $SRCFLAGS -c -o ${output:SRC.o} ${input:SRC} ${pre=-I:_C__INCLUDE} .SEM=add_asm_source ${input:SRC} ${output;hide;suf=.o:SRC} } @@ -5998,18 +5998,18 @@ macro _SRC_c_nodeps(SRC, OUTFILE, INC...) { # Custom flags for generated cpp-files. To support another generator: # - insert additional file extension before .cpp into generated cpp-file name # - update _LANG_CFLAGS_FILTER variable. Don't forget to add ' SKIP ' after flag list -# -# ragel5 and ragel6 generated terrible code which makes use of goto's in switch statements. -# This triggers -Werror-implicit-fallthrough due to `unannotated fall-through between switch labels`. -# -# cython generated code also fails to pass this diagnostics due to `fallthrough annotation in unreachable code`. -# We use cython==0.29.26 at the time. This issue might be fixed in further versions. +# +# ragel5 and ragel6 generated terrible code which makes use of goto's in switch statements. +# This triggers -Werror-implicit-fallthrough due to `unannotated fall-through between switch labels`. +# +# cython generated code also fails to pass this diagnostics due to `fallthrough annotation in unreachable code`. +# We use cython==0.29.26 at the time. This issue might be fixed in further versions. ## tag:src-processing _LANG_CFLAGS_FILTER=\ ${pre=-Wno-implicit-fallthrough SKIP ;ext=.rl5:SRC} \ - ${pre=-Wno-implicit-fallthrough SKIP ;ext=.rl6:SRC} \ - ${pre=-Wno-implicit-fallthrough SKIP ;ext=.pyx:SRC} + ${pre=-Wno-implicit-fallthrough SKIP ;ext=.rl6:SRC} \ + ${pre=-Wno-implicit-fallthrough SKIP ;ext=.pyx:SRC} # tag:src-processing # Magic macro for removing file name from result (file name is passed as unused SKIP parameter) @@ -6960,7 +6960,7 @@ SCHEEME2_STRUCT_INFO_FLAGS=-f "const static ui32 RecordSig" -u "RecordSig" --gcc ### for compatibility with C++ compiler and the external environment. ### See tools/structparser for more details. macro GEN_SCHEEME2(ScheemeName, FromFile) { - .CMD=$CXX_COMPILER $C_FLAGS_PLATFORM -c ${tmp;stdout:FromFile.cph} $SCHEEME2_CFLAGS ${input:FromFile} ${pre=-I:_C__INCLUDE} $CXXFLAGS -Wno-error && ${tool:"tools/structparser"} -o ${output:ScheemeName.inc} -n N${ScheemeName}SchemeInfo $SCHEEME2_STRUCT_INFO_FLAGS $DATAWORK_SCHEEME_EXPORT_FLAGS ${tmp:FromFile.cph} ${output;stdout;noauto:ScheemeName.inc.log} ${kv;hide:"p SH"} ${kv;hide:"pc yellow"} + .CMD=$CXX_COMPILER $C_FLAGS_PLATFORM -c ${tmp;stdout:FromFile.cph} $SCHEEME2_CFLAGS ${input:FromFile} ${pre=-I:_C__INCLUDE} $CXXFLAGS -Wno-error && ${tool:"tools/structparser"} -o ${output:ScheemeName.inc} -n N${ScheemeName}SchemeInfo $SCHEEME2_STRUCT_INFO_FLAGS $DATAWORK_SCHEEME_EXPORT_FLAGS ${tmp:FromFile.cph} ${output;stdout;noauto:ScheemeName.inc.log} ${kv;hide:"p SH"} ${kv;hide:"pc yellow"} } ### @usage: SYMLINK(from to) @@ -7173,7 +7173,7 @@ macro GENERATED_SRCS(PARSE_META_FROM{input}[], OUTPUT_INCLUDES[], OPTIONS[], TEM ### Emit Clang AST from .cpp file. CXXFLAGS and LLVM_OPTS are passed in, while CFLAGS and C_FLAGS_PLATFORM are not. ### Note: Output name is used as is, no extension added. macro CLANG_EMIT_AST_CXX(Input, Output, Opts...) { - .CMD=$YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS $CLANG_ROOT/bin/clang++ ${pre=-I:_C__INCLUDE} $CXXFLAGS -Wno-unknown-warning-option $LLVM_OPTS -std=c++17 -fno-lto -emit-ast -c ${input:Input} -o ${output;noauto:Output} $Opts ${kv;hide:"p ST"} ${kv;hide:"pc light-green"} + .CMD=$YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS $CLANG_ROOT/bin/clang++ ${pre=-I:_C__INCLUDE} $CXXFLAGS -Wno-unknown-warning-option $LLVM_OPTS -std=c++17 -fno-lto -emit-ast -c ${input:Input} -o ${output;noauto:Output} $Opts ${kv;hide:"p ST"} ${kv;hide:"pc light-green"} PEERDIR(build/platform/clang) } @@ -7182,7 +7182,7 @@ macro CLANG_EMIT_AST_CXX(Input, Output, Opts...) { ### Emit LLVM bytecode from .cpp file. BC_CXXFLAGS, LLVM_OPTS and C_FLAGS_PLATFORM are passed in, while CFLAGS are not. ### Note: Output name is used as is, no extension added. macro LLVM_COMPILE_CXX(Input, Output, Opts...) { - .CMD=$YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS $CLANG_ROOT/bin/clang++ ${pre=-I:_C__INCLUDE} $BC_CXXFLAGS $C_FLAGS_PLATFORM -Wno-unknown-warning-option $LLVM_OPTS -std=c++17 -fno-lto -emit-llvm -c ${input:Input} -o ${output;noauto:Output} $Opts ${kv;hide:"p BC"} ${kv;hide:"pc light-green"} + .CMD=$YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS $CLANG_ROOT/bin/clang++ ${pre=-I:_C__INCLUDE} $BC_CXXFLAGS $C_FLAGS_PLATFORM -Wno-unknown-warning-option $LLVM_OPTS -std=c++17 -fno-lto -emit-llvm -c ${input:Input} -o ${output;noauto:Output} $Opts ${kv;hide:"p BC"} ${kv;hide:"pc light-green"} PEERDIR(build/platform/clang) } @@ -7191,7 +7191,7 @@ macro LLVM_COMPILE_CXX(Input, Output, Opts...) { ### Emit LLVM bytecode from .c file. BC_CFLAGS, LLVM_OPTS and C_FLAGS_PLATFORM are passed in, while CFLAGS are not. ### Note: Output name is used as is, no extension added. macro LLVM_COMPILE_C(Input, Output, Opts...) { - .CMD=$YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS $CLANG_ROOT/bin/clang ${pre=-I:_C__INCLUDE} $BC_CFLAGS $C_FLAGS_PLATFORM $LLVM_OPTS -fno-lto -emit-llvm -c ${input:Input} -o ${output;noauto:Output} $Opts ${kv;hide:"p BC"} ${kv;hide:"pc light-green"} + .CMD=$YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS $CLANG_ROOT/bin/clang ${pre=-I:_C__INCLUDE} $BC_CFLAGS $C_FLAGS_PLATFORM $LLVM_OPTS -fno-lto -emit-llvm -c ${input:Input} -o ${output;noauto:Output} $Opts ${kv;hide:"p BC"} ${kv;hide:"pc light-green"} PEERDIR(build/platform/clang) } @@ -7200,7 +7200,7 @@ macro LLVM_COMPILE_C(Input, Output, Opts...) { ### Emit eBPF bytecode from .c file. ### Note: Output name is used as is, no extension added. macro BPF(Input, Output, Opts...) { - .CMD=$YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS $CLANG_ROOT/bin/clang ${pre=-I:_C__INCLUDE} $C_FLAGS_PLATFORM -target bpf -c ${input:Input} -o ${output;noauto:Output} $Opts ${kv;hide:"p BP"} ${kv;hide:"pc light-green"} + .CMD=$YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS $CLANG_ROOT/bin/clang ${pre=-I:_C__INCLUDE} $C_FLAGS_PLATFORM -target bpf -c ${input:Input} -o ${output;noauto:Output} $Opts ${kv;hide:"p BP"} ${kv;hide:"pc light-green"} PEERDIR(build/platform/clang) } @@ -7492,10 +7492,10 @@ multimodule PROTO_LIBRARY { MODULE_SUFFIX=$_CPP_PROTO_MODULE_SUFFIX MODULE_PREFIX=$_CPP_PROTO_MODULE_PREFIX - - when ($_COMMON_GOOGLE_APIS != "None") { - PEERDIR += contrib/libs/googleapis-common-protos - } + + when ($_COMMON_GOOGLE_APIS != "None") { + PEERDIR += contrib/libs/googleapis-common-protos + } } module JAVA_PROTO: EXTERNAL_JAVA_LIBRARY { @@ -7505,14 +7505,14 @@ multimodule PROTO_LIBRARY { SET(PEERDIR_TAGS JAVA_PROTO) ENABLE(JAVA_PROTO) PEERDIR+=$JAVA_PROTOBUF_PEERS contrib/java/javax/annotation/javax.annotation-api/1.3.1 - + .IGNORED=GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER USE_SKIFF CPP_PROTO_PLUGIN2 PY_PROTO_PLUGIN YMAPS_SPROTO RESOURCE ADDINCL(FOR proto $PROTOBUF_PATH) - - when ($_COMMON_GOOGLE_APIS != "None") { - PEERDIR += contrib/java/com/google/api/grpc/proto-google-common-protos/${JAVA_PROTO_COMMON_VERSION} - ADDINCL += FOR proto ${ARCADIA_ROOT}/contrib/libs/googleapis-common-protos - } + + when ($_COMMON_GOOGLE_APIS != "None") { + PEERDIR += contrib/java/com/google/api/grpc/proto-google-common-protos/${JAVA_PROTO_COMMON_VERSION} + ADDINCL += FOR proto ${ARCADIA_ROOT}/contrib/libs/googleapis-common-protos + } } module PY_PROTO: PY2_LIBRARY { @@ -7527,9 +7527,9 @@ multimodule PROTO_LIBRARY { # Can not use NO_LINT(), because is not allowed outside of contrib directory SET(LINT_LEVEL_VALUE none_internal) - when ($_COMMON_GOOGLE_APIS != "None") { - PEERDIR += contrib/libs/googleapis-common-protos - } + when ($_COMMON_GOOGLE_APIS != "None") { + PEERDIR += contrib/libs/googleapis-common-protos + } _IGNORE_SELF_PEERS= _CPP_PROTO_LIBRARY=${MODDIR}/$_CPP_PROTO_MODULE_PREFIX$REALPRJNAME$_CPP_PROTO_MODULE_SUFFIX @@ -7557,9 +7557,9 @@ multimodule PROTO_LIBRARY { # Can not use NO_LINT(), because is not allowed outside of contrib directory SET(LINT_LEVEL_VALUE none_internal) - when ($_COMMON_GOOGLE_APIS != "None") { - PEERDIR += contrib/libs/googleapis-common-protos - } + when ($_COMMON_GOOGLE_APIS != "None") { + PEERDIR += contrib/libs/googleapis-common-protos + } _IGNORE_SELF_PEERS= _CPP_PROTO_LIBRARY=${MODDIR}/$_CPP_PROTO_MODULE_PREFIX$REALPRJNAME$_CPP_PROTO_MODULE_SUFFIX @@ -7574,17 +7574,17 @@ multimodule PROTO_LIBRARY { .SEM=ignored SET(PEERDIR_TAGS GO GO_PROTO) ENABLE(GO_PROTO) - - when ($_COMMON_GOOGLE_APIS == "None") { - } - elsewhen ($_COMMON_GOOGLE_APIS == "") { - PEERDIR += $_GO_COMMON_GOOGLE_APIS - ADDINCL += FOR proto ${ARCADIA_ROOT}/contrib/libs/googleapis-common-protos - } - otherwise { - PEERDIR += $_COMMON_GOOGLE_APIS - ADDINCL += FOR proto ${ARCADIA_ROOT}/contrib/libs/googleapis-common-protos - } + + when ($_COMMON_GOOGLE_APIS == "None") { + } + elsewhen ($_COMMON_GOOGLE_APIS == "") { + PEERDIR += $_GO_COMMON_GOOGLE_APIS + ADDINCL += FOR proto ${ARCADIA_ROOT}/contrib/libs/googleapis-common-protos + } + otherwise { + PEERDIR += $_COMMON_GOOGLE_APIS + ADDINCL += FOR proto ${ARCADIA_ROOT}/contrib/libs/googleapis-common-protos + } } module EXT_PROTO: _BARE_UNIT { @@ -7598,10 +7598,10 @@ multimodule PROTO_LIBRARY { ENABLE(EXT_PROTO) SET(MODULE_SUFFIX .raw.fake.pkg) SET(MODULE_TYPE LIBRARY) - - when ($_COMMON_GOOGLE_APIS != "None") { - PEERDIR += contrib/libs/googleapis-common-protos - } + + when ($_COMMON_GOOGLE_APIS != "None") { + PEERDIR += contrib/libs/googleapis-common-protos + } SET(CREDITS_FILE_EXTRA_EXT .ext_proto) } @@ -7640,10 +7640,10 @@ multimodule PROTO_LIBRARY { .SEM=ignored SET(MODULE_SUFFIX .pb_py.fake.pkg) ENABLE(PB_PY_PROTO) - - # WARN: - # _COMMON_GOOGLE_APIS aren't handled intentionally. - # PB_PY_PROTO is a legacy module type, stop using it. + + # WARN: + # _COMMON_GOOGLE_APIS aren't handled intentionally. + # PB_PY_PROTO is a legacy module type, stop using it. } } @@ -7659,7 +7659,7 @@ EXT_PROTO_ROOT=${ARCADIA_BUILD_ROOT}/${_EXT_PROTO_DIR} ### @usage: USE_EXT_PROTO(peerdir_tag...) ### ### Configure module to use proto files from existing PROTO_LIBRARY module. -### Additional PEERDIR tags required to build a module can be passed through +### Additional PEERDIR tags required to build a module can be passed through ### EXTRA_TAGS vararg parameter. macro USE_EXT_PROTO(EXTRA_TAGS...) { SET(PEERDIR_TAGS EXT_PROTO ${EXTRA_TAGS}) @@ -9269,7 +9269,7 @@ macro MSVC_FLAGS(FLAGS...) { ### @usage: COLLECT_YDB_API_SPECS_LEGACY(VarName Paths...) #deprecated ### -### This macro is ugly hack for legacy YDB go API codegen, any other uses are prohibited +### This macro is ugly hack for legacy YDB go API codegen, any other uses are prohibited macro COLLECT_YDB_API_SPECS_LEGACY(FILES_VAR, PATHS...) { _GLOB($FILES_VAR ${suf=/*.proto:PATHS}) RESTRICT_PATH(kikimr/public/sdk/go/ydb/api MSG This is ugly hack for legacy YDB go API codegen, any other uses are probibited) diff --git a/build/ymake_conf.py b/build/ymake_conf.py index b9dd4f79f6..30219eb85e 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -105,9 +105,9 @@ class Platform(object): self.is_android = self.os == 'android' if self.is_android: # This is default Android API level unless `ANDROID_API` is specified - # 18 is the smallest level with OpenGL support + # 18 is the smallest level with OpenGL support # 21 is the smallest level for 64-bit platforms - default_android_api = 21 if self.is_64_bit else 18 + default_android_api = 21 if self.is_64_bit else 18 self.android_api = int(preset('ANDROID_API', default_android_api)) self.is_cygwin = self.os == 'cygwin' @@ -788,7 +788,7 @@ when (($USEMPROF == "yes") || ($USE_MPROF == "yes")) { emit('ARM7_FLOAT_ABI', self.platform.armv7_float_abi) if self.platform.is_android: - emit('ANDROID_API', str(self.platform.android_api)) + emit('ANDROID_API', str(self.platform.android_api)) if self.platform.is_posix: self.print_nix_target_const() @@ -960,8 +960,8 @@ class ToolchainOptions(object): # TODO(somov): Убрать чтение настройки из os.environ. self.werror_mode = preset('WERROR_MODE') or os.environ.get('WERROR_MODE') or self.params.get('werror_mode') or 'compiler_specific' - # default C++ standard is set here, some older toolchains might need to redefine it in ya.conf.json - self.cxx_std = self.params.get('cxx_std', 'c++20') + # default C++ standard is set here, some older toolchains might need to redefine it in ya.conf.json + self.cxx_std = self.params.get('cxx_std', 'c++20') self._env = tc_json.get('env', {}) @@ -1325,48 +1325,48 @@ class GnuCompiler(Compiler): self.target = self.build.target self.tc = tc - self.c_foptions = [ - # Enable C++ exceptions (and allow them to be throw through pure C code) - '-fexceptions', - # Enable standard-conforming behavior and generate duplicate symbol error in case of duplicated global constants. - # See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85678#c0 - '-fno-common', - ] - - if self.tc.is_clang and self.target.is_linux: - # Use .init_array instead of .ctors (default for old clang versions) - # See: https://maskray.me/blog/2021-11-07-init-ctors-init-array - self.c_foptions.append('-fuse-init-array') - - if self.tc.is_clang: - self.c_foptions += [ - # Set up output colorization - '-fcolor-diagnostics', - # Enable aligned allocation - '-faligned-allocation', - ] - elif self.tc.is_gcc: - self.c_foptions += [ - # Set up output colorization - '-fdiagnostics-color=always', - # It looks like there is no way to enable aligned allocation in gcc - ] - - self.c_warnings = [ - # Enable default warnings subset - '-Wall', - '-Wextra', - ] + self.c_foptions = [ + # Enable C++ exceptions (and allow them to be throw through pure C code) + '-fexceptions', + # Enable standard-conforming behavior and generate duplicate symbol error in case of duplicated global constants. + # See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85678#c0 + '-fno-common', + ] + + if self.tc.is_clang and self.target.is_linux: + # Use .init_array instead of .ctors (default for old clang versions) + # See: https://maskray.me/blog/2021-11-07-init-ctors-init-array + self.c_foptions.append('-fuse-init-array') + + if self.tc.is_clang: + self.c_foptions += [ + # Set up output colorization + '-fcolor-diagnostics', + # Enable aligned allocation + '-faligned-allocation', + ] + elif self.tc.is_gcc: + self.c_foptions += [ + # Set up output colorization + '-fdiagnostics-color=always', + # It looks like there is no way to enable aligned allocation in gcc + ] + + self.c_warnings = [ + # Enable default warnings subset + '-Wall', + '-Wextra', + ] self.cxx_warnings = [ - # Issue a warning if certain overload is hidden due to inheritance - '-Woverloaded-virtual', + # Issue a warning if certain overload is hidden due to inheritance + '-Woverloaded-virtual', + ] + + # Disable some warnings which will fail compilation at the time + self.c_warnings += [ + '-Wno-parentheses' ] - # Disable some warnings which will fail compilation at the time - self.c_warnings += [ - '-Wno-parentheses' - ] - self.c_defines = ['-DFAKEID=$CPP_FAKEID'] if self.target.is_android: self.c_defines.append('-DANDROID_FAKEID=$ANDROID_FAKEID') @@ -1426,25 +1426,25 @@ class GnuCompiler(Compiler): self.cxx_warnings += [ '-Wimport-preprocessor-directive-pedantic', '-Wno-undefined-var-template', - '-Wno-return-std-move', - '-Wno-address-of-packed-member', - '-Wno-defaulted-function-deleted', - '-Wno-pessimizing-move', - '-Wno-range-loop-construct', - '-Wno-deprecated-anon-enum-enum-conversion', - '-Wno-deprecated-enum-enum-conversion', - '-Wno-deprecated-enum-float-conversion', - '-Wno-ambiguous-reversed-operator', - '-Wno-deprecated-volatile', + '-Wno-return-std-move', + '-Wno-address-of-packed-member', + '-Wno-defaulted-function-deleted', + '-Wno-pessimizing-move', + '-Wno-range-loop-construct', + '-Wno-deprecated-anon-enum-enum-conversion', + '-Wno-deprecated-enum-enum-conversion', + '-Wno-deprecated-enum-float-conversion', + '-Wno-ambiguous-reversed-operator', + '-Wno-deprecated-volatile', ] - self.c_warnings += [ - '-Wno-implicit-const-int-float-conversion', - # For nvcc to accept the above. - '-Wno-unknown-warning-option', - ] + self.c_warnings += [ + '-Wno-implicit-const-int-float-conversion', + # For nvcc to accept the above. + '-Wno-unknown-warning-option', + ] - elif self.tc.is_gcc: + elif self.tc.is_gcc: self.c_foptions.append('-fno-delete-null-pointer-checks') self.c_foptions.append('-fabi-version=8') @@ -1535,7 +1535,7 @@ class GnuCompiler(Compiler): } when ($NO_COMPILER_WARNINGS == "yes") { C_WARNING_OPTS = -w - CXX_WARNING_OPTS = -Wno-everything + CXX_WARNING_OPTS = -Wno-everything } when ($NO_OPTIMIZE == "yes") { OPTIMIZE = -O0 @@ -1724,9 +1724,9 @@ class GnuCompiler(Compiler): emit('_SRC_MASM_CMD', '$_EMPTY_CMD') # fuzzing configuration - if self.tc.is_clang: - if self.tc.version_at_least(12): - emit('LIBFUZZER_PATH', 'contrib/libs/libfuzzer12') + if self.tc.is_clang: + if self.tc.version_at_least(12): + emit('LIBFUZZER_PATH', 'contrib/libs/libfuzzer12') class SwiftCompiler(object): @@ -2386,17 +2386,17 @@ class MSVCCompiler(MSVC, Compiler): '/D__STDC_FORMAT_MACROS', '/D_USING_V110_SDK71_', '/D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES', - '/DNOMINMAX', - '/DWIN32_LEAN_AND_MEAN', + '/DNOMINMAX', + '/DWIN32_LEAN_AND_MEAN', + ] + + cxx_defines = [ + # Use builtin offsetof implementation + # instead of a crutcy macro defined in ucrt/stddef.h. + # The latter can not be used in constexpr statements. + '/D_CRT_USE_BUILTIN_OFFSETOF', ] - cxx_defines = [ - # Use builtin offsetof implementation - # instead of a crutcy macro defined in ucrt/stddef.h. - # The latter can not be used in constexpr statements. - '/D_CRT_USE_BUILTIN_OFFSETOF', - ] - if target.is_x86_64: defines.extend(('/D_WIN64', '/DWIN64')) @@ -2414,11 +2414,11 @@ class MSVCCompiler(MSVC, Compiler): MSVC_INLINE_FLAG=/Zc:inline- }''') - flags = [ - '/nologo', '/Zm500', '/GR', '/bigobj', '/FC', '/EHs', '/errorReport:prompt', '$MSVC_INLINE_FLAG', '/utf-8', - # enable standard conforming mode - '/permissive-' - ] + flags = [ + '/nologo', '/Zm500', '/GR', '/bigobj', '/FC', '/EHs', '/errorReport:prompt', '$MSVC_INLINE_FLAG', '/utf-8', + # enable standard conforming mode + '/permissive-' + ] flags += self.tc.arch_opt c_warnings = ['/we{}'.format(code) for code in warns_as_error] @@ -2430,20 +2430,20 @@ class MSVCCompiler(MSVC, Compiler): flags_release = ['/Ox', '/Ob2', '/Oi', '/DNDEBUG'] flags_c_only = [] - cxx_flags = [ - # Provide proper __cplusplus value - # https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/ - "/Zc:__cplusplus" - ] + cxx_flags = [ + # Provide proper __cplusplus value + # https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/ + "/Zc:__cplusplus" + ] if self.tc.use_clang: - flags += [ - # Allow <windows.h> to be included via <Windows.h> in case-sensitive file-systems. - '-fcase-insensitive-paths', - # Enable standard-conforming behavior and generate duplicate symbol error in case of duplicated global constants. - # See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85678#c0 - '-fno-common', - ] + flags += [ + # Allow <windows.h> to be included via <Windows.h> in case-sensitive file-systems. + '-fcase-insensitive-paths', + # Enable standard-conforming behavior and generate duplicate symbol error in case of duplicated global constants. + # See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85678#c0 + '-fno-common', + ] if target.is_x86: flags.append('-m32') if target.is_x86_64: @@ -2476,7 +2476,7 @@ class MSVCCompiler(MSVC, Compiler): )) cxx_warnings += [ - '-Woverloaded-virtual', + '-Woverloaded-virtual', '-Wno-register', # IGNIETFERRO-722 needed for contrib '-Wimport-preprocessor-directive-pedantic', '-Wno-undefined-var-template', @@ -2696,28 +2696,28 @@ class MSVCLinker(MSVC, Linker): link_flags_lib = flags_ignore + [flag_machine] stdlibs = [ - 'advapi32.lib', - 'comdlg32.lib', - 'crypt32.lib', - 'dnsapi.lib', - 'gdi32.lib', - 'iphlpapi.lib', + 'advapi32.lib', + 'comdlg32.lib', + 'crypt32.lib', + 'dnsapi.lib', + 'gdi32.lib', + 'iphlpapi.lib', 'kernel32.lib', - 'mswsock.lib', + 'mswsock.lib', 'ole32.lib', 'oleaut32.lib', - 'psapi.lib', - 'rpcrt4.lib', - 'secur32.lib', - 'shell32.lib', - 'shlwapi.lib', - 'user32.lib', - 'userenv.lib', + 'psapi.lib', + 'rpcrt4.lib', + 'secur32.lib', + 'shell32.lib', + 'shlwapi.lib', + 'user32.lib', + 'userenv.lib', 'uuid.lib', - 'version.lib', - 'winmm.lib', - 'winspool.lib', - 'ws2_32.lib', + 'version.lib', + 'winmm.lib', + 'winspool.lib', + 'ws2_32.lib', ] emit('LINK_LIB_CMD', linker_lib) |