Skip to content

Commit 23387aa

Browse files
maximyurchukmaximyurchuk
committed
Merge branch 'rightlib' into mergelibs-yurchuk-manual
2 parents ee51155 + 4ab2331 commit 23387aa

File tree

557 files changed

+14996
-4242
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

557 files changed

+14996
-4242
lines changed

‎build/conf/compilers/gnu_compiler.conf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,16 @@ when ($CLANG16 == "yes") {
6868
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
6969
}
7070

71+
when ($CLANG18 == "yes") {
72+
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
73+
CFLAGS+=-Wno-deprecated-this-capture -Wno-c++11-narrowing-const-reference -Wno-missing-field-initializers \
74+
-Wno-packed-non-pod -Wno-format -Wno-vla-cxx-extension -Wno-invalid-offsetof -Wno-exceptions \
75+
-Wno-include-angled-in-module-purview -Wno-unused-parameter
76+
when ($MAPSMOBI_BUILD_TARGET == "yes") {
77+
CFLAGS+=-Wno-deprecated-declarations
78+
}
79+
}
80+
7181
when ($MSAN_TRACK_ORIGIN == "yes") {
7282
CFLAGS+=-fsanitize-memory-track-origins=2
7383
}

‎build/conf/java.conf

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,15 +1747,12 @@ when ($SAVE_JAVAC_GENERATED_SRCS) {
17471747
}
17481748

17491749
# tag:java-specific
1750-
# TODO: MAVEN_GROUP_ID_VALUE is only used by jbuild remove it after YMAKE-45 and YMAKE-46
1751-
MAVEN_GROUP_ID_VALUE=
17521750
MAVEN_EXPORT_GROUP_ID=ru.yandex
17531751
### @usage: MAVEN_GROUP_ID(group_id_for_maven_export)
17541752
###
17551753
### Set maven export group id for JAVA_PROGRAM() and JAVA_LIBRARY().
17561754
### Have no effect on regular build.
17571755
macro MAVEN_GROUP_ID(Arg, VERSION="no") {
1758-
SET(MAVEN_GROUP_ID_VALUE $Arg)
17591756
SET(MAVEN_EXPORT_GROUP_ID $Arg)
17601757
SET(PUBLISH_MAVEN_VERSION $VERSION)
17611758
}
@@ -1893,15 +1890,6 @@ macro WITH_KAPT() {
18931890
SET(WITH_KAPT_VALUE yes)
18941891
}
18951892

1896-
# tag:java-specific
1897-
WITH_GROOVY_VALUE=
1898-
### @usage: WITH_GROOVY()
1899-
###
1900-
### Compile groovy source code in this java module
1901-
macro WITH_GROOVY() {
1902-
SET(WITH_GROOVY_VALUE yes)
1903-
}
1904-
19051893
# tag:kotlin-specific
19061894
KOTLINC_FLAGS_VALUE=-Xjvm-default=all
19071895
### @usage: KOTLINC_FLAGS(-flags)
@@ -1982,12 +1970,12 @@ macro WITH_KOTLINC_DETEKT(Options...) {
19821970
_KOTLIN_VERSION=1.9.24
19831971
KOTLIN_VERSION=1.9.24
19841972
KOTLIN_BOM_FILE=${ARCADIA_ROOT}/contrib/java/org/jetbrains/kotlin/kotlin-bom/1.9.24/ya.dependency_management.inc
1985-
GROOVY_VERSION=3.0.5
19861973
DETEKT_VERSION=1.23.7
19871974

19881975
_KOTLIN_SEM= \
19891976
${_WITH_KOTLIN_SEM} \
19901977
${_KOTLIN_VERSION_SEM} \
1978+
${_WITH_KOTLIN_GRPC_SEM} \
19911979
${_WITH_KOTLINC_PLUGIN_ALLOPEN_SEM} \
19921980
${_WITH_KOTLINC_PLUGIN_LOMBOK_SEM} \
19931981
${_WITH_KOTLINC_PLUGIN_NOARG_SEM} \

‎build/conf/project_specific/yql_udf.conf

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,45 +36,45 @@ macro UDF_NO_PROBE() {
3636
module YQL_UDF_TEST: PY3TEST_BIN {
3737
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
3838

39-
PEERDIR(contrib/ydb/library/yql/tests/common/udf_test)
39+
PEERDIR($YQL_BASE_TEST_DIR/tests/common/udf_test)
4040

4141
DEPENDS(yql/essentials/tools/astdiff)
42-
DEPENDS(contrib/ydb/library/yql/tools/yqlrun)
42+
DEPENDS($YQL_BASE_TEST_DIR/tools/yqlrun)
4343
DEPENDS(yql/essentials/tools/udf_resolver)
4444
DATA(arcadia/yql/essentials/mount)
45-
DATA(arcadia/contrib/ydb/library/yql/cfg/udf_test)
45+
DATA(arcadia/$YQL_BASE_TEST_DIR/cfg/udf_test)
4646
ENV(YQL_ASTDIFF_PATH="yql/essentials/tools/astdiff/astdiff")
47-
ENV(YQL_CONFIG_DIR="contrib/ydb/library/yql/cfg/udf_test")
48-
ENV(YQL_YQLRUN_PATH="contrib/ydb/library/yql/tools/yqlrun/yqlrun")
47+
ENV(YQL_CONFIG_DIR="$YQL_BASE_TEST_DIR/cfg/udf_test")
48+
ENV(YQL_YQLRUN_PATH="$YQL_BASE_TEST_DIR/tools/yqlrun/yqlrun")
4949
ENV(YQL_SQL2YQL_PATH="yql/essentials/tools/sql2yql/sql2yql")
5050
ENV(YQL_UDFRESOLVER_PATH="yql/essentials/tools/udf_resolver/udf_resolver")
5151
}
5252

5353
module YQL_UDF_YDB_TEST: PY3TEST_BIN {
5454
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
5555

56-
PEERDIR(ydb/library/yql/tests/common/udf_test)
56+
PEERDIR($YQL_BASE_TEST_DIR/tests/common/udf_test)
5757

5858
DEPENDS(yql/essentials/tools/astdiff)
59-
DEPENDS(ydb/library/yql/tools/yqlrun)
59+
DEPENDS($YQL_BASE_TEST_DIR/tools/yqlrun)
6060
DEPENDS(yql/essentials/tools/udf_resolver)
6161
DATA(arcadia/yql/essentials/mount)
62-
DATA(arcadia/ydb/library/yql/cfg/udf_test)
62+
DATA(arcadia/$YQL_BASE_TEST_DIR/cfg/udf_test)
6363
}
6464

6565
module YQL_UDF_TEST_CONTRIB: PY3TEST_BIN {
6666
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
6767

68-
PEERDIR(ydb/library/yql/tests/common/udf_test)
68+
PEERDIR($YQL_BASE_TEST_DIR/tests/common/udf_test)
6969

7070
DEPENDS(yql/essentials/tools/astdiff)
71-
DEPENDS(ydb/library/yql/tools/yqlrun)
71+
DEPENDS($YQL_BASE_TEST_DIR/tools/yqlrun)
7272
DEPENDS(yql/essentials/tools/udf_resolver)
7373
DATA(arcadia/yql/essentials/mount)
74-
DATA(arcadia/ydb/library/yql/cfg/udf_test)
74+
DATA(arcadia/$YQL_BASE_TEST_DIR/cfg/udf_test)
7575
ENV(YQL_ASTDIFF_PATH="yql/essentials/tools/astdiff/astdiff")
76-
ENV(YQL_CONFIG_DIR="ydb/library/yql/cfg/udf_test")
77-
ENV(YQL_YQLRUN_PATH="ydb/library/yql/tools/yqlrun/yqlrun")
76+
ENV(YQL_CONFIG_DIR="$YQL_BASE_TEST_DIR/cfg/udf_test")
77+
ENV(YQL_YQLRUN_PATH="$YQL_BASE_TEST_DIR/tools/yqlrun/yqlrun")
7878
ENV(YQL_SQL2YQL_PATH="yql/essentials/tools/sql2yql/sql2yql")
7979
ENV(YQL_UDFRESOLVER_PATH="yql/essentials/tools/udf_resolver/udf_resolver")
8080
}

‎build/conf/proto.conf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,14 @@ macro _ADD_SEM_PROP_IF_NON_EMPTY(Prop, Args...) {
199199
}
200200

201201
# tag:proto tag:java-specific
202+
_WITH_KOTLIN_GRPC_SEM=
202203
macro WITH_KOTLIN_GRPC() {
203204
ENABLE(KOTLIN_PROTO)
204205
PEERDIR(build/platform/java/kotlin_grpc)
205-
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)
206-
SET(JAVA_PROTOBUF_PEERS $JAVA_PROTOBUF_PEERS contrib/java/io/grpc/grpc-kotlin-stub/1.3.1)
206+
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)
207+
SET(JAVA_PROTOBUF_PEERS $JAVA_PROTOBUF_PEERS contrib/java/io/grpc/grpc-kotlin-stub/$KOTLIN_GRPC_VERSION)
207208
SET(JAVA_PROTOBUF_PEERS $JAVA_PROTOBUF_PEERS contrib/java/com/google/protobuf/protobuf-kotlin/${JAVA_PROTO_RUNTIME_VERSION})
209+
SET(_WITH_KOTLIN_GRPC_SEM && proto_kotlin_grpc && proto_kotlin_grpc_version ${KOTLIN_GRPC_VERSION})
208210
}
209211

210212

@@ -477,6 +479,7 @@ JAVA_PROTO_COMPILER_VERSION = 3.25.3
477479
JAVA_PROTO_RUNTIME_VERSION = 3.25.3
478480
JAVA_PROTO_COMMON_VERSION = 2.9.0
479481
JAVA_GRPC_VERSION = 1.51.0
482+
KOTLIN_GRPC_VERSION = 1.3.1
480483
JAVA_NETTY_NETTY_VERSION = 4.1.79.Final
481484
KOTLIN_PROTO=no
482485
KOTLIN_PROTO_PEERS=

‎build/config/tests/cpp_style/a.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
service: arcadia-unassigned
2+
title: clang-format default config
3+
4+
arcanum:
5+
review:
6+
auto_assign: true
7+
groups:
8+
- name: cppcommittee
9+
roles: cppcommittee:consultant
10+
rules:
11+
- subpaths: "config.clang-format"
12+
reviewers:
13+
- name: cppcommittee
14+
assign: 1
15+
ship: 0
16+
min_approvers_count: 1

‎build/config/tests/cpp_style/default_configs.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"clang_format": "build/config/tests/cpp_style/config.clang-format"
3+
}

‎build/export_generators/cmake/cmake/common.cmake

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ endfunction()
193193
function(resources Tgt Output)
194194
set(opts "")
195195
set(oneval_args "")
196-
set(multival_args INPUTS KEYS)
196+
set(multival_args INPUTS KEYS OPTS)
197197
cmake_parse_arguments(RESOURCE_ARGS
198198
"${opts}"
199199
"${oneval_args}"
@@ -212,12 +212,20 @@ function(resources Tgt Output)
212212
list(APPEND ResourcesList ${Input})
213213
list(APPEND ResourcesList ${Key})
214214
endforeach()
215+
list(LENGTH RESOURCE_ARGS_OPTS OptsCount)
216+
if (${OptsCount} GREATER 0)
217+
math(EXPR ListsMaxIdx "${OptsCount} - 1")
218+
foreach(Idx RANGE ${ListsMaxIdx})
219+
list(GET RESOURCE_ARGS_OPTS ${Idx} Opt)
220+
list(APPEND OptsList ${Opt})
221+
endforeach()
222+
endif()
215223

216224
get_built_tool_path(rescompiler_bin rescompiler_dependency tools/rescompiler/bin rescompiler)
217225

218226
add_custom_command(
219227
OUTPUT ${Output}
220-
COMMAND ${rescompiler_bin} ${Output} ${ResourcesList}
228+
COMMAND ${rescompiler_bin} ${Output} ${ResourcesList} ${OptsList}
221229
DEPENDS ${RESOURCE_ARGS_INPUTS} ${rescompiler_dependency}
222230
)
223231
endfunction()

‎build/export_generators/ide-gradle/.idea/vcs.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,30 @@ protobuf {
106106
// Download from repositories
107107
artifact = "com.google.protobuf:protoc:{%- if target.proto_compiler_version -%}{{ target.proto_compiler_version }}{%- else -%}3.22.5{%- endif -%}"
108108
}
109-
{% if target.proto_grpc is defined -%}
109+
{% if target.proto_grpc -%}
110110
plugins {
111111
id("grpc") {
112112
artifact = "io.grpc:protoc-gen-grpc-java:{%- if target.proto_grpc_version -%}{{ target.proto_grpc_version }}{%- else -%}1.45.0{%- endif -%}"
113113
}
114+
{%- if target.proto_kotlin_grpc %}
115+
id("grpckt") {
116+
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"
117+
}
118+
{% endif -%}
114119
}
115120
generateProtoTasks {
116121
all().forEach {
117122
it.plugins {
118123
id("grpc")
124+
{%- if target.proto_kotlin_grpc %}
125+
id("grpckt")
126+
{% endif -%}
127+
}
128+
{%- if target.proto_kotlin_grpc %}
129+
it.builtins {
130+
create("kotlin")
119131
}
132+
{% endif -%}
120133
}
121134
}
122135
{%- endif %}

‎build/export_generators/ide-gradle/generator.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ copy=[
88
"gradlew.bat",
99
"gradle/wrapper/gradle-wrapper.jar",
1010
"gradle/wrapper/gradle-wrapper.properties",
11-
".idea/vcs.xml",
1211
]
1312

1413
[targets.EXTRA_ONLY]
@@ -43,6 +42,8 @@ proto_common_version="str"
4342

4443
proto_grpc="flag"
4544
proto_grpc_version="str"
45+
proto_kotlin_grpc="flag"
46+
proto_kotlin_grpc_version="str"
4647

4748
kotlin_version="str"
4849
with_kotlin="flag"

0 commit comments

Comments
 (0)