Skip to content

Commit 8b44c82

Browse files
ydbotydbot
committed
Sync branches 251115-0051
2 parents 66eaf64 + 252fb14 commit 8b44c82

File tree

488 files changed

+83975
-66382
lines changed

Some content is hidden

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

488 files changed

+83975
-66382
lines changed

‎build/conf/compilers/gnu_compiler.conf‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -186,14 +186,17 @@ elsewhen ($CONSISTENT_DEBUG_LIGHT == "yes") {
186186
YASM_DEBUG_INFO_DISABLE_CACHE__NO_UID__=--replace=${ARCADIA_BUILD_ROOT}=/-B ${env:"YASM_TEST_SUITE=1"}
187187
}
188188

189-
when ($FORCE_CONSISTENT_BUILD == "yes") {
190-
CL_MACRO_INFO=-Wno-builtin-macro-redefined -D__DATE__=\""Jan 10 2019\"" -D__TIME__=\"00:00:00\" -fmacro-prefix-map=${ARCADIA_BUILD_ROOT}/= -fmacro-prefix-map=${ARCADIA_ROOT}/= -fmacro-prefix-map=$(TOOL_ROOT)/=
191-
}
192-
elsewhen ($CONSISTENT_BUILD == "yes") {
193-
CL_MACRO_INFO_DISABLE_CACHE__NO_UID__=-Wno-builtin-macro-redefined -D__DATE__=\""Jan 10 2019\"" -D__TIME__=\"00:00:00\" -fmacro-prefix-map=${ARCADIA_BUILD_ROOT}/= -fmacro-prefix-map=${ARCADIA_ROOT}/= -fmacro-prefix-map=$(TOOL_ROOT)/=
194-
}
195-
elsewhen ($CONSISTENT_BUILD == "no") {
196-
CL_MACRO_INFO_DISABLE_CACHE__NO_UID__=
189+
when ($HOST_OS_LINUX == "yes" || $HOST_OS_DARWIN == "yes" || $HOST_OS_WINDOWS == "yes") {
190+
# Some android toolchains using old compilers which didn't support some flags (f.e. -fmacro-prefix-map)
191+
when ($FORCE_CONSISTENT_BUILD == "yes") {
192+
CL_MACRO_INFO=-Wno-builtin-macro-redefined -D__DATE__=\""Jan 10 2019\"" -D__TIME__=\"00:00:00\" -fmacro-prefix-map=${ARCADIA_BUILD_ROOT}/= -fmacro-prefix-map=${ARCADIA_ROOT}/= -fmacro-prefix-map=$(TOOL_ROOT)/=
193+
}
194+
elsewhen ($CONSISTENT_BUILD == "yes") {
195+
CL_MACRO_INFO_DISABLE_CACHE__NO_UID__=-Wno-builtin-macro-redefined -D__DATE__=\""Jan 10 2019\"" -D__TIME__=\"00:00:00\" -fmacro-prefix-map=${ARCADIA_BUILD_ROOT}/= -fmacro-prefix-map=${ARCADIA_ROOT}/= -fmacro-prefix-map=$(TOOL_ROOT)/=
196+
}
197+
elsewhen ($CONSISTENT_BUILD == "no") {
198+
CL_MACRO_INFO_DISABLE_CACHE__NO_UID__=
199+
}
197200
}
198201

199202
_CFLAGS_ARCH_I386=

‎build/conf/go.conf‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,7 @@ GO_HOST_TARG_PARAMS=++host-os $GO_HOST_OS ++host-arch $GO_HOST_ARCH ++targ-os $G
6969

7070
# tag:go-specific
7171
GOSTD_VERSION=1.24
72-
when ($GOSTD_VERSION == "1.23") {
73-
GOSTD=contrib/go/_std_1.23/src
74-
}
75-
elsewhen ($GOSTD_VERSION == "1.24") {
72+
when ($GOSTD_VERSION == "1.24") {
7673
GOSTD=contrib/go/_std_1.24/src
7774
}
7875
elsewhen ($GOSTD_VERSION == "1.25") {

‎build/conf/java.conf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,6 +1139,7 @@ _BUILD_PROTO_JAR_SEM= \
11391139
${hide:target} ${hide:AUTO_INPUT} \
11401140
jar_proto $MODDIR $REALPRJNAME \
11411141
&& $_JAVA_PROTO_SEM \
1142+
&& $_JAVA_PROTO_PLUGINS_SEM \
11421143
&& consumer-classpath $EXPORT_GRADLE_CLASSPATH \
11431144
&& consumer-jar ${MODDIR}/${REALPRJNAME}.jar \
11441145
&& consumer-type library \

‎build/conf/proto.conf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,9 @@ macro PY_PROTO_PLUGIN2(NAME, EXT1, EXT2, TOOL, DEPS[]) {
206206
# tag:proto tag:java-specific
207207
macro _JAVA_PROTO_PLUGIN_ARGS_BASE(Name, Tool, OutParm...) {
208208
.CMD=--plugin=protoc-gen-${Name}=\${tool:"$Tool"} --${Name}_out=$ARCADIA_BUILD_ROOT/java_out
209-
.SEM=$_SEM_IGNORED
210209
}
211210

211+
_JAVA_PROTO_PLUGINS_SEM=
212212
# tag:proto tag:java-specific
213213
### @usage: JAVA_PROTO_PLUGIN(Name Tool DEPS <Dependencies>)
214214
###
@@ -218,6 +218,7 @@ macro JAVA_PROTO_PLUGIN(NAME, TOOL, DEPS[]) {
218218
SET_APPEND(JAVA_PROTO_ARGS $_JAVA_PROTO_PLUGIN_ARGS_BASE($NAME $TOOL))
219219
# XXX fix variable expansion in plugins
220220
SET(JAVA_PROTOBUF_PEERS $JAVA_PROTOBUF_PEERS $DEPS)
221+
SET_APPEND(_JAVA_PROTO_PLUGINS_SEM && proto_plugins-ITEM && proto_plugins-name $NAME && proto_plugins-bin \${tool:"$TOOL"})
221222
}
222223

223224
_ADD_SEM_PROP_IF_NON_EMPTY__CMDS=target_properties-ITEM && target_properties-name $Prop && target_properties-value $Args

‎build/conf/settings.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ CONSISTENT_DEBUG=yes
1717
CONSISTENT_BUILD=yes
1818

1919
CHECK_GLOB_RESTRICTIONS=yes
20-
MODULES_WITH_EXTENDED_GLOB_RESTRICTIONS=adv/frontend/packages/direct-modules adv/frontend/services/adfox/docs adv/frontend/services/yharnam classifieds/autoru-frontend classifieds/internal-frontend classifieds/realty-frontend cloud/docs/internal-doc-config docs/yateam/diy/external docs/yateam/diy/internal/outstaff docs/yateam/diy/internal/yandex fintech/backend-kotlin/services/mobile-views/src/test sdg/hw/embedded/pytools/ci/check_settings taxi/jotunn docs/support/marketplace docs/support/marketplace/cross-border logos/logs/md_schema docs/selfhost/alice-common/alice alice/quark/docs taxi/dmp/dwh/docs/ridetech-dwh-catalog
20+
MODULES_WITH_EXTENDED_GLOB_RESTRICTIONS=adv/frontend/packages/direct-modules adv/frontend/services/adfox/docs adv/frontend/services/yharnam classifieds/autoru-frontend classifieds/internal-frontend classifieds/realty-frontend cloud/docs/internal-doc-config docs/yateam/diy/external docs/yateam/diy/internal/outstaff docs/yateam/diy/internal/yandex fintech/backend-kotlin/services/mobile-views/src/test sdg/hw/embedded/pytools/ci/check_settings taxi/jotunn docs/support/marketplace docs/support/marketplace/cross-border logos/logs/md_schema docs/selfhost/alice-common/alice alice/quark/docs taxi/dmp/dwh/docs/ridetech-dwh-catalog docs/selfhost/alice-common/alice-gpt
2121

2222
when ($OS_WINDOWS == "yes") {
2323
USE_GLOBAL_CMD=no

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ proto_kotlin="flag"
8181
proto_kotlin_grpc="flag"
8282
proto_kotlin_grpc_version="str"
8383

84+
proto_plugins="list"
85+
proto_plugins-name="str"
86+
proto_plugins-bin="str"
87+
8488
kotlin_version="str"
8589
with_kotlin="flag"
8690
with_kotlinc_plugin_allopen="set"

‎build/export_generators/ide-gradle/protobuf.jinja‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,20 @@ protobuf {
44
// Download from repositories
55
artifact = "com.google.protobuf:protoc:{%- if target.proto_compiler_version -%}{{ target.proto_compiler_version }}{%- else -%}3.22.5{%- endif -%}"
66
}
7-
{%- if target.proto_grpc %}
7+
{%- if target.proto_grpc or target.proto_plugins|length %}
88

99
plugins {
1010
id("grpc") {
1111
artifact = "io.grpc:protoc-gen-grpc-java:{%- if target.proto_grpc_version -%}{{ target.proto_grpc_version }}{%- else -%}1.45.0{%- endif -%}"
1212
}
13+
{%- if target.proto_plugins|length -%}
14+
{%- for proto_plugin in target.proto_plugins %}
15+
create("{{ proto_plugin.name }}") {
16+
path = {{ PatchRoots(proto_plugin.bin, true) }}
17+
rules
18+
}
19+
{%- endfor -%}
20+
{%- endif -%}
1321
{%- if target.proto_kotlin_grpc %}
1422
id("grpckt") {
1523
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"
@@ -18,18 +26,27 @@ protobuf {
1826
}
1927
{%- endif %}
2028

21-
{%- if target.proto_kotlin or target.proto_grpc %}
29+
{%- if target.proto_kotlin or target.proto_grpc or target.proto_plugins|length %}
2230

2331
generateProtoTasks {
2432
all().forEach {
25-
{%- if target.proto_grpc %}
33+
{%- if target.proto_grpc or target.proto_plugins|length %}
2634
it.plugins {
35+
{%- if target.proto_grpc %}
2736
id("grpc")
37+
{%- endif -%}
2838
{%- if target.proto_kotlin_grpc %}
2939
id("grpckt")
40+
{%- endif -%}
41+
{%- if target.proto_plugins|length -%}
42+
{%- for proto_plugin in target.proto_plugins %}
43+
create("{{ proto_plugin.name }}") {
44+
outputSubDir = "java"
45+
}
46+
{%- endfor -%}
3047
{%- endif %}
3148
}
32-
{%- endif %}
49+
{%- endif -%}
3350
{%- if target.proto_kotlin or target.proto_kotlin_grpc %}
3451
it.builtins {
3552
create("kotlin")

‎build/export_generators/ide-gradle/vars.jinja‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
{%- set with_lombok_plugin = not(disable_lombok_plugin) and (all_targets|selectattr('use_annotation_processor')|map(attribute='use_annotation_processor')|sum|select('startsWith', 'contrib/java/org/projectlombok/lombok')|length) -%}
3737

3838
{#- JNI -#}
39-
{%- set jnis = all_targets|selectattr(consumer)|map(attribute='consumer')|sum|selectattr('type', 'eq', 'dll')|selectattr('jar')|map(attribute='jar')|unique -%}
39+
{%- set jnis = all_targets|selectattr('consumer')|map(attribute='consumer')|sum|selectattr('type', 'eq', 'dll')|selectattr('jar')|map(attribute='jar')|unique -%}
4040

4141
{#- Flags -#}
4242
{%- set hasResources = all_targets|selectattr('resource_sets')|map(attribute='resource_sets')|sum|length -%}

‎build/external_resources/go_tools/ya.make‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ RESOURCES_LIBRARY()
22

33
TOOLCHAIN(go)
44

5-
IF(GOSTD_VERSION == 1.23)
6-
VERSION(1.23)
7-
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(GO_TOOLS go1.23.json)
8-
ELSEIF(GOSTD_VERSION == 1.24)
5+
IF(GOSTD_VERSION == 1.24)
96
VERSION(1.24)
107
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(GO_TOOLS go1.24.json)
118
ELSEIF(GOSTD_VERSION == 1.25)

‎build/mapping.conf.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,7 @@
469469
"10190826595": "{registry_endpoint}/10190826595",
470470
"10239299149": "{registry_endpoint}/10239299149",
471471
"10249271468": "{registry_endpoint}/10249271468",
472+
"10263969520": "{registry_endpoint}/10263969520",
472473
"5486713852": "{registry_endpoint}/5486713852",
473474
"5514352253": "{registry_endpoint}/5514352253",
474475
"5523579199": "{registry_endpoint}/5523579199",
@@ -2297,6 +2298,7 @@
22972298
"10190826595": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
22982299
"10239299149": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
22992300
"10249271468": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
2301+
"10263969520": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
23002302
"5486713852": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
23012303
"5514352253": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
23022304
"5523579199": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",

0 commit comments

Comments
 (0)