Skip to content

Commit a703d86

Browse files
ydbotydbot
committed
Sync branches 251021-0051
2 parents 51b6652 + 1138a2b commit a703d86

File tree

390 files changed

+6094
-5146
lines changed

Some content is hidden

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

390 files changed

+6094
-5146
lines changed

‎build/conf/compilers/gnu_compiler.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ _COMPILER_TIME_TRACE_FLAGS=
227227
_COMPILER_TIME_TRACE_POSTPROCESS=
228228
when (($TIME_TRACE == "yes" || $COMPILER_TIME_TRACE == "yes") && $_HAS_TIME_TRACE == "yes") {
229229
_COMPILER_TIME_TRACE_FLAGS=-ftime-trace -ftime-trace-granularity=$_COMPILER_TIME_TRACE_GRANULARITY
230-
_COMPILER_TIME_TRACE_POSTPROCESS=$YMAKE_PYTHON ${input:"build/scripts/find_time_trace.py"} $_COMPILE_OUTPUTS $_COMPILE_TIME_TRACE_OUTPUTS
230+
_COMPILER_TIME_TRACE_POSTPROCESS=$YMAKE_PYTHON3 ${input:"build/scripts/find_time_trace.py"} $_COMPILE_OUTPUTS $_COMPILE_TIME_TRACE_OUTPUTS
231231
}
232232

233233
_C_CPP_KV_STYLE=${hide;kv:"p CC"} ${hide;kv:"pc green"}

‎build/conf/go.conf‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ elsewhen ($OS_DARWIN) {
4242
elsewhen ($OS_WINDOWS) {
4343
GO_TARG_OS=windows
4444
}
45+
elsewhen ($OS_ANDROID) {
46+
GO_TARG_OS=android
47+
}
4548

4649
# tag:go-specific
4750
GO_TARG_ARCH=unknown
@@ -516,6 +519,9 @@ elsewhen ($OS_LINUX) {
516519
elsewhen ($OS_WINDOWS) {
517520
_GO_TOOLCHAIN_ENV_GOOS=${env:"GOOS=windows"}
518521
}
522+
elsewhen ($OS_ANDROID) {
523+
_GO_TOOLCHAIN_ENV_GOOS=${env:"GOOS=android"}
524+
}
519525
_GO_TOOLCHAIN_ENV_PATH=
520526

521527
# tag:go-specific
@@ -809,7 +815,12 @@ module _GO_BASE_UNIT: _BASE_UNIT {
809815

810816
_GO_PROCESS_SRCS()
811817

812-
when ($CLANG == "yes") {
818+
when ($CLANG == "yes" && $OS_ANDROID && $PIE) {
819+
# TODO: _GO_EXTLD just clang?
820+
_GO_EXTLD=aarch64-linux-android$ANDROID_API-clang
821+
GO_TOOLCHAIN_ENV += ${env:"CC=clang"}
822+
}
823+
elsewhen ($CLANG == "yes") {
813824
_GO_EXTLD=clang
814825
GO_TOOLCHAIN_ENV += ${env:"CC=clang"}
815826
}
@@ -823,7 +834,7 @@ module _GO_BASE_UNIT: _BASE_UNIT {
823834
GO_EXTLD = ++extld $_GO_EXTLD ++extldflags $_GO_SONAME $LD_SDK_VERSION -undefined dynamic_lookup $C_FLAGS_PLATFORM --sysroot=$MACOS_SDK_RESOURCE_GLOBAL --start-wa ${rootrel;ext=.a:SRCS_GLOBAL} --end-wa ${rootrel;ext=.o:SRCS_GLOBAL} --cgo-peers $LDFLAGS $LDFLAGS_GLOBAL $OBJADDE $OBJADDE_LIB $OBJADDE_LIB_GLOBAL $GO_LDFLAGS_GLOBAL $C_LIBRARY_PATH $C_SYSTEM_LIBRARIES_INTERCEPT $C_SYSTEM_LIBRARIES $STRIP_FLAG
824835
CGO2_LDFLAGS_VALUE += $LD_SDK_VERSION -undefined dynamic_lookup -nodefaultlibs -lc
825836
}
826-
elsewhen ($OS_LINUX) {
837+
elsewhen ($OS_LINUX || $OS_ANDROID) {
827838
GO_EXTLD = ++extld $_GO_EXTLD ++extldflags $_GO_SONAME $C_FLAGS_PLATFORM --sysroot=$OS_SDK_ROOT_RESOURCE_GLOBAL -Wl,--whole-archive ${rootrel;ext=.a:SRCS_GLOBAL} -Wl,--no-whole-archive ${rootrel;ext=.o:SRCS_GLOBAL} --cgo-peers $LDFLAGS $LDFLAGS_GLOBAL $OBJADDE $OBJADDE_LIB $OBJADDE_LIB_GLOBAL $GO_LDFLAGS_GLOBAL $C_LIBRARY_PATH $C_SYSTEM_LIBRARIES_INTERCEPT $C_SYSTEM_LIBRARIES $STRIP_FLAG
828839
CGO2_LDFLAGS_VALUE += -Wl,--unresolved-symbols=ignore-all -nodefaultlibs -lc
829840
}
@@ -984,12 +995,12 @@ module _GO_DLL_BASE_UNIT: GO_PROGRAM {
984995
when ($OS_DARWIN) {
985996
_GO_SONAME=-Wl,-install_name,$SONAME
986997
}
987-
elsewhen ($OS_LINUX) {
998+
elsewhen ($OS_LINUX || $OS_ANDROID) {
988999
_GO_SONAME=-Wl,-soname,$SONAME
9891000
}
9901001

9911002
when ($MODULE_VERSION) {
992-
when ($OS_LINUX || $OS_DARWIN) {
1003+
when ($OS_LINUX || $OS_DARWIN || $OS_ANDROID) {
9931004
_GO_LINK_EXE_EXT_CMD+= && $LINK_OR_COPY_CMD $TARGET ${output;nopath;noext:SONAME}
9941005
}
9951006
}

‎build/conf/opensource_export.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ when ($OPENSOURCE_PROJECT != "") {
88
}
99
"yt-cpp-sdk" ? {
1010
USE_STL_SYSTEM=yes
11-
USE_INTERNAL_STL=no
1211
OS_SDK=ubuntu-20
1312
TSTRING_IS_STD_STRING=yes
1413
_SEM_EXTRA_CXX_FLAGS=-DNO_CUSTOM_CHAR_PTR_STD_COMPARATOR

‎build/conf/project_specific/other.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ BUILD_CATBOOST_SCRIPT=build/scripts/build_catboost.py
77
### cbname - name for a variable (of NCatboostCalcer::TCatboostCalcer type) to be available in CPP code.
88
### CatBoost specific macro.
99
macro BUILD_CATBOOST(CbModel, CbName) {
10-
.CMD=$YMAKE_PYTHON ${input:BUILD_CATBOOST_SCRIPT} build_cb_f $ARCADIA_ROOT $ARCH_TOOL ${input:CbModel} $CbName ${output;pre=cb.;suf=.cpp:CbName} ${hide;output;pre=CB_External_;suf=.rodata:CbName} ${hide;output_include:"kernel/catboost/catboost_calcer.h"} ${hide;kv:"p CB"} ${hide;kv:"pc yellow"}
10+
.CMD=$YMAKE_PYTHON3 ${input:BUILD_CATBOOST_SCRIPT} build_cb_f $ARCADIA_ROOT $ARCH_TOOL ${input:CbModel} $CbName ${output;pre=cb.;suf=.cpp:CbName} ${hide;output;pre=CB_External_;suf=.rodata:CbName} ${hide;output_include:"kernel/catboost/catboost_calcer.h"} ${hide;kv:"p CB"} ${hide;kv:"pc yellow"}
1111
.STRUCT_CMD=yes
1212
}

‎build/conf/proto.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ otherwise {
560560
KOTLIN_PROTO_FLAGS=
561561
# tag:proto tag:java-specific
562562
macro _JAVA_PROTO_CMD(File) {
563-
.CMD=${cwd;rootdir;input:File} $YMAKE_PYTHON ${input:"build/scripts/tared_protoc.py"} --tar-output ${norel;output;suf=.jsrc;nopath;noext:File} --protoc-out-dir $ARCADIA_BUILD_ROOT/java_out $JAVA_PROTOC -I=./$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_ROOT --java_out=${_JAVA_PROTO_LITE_ARG}$ARCADIA_BUILD_ROOT/java_out ${KOTLIN_PROTO_FLAGS} $_PROTOC_FLAGS ${rootrel;input:File} ${hide;kv:"p PB"} ${hide;kv:"pc yellow"} $JAVA_PROTO_ARGS ${hide:PROTO_FAKEID} ${hide:"UID_BANHAMMER"}
563+
.CMD=${cwd;rootdir;input:File} $YMAKE_PYTHON3 ${input:"build/scripts/tared_protoc.py"} --tar-output ${norel;output;suf=.jsrc;nopath;noext:File} --protoc-out-dir $ARCADIA_BUILD_ROOT/java_out $JAVA_PROTOC -I=./$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_ROOT --java_out=${_JAVA_PROTO_LITE_ARG}$ARCADIA_BUILD_ROOT/java_out ${KOTLIN_PROTO_FLAGS} $_PROTOC_FLAGS ${rootrel;input:File} ${hide;kv:"p PB"} ${hide;kv:"pc yellow"} $JAVA_PROTO_ARGS ${hide:PROTO_FAKEID} ${hide:"UID_BANHAMMER"}
564564
.PEERDIR=build/platform/java/protoc
565565
.SEM=proto_files ${rootrel;input:File} ${hide;output;suf=.jsrc:File}
566566
}

‎build/conf/python.conf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# tag:python-specific tag:cython-specific
22
CYTHON_SCRIPT=${input:"${ARCADIA_ROOT}/contrib/tools/cython/cython.py"} ${hide:CYTHON_FAKEID} $CYTHON_PREDEFINED_INCLUDES
3-
RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT
4-
RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON $CYTHON_SCRIPT
3+
RUN_CYTHON_SCRIPT=$YMAKE_PYTHON3 $CYTHON_SCRIPT
4+
RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON3 $CYTHON_SCRIPT
55
PYTHON_TYPE_FOR_CYTHON=PY3
66
_NEED_PYTHON_COVERAGE=no
77

@@ -1153,7 +1153,7 @@ multimodule PY23_LIBRARY {
11531153
DISABLE(START_TARGET)
11541154
}
11551155
module PY3: PY3_LIBRARY {
1156-
RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON $CYTHON_SCRIPT
1156+
RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON3 $CYTHON_SCRIPT
11571157
OBJ_SUF=.py3
11581158
}
11591159
}
@@ -1204,7 +1204,7 @@ multimodule PY23_TEST {
12041204
MODULE_PREFIX=py2_
12051205
OBJ_SUF=.py2
12061206
CANONIZE_SUB_PATH=py2test
1207-
RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON $CYTHON_SCRIPT
1207+
RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON3 $CYTHON_SCRIPT
12081208

12091209
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/py2test/result.json)
12101210

@@ -1215,7 +1215,7 @@ multimodule PY23_TEST {
12151215
.FINAL_TARGET=yes
12161216
OBJ_SUF=.py3
12171217
CANONIZE_SUB_PATH=py3test
1218-
RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON $CYTHON_SCRIPT
1218+
RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON3 $CYTHON_SCRIPT
12191219

12201220
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/py3test/result.json)
12211221

@@ -1225,7 +1225,7 @@ multimodule PY23_TEST {
12251225

12261226
module PY3TEST_LIBRARY: PY3_LIBRARY {
12271227
PEERDIR+=library/python/pytest
1228-
RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON $CYTHON_SCRIPT
1228+
RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON3 $CYTHON_SCRIPT
12291229

12301230
_DONT_REQUIRE_LICENSE()
12311231
WITHOUT_VERSION()

‎build/conf/settings.conf‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ FAIL_PY2=no
1313
MAIN_OUTPUT_AS_EXTRA=yes
1414
FILL_MODULE2NODES=yes
1515

16-
SAVELOAD_GLOB_PATTERNS=yes
17-
SAVELOAD_GLOB_STAT=yes
18-
UPDATE_GLOB_STAT=yes
19-
SAVE_GLOB_RESTRICTIONS=yes
2016
CHECK_GLOB_RESTRICTIONS=yes
2117
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
2218

‎build/conf/ts/node_modules.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ _PREPARE_NO_DEPS_CMD=$TOUCH_UNIT \
4949
module _PREPARE_DEPS_BASE: _BARE_UNIT {
5050
.CMD=$_PREPARE_DEPS_CMD
5151
.STRUCT_CMD=yes
52-
.IGNORED=SRCS FILES TS_FILES COPY_FILE RUN_JAVASCRIPT_AFTER_BUILD RUN_JAVASCRIPT
52+
.IGNORED=SRCS FILES TS_FILES COPY_FILE BUNDLE RUN_JAVASCRIPT_AFTER_BUILD RUN_JAVASCRIPT
5353
# Propagates peers to related modules
5454
.PEERDIR_POLICY=as_build_from
5555
.NODE_TYPE=Bundle

‎build/conf/yndexing/cpp_instrumentation.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ macro POPULATE_CPP_YNDEXING() {
1010
CPPYNDEXER_BIN=$TOOL_CPPYNDEXER
1111
}
1212

13-
CPPYNDEXER_ARGS=$YMAKE_PYTHON ${input:"build/scripts/yndexer.py"} $CPPYNDEXER_BIN 1500 $(SOURCE_ROOT) $ARCADIA_BUILD_ROOT ${input:SRC}
13+
CPPYNDEXER_ARGS=$YMAKE_PYTHON3 ${input:"build/scripts/yndexer.py"} $CPPYNDEXER_BIN 1500 $(SOURCE_ROOT) $ARCADIA_BUILD_ROOT ${input:SRC}
1414
CPPYNDEXER_OUTPUT=${noauto;output;suf=${OBJ_CROSS_SUF}${COMPILE_OUT_SUFFIX}.ydx.pb2:SRC}
1515
}
1616
otherwise {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
{#- Output is relative in export_root -#}
2828
{%- set out_set = all_sets|selectattr('realdir', 'startsWith', export_root)|rejectattr('dir', 'startsWith', export_root)|selectattr('realdir', 'in', export_root + "/" + bindir) -%}
2929
{%- if out_set|length -%}
30+
{#- Real output dir != output dir (symlink to output dir) -#}
3031
{%- set out_set = out_set|first -%}
3132
{%- set out_dir = out_set.dir -%}
3233
{%- if current_target.test_reldir -%}
@@ -39,7 +40,7 @@
3940
"$arcadia_root/{{ curdir }}/{{ out_dir }}{{ tail }}"
4041
{%- else -%}
4142
{#- Replace (export_root) === (BUILD_ROOT in ymake) to baseBuildDir in Gradle - root of all build folders for modules -#}
42-
"{{ arg|replace(export_root, "$baseBuildDir")|replace(project_root, "$project_root")|replace(arcadia_root, "$output_root")|replace(output_root, "$output_root") }}{{ tail }}"
43+
"{{ (export_root + "/" + bindir)|replace(export_root, "$baseBuildDir")|replace(project_root, "$project_root")|replace(arcadia_root, "$output_root")|replace(output_root, "$output_root") }}{{ tail }}"
4344
{%- endif -%}
4445
{%- else -%}
4546
"{{ arg|replace(project_root, "$project_root")|replace(arcadia_root, "$output_root")|replace(output_root, "$output_root") }}{{ tail }}"

0 commit comments

Comments
 (0)