Merge pull request #11568 from maximyurchuk/mergelibs-yurchuk-manual

Mergelibs yurchuk manual

build/conf/autoincludes.json

@@ -0,0 +1,5 @@
+[
+    "library/cpp/geo",
+    "util"
+]
+

build/conf/compilers/gnu_compiler.conf

@@ -68,6 +68,16 @@ when ($CLANG16 == "yes") {
     CFLAGS+=-Wno-array-parameter -Wno-deprecate-lax-vec-conv-all -Wno-unqualified-std-cast-call -Wno-unused-but-set-parameter -Wno-implicit-function-declaration -Wno-int-conversion -Wno-incompatible-function-pointer-types -Wno-address-of-packed-member
 }
 
+when ($CLANG18 == "yes") {
+    CFLAGS+=-Wno-array-parameter -Wno-deprecate-lax-vec-conv-all -Wno-unqualified-std-cast-call -Wno-unused-but-set-parameter -Wno-implicit-function-declaration -Wno-int-conversion -Wno-incompatible-function-pointer-types -Wno-address-of-packed-member
+    CFLAGS+=-Wno-deprecated-this-capture -Wno-c++11-narrowing-const-reference -Wno-missing-field-initializers \
+            -Wno-packed-non-pod -Wno-format -Wno-vla-cxx-extension -Wno-invalid-offsetof -Wno-exceptions \
+            -Wno-include-angled-in-module-purview -Wno-unused-parameter
+    when ($MAPSMOBI_BUILD_TARGET == "yes") {
+        CFLAGS+=-Wno-deprecated-declarations
+    }
+}
+
 when ($MSAN_TRACK_ORIGIN == "yes") {
     CFLAGS+=-fsanitize-memory-track-origins=2
 }

build/conf/java.conf

@@ -1747,15 +1747,12 @@ when ($SAVE_JAVAC_GENERATED_SRCS) {
 }
 
 # tag:java-specific
-# TODO: MAVEN_GROUP_ID_VALUE is only used by jbuild remove it after YMAKE-45 and YMAKE-46
-MAVEN_GROUP_ID_VALUE=
 MAVEN_EXPORT_GROUP_ID=ru.yandex
 ### @usage: MAVEN_GROUP_ID(group_id_for_maven_export)
 ###
 ### Set maven export group id for JAVA_PROGRAM() and JAVA_LIBRARY().
 ### Have no effect on regular build.
 macro MAVEN_GROUP_ID(Arg, VERSION="no") {
-    SET(MAVEN_GROUP_ID_VALUE $Arg)
     SET(MAVEN_EXPORT_GROUP_ID $Arg)
     SET(PUBLISH_MAVEN_VERSION $VERSION)
 }
@@ -1893,15 +1890,6 @@ macro WITH_KAPT() {
     SET(WITH_KAPT_VALUE yes)
 }
 
-# tag:java-specific
-WITH_GROOVY_VALUE=
-### @usage: WITH_GROOVY()
-###
-### Compile groovy source code in this java module
-macro WITH_GROOVY() {
-    SET(WITH_GROOVY_VALUE yes)
-}
-
 # tag:kotlin-specific
 KOTLINC_FLAGS_VALUE=-Xjvm-default=all
 ### @usage: KOTLINC_FLAGS(-flags)
@@ -1982,12 +1970,12 @@ macro WITH_KOTLINC_DETEKT(Options...) {
 _KOTLIN_VERSION=1.9.24
 KOTLIN_VERSION=1.9.24
 KOTLIN_BOM_FILE=${ARCADIA_ROOT}/contrib/java/org/jetbrains/kotlin/kotlin-bom/1.9.24/ya.dependency_management.inc
-GROOVY_VERSION=3.0.5
 DETEKT_VERSION=1.23.7
 
 _KOTLIN_SEM= \
     ${_WITH_KOTLIN_SEM} \
     ${_KOTLIN_VERSION_SEM} \
+    ${_WITH_KOTLIN_GRPC_SEM} \
     ${_WITH_KOTLINC_PLUGIN_ALLOPEN_SEM} \
     ${_WITH_KOTLINC_PLUGIN_LOMBOK_SEM} \
     ${_WITH_KOTLINC_PLUGIN_NOARG_SEM} \

build/conf/project_specific/yql_udf.conf

@@ -36,45 +36,45 @@ macro UDF_NO_PROBE() {
 module YQL_UDF_TEST: PY3TEST_BIN {
     SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
 
-    PEERDIR(contrib/ydb/library/yql/tests/common/udf_test)
+    PEERDIR($YQL_BASE_TEST_DIR/tests/common/udf_test)
 
     DEPENDS(yql/essentials/tools/astdiff)
-    DEPENDS(contrib/ydb/library/yql/tools/yqlrun)
+    DEPENDS($YQL_BASE_TEST_DIR/tools/yqlrun)
     DEPENDS(yql/essentials/tools/udf_resolver)
     DATA(arcadia/yql/essentials/mount)
-    DATA(arcadia/contrib/ydb/library/yql/cfg/udf_test)
+    DATA(arcadia/$YQL_BASE_TEST_DIR/cfg/udf_test)
     ENV(YQL_ASTDIFF_PATH="yql/essentials/tools/astdiff/astdiff")
-    ENV(YQL_CONFIG_DIR="contrib/ydb/library/yql/cfg/udf_test")
-    ENV(YQL_YQLRUN_PATH="contrib/ydb/library/yql/tools/yqlrun/yqlrun")
+    ENV(YQL_CONFIG_DIR="$YQL_BASE_TEST_DIR/cfg/udf_test")
+    ENV(YQL_YQLRUN_PATH="$YQL_BASE_TEST_DIR/tools/yqlrun/yqlrun")
     ENV(YQL_SQL2YQL_PATH="yql/essentials/tools/sql2yql/sql2yql")
     ENV(YQL_UDFRESOLVER_PATH="yql/essentials/tools/udf_resolver/udf_resolver")
 }
 
 module YQL_UDF_YDB_TEST: PY3TEST_BIN {
     SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
 
-    PEERDIR(ydb/library/yql/tests/common/udf_test)
+    PEERDIR($YQL_BASE_TEST_DIR/tests/common/udf_test)
 
     DEPENDS(yql/essentials/tools/astdiff)
-    DEPENDS(ydb/library/yql/tools/yqlrun)
+    DEPENDS($YQL_BASE_TEST_DIR/tools/yqlrun)
     DEPENDS(yql/essentials/tools/udf_resolver)
     DATA(arcadia/yql/essentials/mount)
-    DATA(arcadia/ydb/library/yql/cfg/udf_test)
+    DATA(arcadia/$YQL_BASE_TEST_DIR/cfg/udf_test)
 }
 
 module YQL_UDF_TEST_CONTRIB: PY3TEST_BIN {
     SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
 
-    PEERDIR(ydb/library/yql/tests/common/udf_test)
+    PEERDIR($YQL_BASE_TEST_DIR/tests/common/udf_test)
 
     DEPENDS(yql/essentials/tools/astdiff)
-    DEPENDS(ydb/library/yql/tools/yqlrun)
+    DEPENDS($YQL_BASE_TEST_DIR/tools/yqlrun)
     DEPENDS(yql/essentials/tools/udf_resolver)
     DATA(arcadia/yql/essentials/mount)
-    DATA(arcadia/ydb/library/yql/cfg/udf_test)
+    DATA(arcadia/$YQL_BASE_TEST_DIR/cfg/udf_test)
     ENV(YQL_ASTDIFF_PATH="yql/essentials/tools/astdiff/astdiff")
-    ENV(YQL_CONFIG_DIR="ydb/library/yql/cfg/udf_test")
-    ENV(YQL_YQLRUN_PATH="ydb/library/yql/tools/yqlrun/yqlrun")
+    ENV(YQL_CONFIG_DIR="$YQL_BASE_TEST_DIR/cfg/udf_test")
+    ENV(YQL_YQLRUN_PATH="$YQL_BASE_TEST_DIR/tools/yqlrun/yqlrun")
     ENV(YQL_SQL2YQL_PATH="yql/essentials/tools/sql2yql/sql2yql")
     ENV(YQL_UDFRESOLVER_PATH="yql/essentials/tools/udf_resolver/udf_resolver")
 }

build/conf/proto.conf

@@ -199,12 +199,14 @@ macro _ADD_SEM_PROP_IF_NON_EMPTY(Prop, Args...) {
 }
 
 # tag:proto tag:java-specific
+_WITH_KOTLIN_GRPC_SEM=
 macro WITH_KOTLIN_GRPC() {
     ENABLE(KOTLIN_PROTO)
     PEERDIR(build/platform/java/kotlin_grpc)
-    SET_APPEND(JAVA_PROTO_ARGS ${env:"JAVA_HOME=${JDK_RESOURCE}"} ${env:"KOTLIN_GRPC_JAR=${KOTLIN_GRPC_RESOURCE_GLOBAL}/grpc_kotlin/protoc-gen-grpc-kotlin-1.3.1.jar"} --plugin=protoc-gen-kotlin_grpc=${KOTLIN_GRPC_RESOURCE_GLOBAL}/grpc_kotlin/grpc_kotlin --kotlin_grpc_out=$ARCADIA_BUILD_ROOT/java_out)
-    SET(JAVA_PROTOBUF_PEERS $JAVA_PROTOBUF_PEERS contrib/java/io/grpc/grpc-kotlin-stub/1.3.1)
+    SET_APPEND(JAVA_PROTO_ARGS ${env:"JAVA_HOME=${JDK_RESOURCE}"} ${env:"KOTLIN_GRPC_JAR=${KOTLIN_GRPC_RESOURCE_GLOBAL}/grpc_kotlin/protoc-gen-grpc-kotlin-${KOTLIN_GRPC_VERSION}.jar"} --plugin=protoc-gen-kotlin_grpc=${KOTLIN_GRPC_RESOURCE_GLOBAL}/grpc_kotlin/grpc_kotlin --kotlin_grpc_out=$ARCADIA_BUILD_ROOT/java_out)
+    SET(JAVA_PROTOBUF_PEERS $JAVA_PROTOBUF_PEERS contrib/java/io/grpc/grpc-kotlin-stub/$KOTLIN_GRPC_VERSION)
     SET(JAVA_PROTOBUF_PEERS $JAVA_PROTOBUF_PEERS contrib/java/com/google/protobuf/protobuf-kotlin/${JAVA_PROTO_RUNTIME_VERSION})
+    SET(_WITH_KOTLIN_GRPC_SEM && proto_kotlin_grpc && proto_kotlin_grpc_version ${KOTLIN_GRPC_VERSION})
 }
 
 
@@ -477,6 +479,7 @@ JAVA_PROTO_COMPILER_VERSION = 3.25.3
 JAVA_PROTO_RUNTIME_VERSION = 3.25.3
 JAVA_PROTO_COMMON_VERSION = 2.9.0
 JAVA_GRPC_VERSION = 1.51.0
+KOTLIN_GRPC_VERSION = 1.3.1
 JAVA_NETTY_NETTY_VERSION = 4.1.79.Final
 KOTLIN_PROTO=no
 KOTLIN_PROTO_PEERS=

build/conf/python.conf

@@ -833,7 +833,7 @@ macro NO_PYTHON_INCLUDES() {
 macro PYTHON2_ADDINCL() {
     _PYTHON_ADDINCL()
     SET(MODULE_TAG PY2_NATIVE)
-    SET(PEERDIR_TAGS CPP_PROTO CPP_FBS PY2_NATIVE YQL_UDF_STATIC __EMPTY__ RESOURCE_LIB DLL_LIB)
+    SET(PEERDIR_TAGS CPP_PROTO CPP_FBS CPP_ROS PY2_NATIVE YQL_UDF_STATIC __EMPTY__ RESOURCE_LIB DLL_LIB)
 }
 
 # tag:python-specific tag:internal
@@ -881,7 +881,7 @@ macro _PYTHON_ADDINCL() {
 macro PYTHON3_ADDINCL() {
     _PYTHON3_ADDINCL()
     SET(MODULE_TAG PY3_NATIVE)
-    SET(PEERDIR_TAGS CPP_PROTO CPP_FBS PY3_NATIVE YQL_UDF_STATIC __EMPTY__ RESOURCE_LIB DLL_LIB)
+    SET(PEERDIR_TAGS CPP_PROTO CPP_FBS CPP_ROS PY3_NATIVE YQL_UDF_STATIC __EMPTY__ RESOURCE_LIB DLL_LIB)
 }
 
 # tag:python-specific tag:internal
@@ -929,7 +929,7 @@ macro _PYTHON3_ADDINCL() {
 ### @see: [PY2_LIBRARY](#module_PY2_LIBRARY), [PY3_LIBRARY](#module_PY3_LIBRARY), [PY23_LIBRARY](#multimodule_PY23_LIBRARY)
 macro USE_PYTHON2() {
     _ARCADIA_PYTHON_ADDINCL()
-    SET(PEERDIR_TAGS PY2 PY2_NATIVE CPP_PROTO CPP_FBS YQL_UDF_STATIC __EMPTY__ RESOURCE_LIB DLL_LIB)
+    SET(PEERDIR_TAGS PY2 PY2_NATIVE CPP_PROTO CPP_FBS CPP_ROS YQL_UDF_STATIC __EMPTY__ RESOURCE_LIB DLL_LIB)
     PEERDIR(contrib/libs/python)
 }
 
@@ -946,7 +946,7 @@ macro USE_PYTHON2() {
 ### @see: [PY2_LIBRARY](#module_PY2_LIBRARY), [PY3_LIBRARY](#module_PY3_LIBRARY), [PY23_LIBRARY](#multimodule_PY23_LIBRARY)
 macro USE_PYTHON3() {
     _ARCADIA_PYTHON3_ADDINCL()
-    SET(PEERDIR_TAGS PY3 PY3_BIN_LIB PY3TEST_LIBRARY PY3_NATIVE CPP_PROTO CPP_FBS YQL_UDF_STATIC __EMPTY__ RESOURCE_LIB DLL_LIB)
+    SET(PEERDIR_TAGS PY3 PY3_BIN_LIB PY3TEST_LIBRARY PY3_NATIVE CPP_PROTO CPP_FBS CPP_ROS YQL_UDF_STATIC __EMPTY__ RESOURCE_LIB DLL_LIB)
     PEERDIR(contrib/libs/python)
 
     when ($USE_ARCADIA_PYTHON == "yes") {

build/conf/settings.conf

@@ -125,3 +125,5 @@ _FOLDABLE_VARS=\
 
 ARCADIA_TEST_ROOT=../arcadia_tests_data/
 DEFAULT_REQUIREMENTS=network:restricted cpu:1 ram:32
+
+AUTOINCLUDE_PATHS=build/conf/autoincludes.json

build/config/tests/cpp_style/a.yaml

@@ -0,0 +1,16 @@
+service: arcadia-unassigned
+title: clang-format default config
+
+arcanum:
+  review:
+    auto_assign: true
+    groups:
+      - name: cppcommittee
+        roles: cppcommittee:consultant
+    rules:
+      - subpaths: "config.clang-format"
+        reviewers:
+          - name: cppcommittee
+            assign: 1
+            ship: 0
+            min_approvers_count: 1

build/config/tests/cpp_style/default_configs.json

@@ -0,0 +1,3 @@
+{
+    "clang_format": "build/config/tests/cpp_style/config.clang-format"
+}

build/export_generators/cmake/cmake/common.cmake

@@ -193,7 +193,7 @@ endfunction()
 function(resources Tgt Output)
   set(opts "")
   set(oneval_args "")
-  set(multival_args INPUTS KEYS)
+  set(multival_args INPUTS KEYS OPTS)
   cmake_parse_arguments(RESOURCE_ARGS
     "${opts}"
     "${oneval_args}"
@@ -212,12 +212,20 @@ function(resources Tgt Output)
     list(APPEND ResourcesList ${Input})
     list(APPEND ResourcesList ${Key})
   endforeach()
+  list(LENGTH RESOURCE_ARGS_OPTS OptsCount)
+  if (${OptsCount} GREATER 0)
+    math(EXPR ListsMaxIdx "${OptsCount} - 1")
+    foreach(Idx RANGE ${ListsMaxIdx})
+      list(GET RESOURCE_ARGS_OPTS ${Idx} Opt)
+      list(APPEND OptsList ${Opt})
+    endforeach()
+  endif()
 
   get_built_tool_path(rescompiler_bin rescompiler_dependency tools/rescompiler/bin rescompiler)
 
   add_custom_command(
     OUTPUT ${Output}
-    COMMAND ${rescompiler_bin} ${Output} ${ResourcesList}
+    COMMAND ${rescompiler_bin} ${Output} ${ResourcesList} ${OptsList}
     DEPENDS ${RESOURCE_ARGS_INPUTS} ${rescompiler_dependency}
   )
 endfunction()

build/export_generators/ide-gradle/build.gradle.kts.proto.jinja

@@ -106,17 +106,30 @@ protobuf {
         // Download from repositories
         artifact = "com.google.protobuf:protoc:{%- if target.proto_compiler_version -%}{{ target.proto_compiler_version }}{%- else -%}3.22.5{%- endif -%}"
     }
-{%  if target.proto_grpc is defined -%}
+{%  if target.proto_grpc -%}
     plugins {
         id("grpc") {
             artifact = "io.grpc:protoc-gen-grpc-java:{%- if target.proto_grpc_version -%}{{ target.proto_grpc_version }}{%- else -%}1.45.0{%- endif -%}"
         }
+{%-     if target.proto_kotlin_grpc %}
+        id("grpckt") {
+            artifact = "io.grpc:protoc-gen-grpc-kotlin:{%- if target.proto_kotlin_grpc_version -%}{{ target.proto_kotlin_grpc_version }}{%- else -%}1.3.1{%- endif -%}:jdk8@jar"
+        }
+{%      endif -%}
     }
     generateProtoTasks {
         all().forEach {
             it.plugins {
                 id("grpc")
+{%-     if target.proto_kotlin_grpc %}
+                id("grpckt")
+{%      endif -%}
+            }
+{%-     if target.proto_kotlin_grpc %}
+            it.builtins {
+                create("kotlin")
             }
+{%      endif -%}
         }
     }
 {%- endif %}

build/export_generators/ide-gradle/generator.toml

@@ -8,7 +8,6 @@ copy=[
     "gradlew.bat",
     "gradle/wrapper/gradle-wrapper.jar",
     "gradle/wrapper/gradle-wrapper.properties",
-    ".idea/vcs.xml",
 ]
 
 [targets.EXTRA_ONLY]
@@ -43,6 +42,8 @@ proto_common_version="str"
 
 proto_grpc="flag"
 proto_grpc_version="str"
+proto_kotlin_grpc="flag"
+proto_kotlin_grpc_version="str"
 
 kotlin_version="str"
 with_kotlin="flag"

build/external_resources/ymake/public.resources.json

@@ -1,19 +1,19 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:7386587280"
+            "uri": "sbr:7448914799"
         },
         "darwin-arm64": {
-            "uri": "sbr:7386586845"
+            "uri": "sbr:7448913101"
         },
         "linux": {
-            "uri": "sbr:7386588080"
+            "uri": "sbr:7448917907"
         },
         "linux-aarch64": {
-            "uri": "sbr:7386586293"
+            "uri": "sbr:7448911598"
         },
         "win32-clang-cl": {
-            "uri": "sbr:7386587719"
+            "uri": "sbr:7448916360"
         }
     }
 }

build/external_resources/ymake/resources.json

@@ -1,19 +1,19 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:7386590256"
+            "uri": "sbr:7448934371"
         },
         "darwin-arm64": {
-            "uri": "sbr:7386589520"
+            "uri": "sbr:7448932013"
         },
         "linux": {
-            "uri": "sbr:7386591470"
+            "uri": "sbr:7448940645"
         },
         "linux-aarch64": {
-            "uri": "sbr:7386588954"
+            "uri": "sbr:7448930170"
         },
         "win32-clang-cl": {
-            "uri": "sbr:7386590846"
+            "uri": "sbr:7448936966"
         }
     }
 }