summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorYDBot <[email protected]>2025-10-23 18:38:13 +0000
committerYDBot <[email protected]>2025-10-23 18:38:13 +0000
commit564cf7cb2255a107b4f44c18b2a1844041f20b4d (patch)
tree6a4a60e8bde612dcc3ac7fd93fffbd36351d4e35 /build
parent89a17b25091c24744b7ebd0650b5b810457b1145 (diff)
parenta703d86902fd02bd8e373d959b2498c034657449 (diff)
Merge pull request #27203 from ydb-platform/merge-rightlib-251021-0051HEADmain
Diffstat (limited to 'build')
-rw-r--r--build/conf/compilers/gnu_compiler.conf2
-rw-r--r--build/conf/go.conf19
-rw-r--r--build/conf/opensource_export.conf1
-rw-r--r--build/conf/project_specific/other.conf2
-rw-r--r--build/conf/proto.conf2
-rw-r--r--build/conf/python.conf12
-rw-r--r--build/conf/settings.conf4
-rw-r--r--build/conf/ts/node_modules.conf2
-rw-r--r--build/conf/yndexing/cpp_instrumentation.conf2
-rw-r--r--build/export_generators/ide-gradle/build.gradle.kts.any.jinja3
-rw-r--r--build/export_generators/ide-gradle/builddir.jinja13
-rw-r--r--build/export_generators/ide-gradle/generator.toml5
-rw-r--r--build/export_generators/ide-gradle/plugins.jinja6
-rw-r--r--build/export_generators/ide-gradle/test.jinja2
-rw-r--r--build/export_generators/ide-gradle/vars.jinja1
-rw-r--r--build/external_resources/ruff/resources.json8
-rw-r--r--build/external_resources/ymake/public.resources.json10
-rw-r--r--build/external_resources/ymake/resources.json10
-rw-r--r--build/mapping.conf.json18
-rw-r--r--build/platform/yfm/resources.json8
-rw-r--r--build/plugins/lib/nots/package_manager/pnpm/pnpm_package_manager.py1
-rw-r--r--build/scripts/decimal_md5.py2
-rw-r--r--build/scripts/go_tool.py2
-rwxr-xr-xbuild/scripts/mangle_typeinfo_names.py2
-rw-r--r--build/scripts/yndexer.py2
-rw-r--r--build/ymake.core.conf53
-rwxr-xr-xbuild/ymake_conf.py2
27 files changed, 105 insertions, 89 deletions
diff --git a/build/conf/compilers/gnu_compiler.conf b/build/conf/compilers/gnu_compiler.conf
index 3e83fd1c160..451c28fa7f5 100644
--- a/build/conf/compilers/gnu_compiler.conf
+++ b/build/conf/compilers/gnu_compiler.conf
@@ -227,7 +227,7 @@ _COMPILER_TIME_TRACE_FLAGS=
_COMPILER_TIME_TRACE_POSTPROCESS=
when (($TIME_TRACE == "yes" || $COMPILER_TIME_TRACE == "yes") && $_HAS_TIME_TRACE == "yes") {
_COMPILER_TIME_TRACE_FLAGS=-ftime-trace -ftime-trace-granularity=$_COMPILER_TIME_TRACE_GRANULARITY
- _COMPILER_TIME_TRACE_POSTPROCESS=$YMAKE_PYTHON ${input:"build/scripts/find_time_trace.py"} $_COMPILE_OUTPUTS $_COMPILE_TIME_TRACE_OUTPUTS
+ _COMPILER_TIME_TRACE_POSTPROCESS=$YMAKE_PYTHON3 ${input:"build/scripts/find_time_trace.py"} $_COMPILE_OUTPUTS $_COMPILE_TIME_TRACE_OUTPUTS
}
_C_CPP_KV_STYLE=${hide;kv:"p CC"} ${hide;kv:"pc green"}
diff --git a/build/conf/go.conf b/build/conf/go.conf
index 5c1ba7dbc7e..35cfae4c8a3 100644
--- a/build/conf/go.conf
+++ b/build/conf/go.conf
@@ -42,6 +42,9 @@ elsewhen ($OS_DARWIN) {
elsewhen ($OS_WINDOWS) {
GO_TARG_OS=windows
}
+elsewhen ($OS_ANDROID) {
+ GO_TARG_OS=android
+}
# tag:go-specific
GO_TARG_ARCH=unknown
@@ -516,6 +519,9 @@ elsewhen ($OS_LINUX) {
elsewhen ($OS_WINDOWS) {
_GO_TOOLCHAIN_ENV_GOOS=${env:"GOOS=windows"}
}
+elsewhen ($OS_ANDROID) {
+ _GO_TOOLCHAIN_ENV_GOOS=${env:"GOOS=android"}
+}
_GO_TOOLCHAIN_ENV_PATH=
# tag:go-specific
@@ -809,7 +815,12 @@ module _GO_BASE_UNIT: _BASE_UNIT {
_GO_PROCESS_SRCS()
- when ($CLANG == "yes") {
+ when ($CLANG == "yes" && $OS_ANDROID && $PIE) {
+ # TODO: _GO_EXTLD just clang?
+ _GO_EXTLD=aarch64-linux-android$ANDROID_API-clang
+ GO_TOOLCHAIN_ENV += ${env:"CC=clang"}
+ }
+ elsewhen ($CLANG == "yes") {
_GO_EXTLD=clang
GO_TOOLCHAIN_ENV += ${env:"CC=clang"}
}
@@ -823,7 +834,7 @@ module _GO_BASE_UNIT: _BASE_UNIT {
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
CGO2_LDFLAGS_VALUE += $LD_SDK_VERSION -undefined dynamic_lookup -nodefaultlibs -lc
}
- elsewhen ($OS_LINUX) {
+ elsewhen ($OS_LINUX || $OS_ANDROID) {
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
CGO2_LDFLAGS_VALUE += -Wl,--unresolved-symbols=ignore-all -nodefaultlibs -lc
}
@@ -984,12 +995,12 @@ module _GO_DLL_BASE_UNIT: GO_PROGRAM {
when ($OS_DARWIN) {
_GO_SONAME=-Wl,-install_name,$SONAME
}
- elsewhen ($OS_LINUX) {
+ elsewhen ($OS_LINUX || $OS_ANDROID) {
_GO_SONAME=-Wl,-soname,$SONAME
}
when ($MODULE_VERSION) {
- when ($OS_LINUX || $OS_DARWIN) {
+ when ($OS_LINUX || $OS_DARWIN || $OS_ANDROID) {
_GO_LINK_EXE_EXT_CMD+= && $LINK_OR_COPY_CMD $TARGET ${output;nopath;noext:SONAME}
}
}
diff --git a/build/conf/opensource_export.conf b/build/conf/opensource_export.conf
index d94b434337c..94183de7e09 100644
--- a/build/conf/opensource_export.conf
+++ b/build/conf/opensource_export.conf
@@ -8,7 +8,6 @@ when ($OPENSOURCE_PROJECT != "") {
}
"yt-cpp-sdk" ? {
USE_STL_SYSTEM=yes
- USE_INTERNAL_STL=no
OS_SDK=ubuntu-20
TSTRING_IS_STD_STRING=yes
_SEM_EXTRA_CXX_FLAGS=-DNO_CUSTOM_CHAR_PTR_STD_COMPARATOR
diff --git a/build/conf/project_specific/other.conf b/build/conf/project_specific/other.conf
index 58a5c1f7480..c02d499aef7 100644
--- a/build/conf/project_specific/other.conf
+++ b/build/conf/project_specific/other.conf
@@ -7,6 +7,6 @@ BUILD_CATBOOST_SCRIPT=build/scripts/build_catboost.py
### cbname - name for a variable (of NCatboostCalcer::TCatboostCalcer type) to be available in CPP code.
### CatBoost specific macro.
macro BUILD_CATBOOST(CbModel, CbName) {
- .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"}
+ .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"}
.STRUCT_CMD=yes
}
diff --git a/build/conf/proto.conf b/build/conf/proto.conf
index c140aae2bd8..d91051a68e6 100644
--- a/build/conf/proto.conf
+++ b/build/conf/proto.conf
@@ -560,7 +560,7 @@ otherwise {
KOTLIN_PROTO_FLAGS=
# tag:proto tag:java-specific
macro _JAVA_PROTO_CMD(File) {
- .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"}
+ .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"}
.PEERDIR=build/platform/java/protoc
.SEM=proto_files ${rootrel;input:File} ${hide;output;suf=.jsrc:File}
}
diff --git a/build/conf/python.conf b/build/conf/python.conf
index 0305f800db4..8e9a9eaa90f 100644
--- a/build/conf/python.conf
+++ b/build/conf/python.conf
@@ -1,7 +1,7 @@
# tag:python-specific tag:cython-specific
CYTHON_SCRIPT=${input:"${ARCADIA_ROOT}/contrib/tools/cython/cython.py"} ${hide:CYTHON_FAKEID} $CYTHON_PREDEFINED_INCLUDES
-RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT
-RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON $CYTHON_SCRIPT
+RUN_CYTHON_SCRIPT=$YMAKE_PYTHON3 $CYTHON_SCRIPT
+RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON3 $CYTHON_SCRIPT
PYTHON_TYPE_FOR_CYTHON=PY3
_NEED_PYTHON_COVERAGE=no
@@ -1153,7 +1153,7 @@ multimodule PY23_LIBRARY {
DISABLE(START_TARGET)
}
module PY3: PY3_LIBRARY {
- RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON $CYTHON_SCRIPT
+ RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON3 $CYTHON_SCRIPT
OBJ_SUF=.py3
}
}
@@ -1204,7 +1204,7 @@ multimodule PY23_TEST {
MODULE_PREFIX=py2_
OBJ_SUF=.py2
CANONIZE_SUB_PATH=py2test
- RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON $CYTHON_SCRIPT
+ RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON3 $CYTHON_SCRIPT
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/py2test/result.json)
@@ -1215,7 +1215,7 @@ multimodule PY23_TEST {
.FINAL_TARGET=yes
OBJ_SUF=.py3
CANONIZE_SUB_PATH=py3test
- RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON $CYTHON_SCRIPT
+ RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON3 $CYTHON_SCRIPT
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/py3test/result.json)
@@ -1225,7 +1225,7 @@ multimodule PY23_TEST {
module PY3TEST_LIBRARY: PY3_LIBRARY {
PEERDIR+=library/python/pytest
- RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON $CYTHON_SCRIPT
+ RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON3 $CYTHON_SCRIPT
_DONT_REQUIRE_LICENSE()
WITHOUT_VERSION()
diff --git a/build/conf/settings.conf b/build/conf/settings.conf
index 174758ab034..f8caa721afd 100644
--- a/build/conf/settings.conf
+++ b/build/conf/settings.conf
@@ -13,10 +13,6 @@ FAIL_PY2=no
MAIN_OUTPUT_AS_EXTRA=yes
FILL_MODULE2NODES=yes
-SAVELOAD_GLOB_PATTERNS=yes
-SAVELOAD_GLOB_STAT=yes
-UPDATE_GLOB_STAT=yes
-SAVE_GLOB_RESTRICTIONS=yes
CHECK_GLOB_RESTRICTIONS=yes
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
diff --git a/build/conf/ts/node_modules.conf b/build/conf/ts/node_modules.conf
index 637793277d4..a7bb09ce2c5 100644
--- a/build/conf/ts/node_modules.conf
+++ b/build/conf/ts/node_modules.conf
@@ -49,7 +49,7 @@ _PREPARE_NO_DEPS_CMD=$TOUCH_UNIT \
module _PREPARE_DEPS_BASE: _BARE_UNIT {
.CMD=$_PREPARE_DEPS_CMD
.STRUCT_CMD=yes
- .IGNORED=SRCS FILES TS_FILES COPY_FILE RUN_JAVASCRIPT_AFTER_BUILD RUN_JAVASCRIPT
+ .IGNORED=SRCS FILES TS_FILES COPY_FILE BUNDLE RUN_JAVASCRIPT_AFTER_BUILD RUN_JAVASCRIPT
# Propagates peers to related modules
.PEERDIR_POLICY=as_build_from
.NODE_TYPE=Bundle
diff --git a/build/conf/yndexing/cpp_instrumentation.conf b/build/conf/yndexing/cpp_instrumentation.conf
index 8649d507028..1f3e8b9288c 100644
--- a/build/conf/yndexing/cpp_instrumentation.conf
+++ b/build/conf/yndexing/cpp_instrumentation.conf
@@ -10,7 +10,7 @@ macro POPULATE_CPP_YNDEXING() {
CPPYNDEXER_BIN=$TOOL_CPPYNDEXER
}
- CPPYNDEXER_ARGS=$YMAKE_PYTHON ${input:"build/scripts/yndexer.py"} $CPPYNDEXER_BIN 1500 $(SOURCE_ROOT) $ARCADIA_BUILD_ROOT ${input:SRC}
+ CPPYNDEXER_ARGS=$YMAKE_PYTHON3 ${input:"build/scripts/yndexer.py"} $CPPYNDEXER_BIN 1500 $(SOURCE_ROOT) $ARCADIA_BUILD_ROOT ${input:SRC}
CPPYNDEXER_OUTPUT=${noauto;output;suf=${OBJ_CROSS_SUF}${COMPILE_OUT_SUFFIX}.ydx.pb2:SRC}
}
otherwise {
diff --git a/build/export_generators/ide-gradle/build.gradle.kts.any.jinja b/build/export_generators/ide-gradle/build.gradle.kts.any.jinja
index 6ed25e19bd4..c650e669d89 100644
--- a/build/export_generators/ide-gradle/build.gradle.kts.any.jinja
+++ b/build/export_generators/ide-gradle/build.gradle.kts.any.jinja
@@ -27,6 +27,7 @@
{#- Output is relative in export_root -#}
{%- set out_set = all_sets|selectattr('realdir', 'startsWith', export_root)|rejectattr('dir', 'startsWith', export_root)|selectattr('realdir', 'in', export_root + "/" + bindir) -%}
{%- if out_set|length -%}
+{#- Real output dir != output dir (symlink to output dir) -#}
{%- set out_set = out_set|first -%}
{%- set out_dir = out_set.dir -%}
{%- if current_target.test_reldir -%}
@@ -39,7 +40,7 @@
"$arcadia_root/{{ curdir }}/{{ out_dir }}{{ tail }}"
{%- else -%}
{#- Replace (export_root) === (BUILD_ROOT in ymake) to baseBuildDir in Gradle - root of all build folders for modules -#}
-"{{ arg|replace(export_root, "$baseBuildDir")|replace(project_root, "$project_root")|replace(arcadia_root, "$output_root")|replace(output_root, "$output_root") }}{{ tail }}"
+"{{ (export_root + "/" + bindir)|replace(export_root, "$baseBuildDir")|replace(project_root, "$project_root")|replace(arcadia_root, "$output_root")|replace(output_root, "$output_root") }}{{ tail }}"
{%- endif -%}
{%- else -%}
"{{ arg|replace(project_root, "$project_root")|replace(arcadia_root, "$output_root")|replace(output_root, "$output_root") }}{{ tail }}"
diff --git a/build/export_generators/ide-gradle/builddir.jinja b/build/export_generators/ide-gradle/builddir.jinja
index bd1dfaaa842..717e061bace 100644
--- a/build/export_generators/ide-gradle/builddir.jinja
+++ b/build/export_generators/ide-gradle/builddir.jinja
@@ -11,16 +11,3 @@ val mainProtosDir = layout.buildDirectory.dir("main_protos")
val mainExtractedIncludeProtosDir = layout.buildDirectory.dir("extracted-include-protos/main")
{%- endif %}
{%- endif %}
-
-var mkBuildDir = tasks.register("mkBuildDir") {
- doFirst {
- mkdir(layout.buildDirectory.asFile.get())
- }
- onlyIf {
- !layout.buildDirectory.asFile.get().exists()
- }
-}
-
-tasks.withType<JavaExec>().configureEach {
- dependsOn(mkBuildDir)
-}
diff --git a/build/export_generators/ide-gradle/generator.toml b/build/export_generators/ide-gradle/generator.toml
index 5559f285bd4..008d73f7606 100644
--- a/build/export_generators/ide-gradle/generator.toml
+++ b/build/export_generators/ide-gradle/generator.toml
@@ -31,6 +31,10 @@ is_extra_target = true
is_test = true
is_extra_target = true
+[targets.junit6]
+is_test = true
+is_extra_target = true
+
[attrs.target]
# DEPRECATED
annotation_processors="list"
@@ -39,6 +43,7 @@ required_jdk="str"
add_vcs_info_to_mf="bool"
junit4_test="flag"
junit5_test="flag"
+junit6_test="flag"
test_cwd="list"
test_env="list"
app_main_class="str"
diff --git a/build/export_generators/ide-gradle/plugins.jinja b/build/export_generators/ide-gradle/plugins.jinja
index ae581a3ef68..aafe64ba765 100644
--- a/build/export_generators/ide-gradle/plugins.jinja
+++ b/build/export_generators/ide-gradle/plugins.jinja
@@ -53,4 +53,10 @@ java {
}
{%- endif %}
}
+
+{#- Can be removed after Gradle 9. See https://github.com/gradle/gradle/issues/16791 #}
+
+tasks.withType<JavaExec>().configureEach {
+ javaLauncher.set(javaToolchains.launcherFor(java.toolchain))
+}
{% endif -%}
diff --git a/build/export_generators/ide-gradle/test.jinja b/build/export_generators/ide-gradle/test.jinja
index fcfcd8f93e0..492f7958983 100644
--- a/build/export_generators/ide-gradle/test.jinja
+++ b/build/export_generators/ide-gradle/test.jinja
@@ -15,7 +15,7 @@ tasks.test {
}
{% endif -%}
-{%- if has_junit5_test %}
+{%- if has_junit5_test or has_junit6_test %}
tasks.named<Test>("test") {
useJUnitPlatform()
}
diff --git a/build/export_generators/ide-gradle/vars.jinja b/build/export_generators/ide-gradle/vars.jinja
index f42894d1390..61e702ea483 100644
--- a/build/export_generators/ide-gradle/vars.jinja
+++ b/build/export_generators/ide-gradle/vars.jinja
@@ -50,6 +50,7 @@
{%- set mainClass = target.app_main_class -%}
{%- set has_junit5_test = extra_targets|selectattr('junit5_test') -%}
+{%- set has_junit6_test = extra_targets|selectattr('junit6_test') -%}
{%- if proto_template -%}
{%- set prepareProtosTask = target.proto_files|length or target.runs|length or target.custom_runs|length -%}
diff --git a/build/external_resources/ruff/resources.json b/build/external_resources/ruff/resources.json
index 7bab23868b2..56a6b0102bd 100644
--- a/build/external_resources/ruff/resources.json
+++ b/build/external_resources/ruff/resources.json
@@ -1,16 +1,16 @@
{
"by_platform": {
"darwin-arm64": {
- "uri": "sbr:8282760403"
+ "uri": "sbr:10030783988"
},
"darwin-x86_64": {
- "uri": "sbr:8283225479"
+ "uri": "sbr:10030936443"
},
"linux-x86_64": {
- "uri": "sbr:8282728054"
+ "uri": "sbr:10030741147"
},
"win32-x86_64": {
- "uri": "sbr:8283116250"
+ "uri": "sbr:10031055394"
}
}
}
diff --git a/build/external_resources/ymake/public.resources.json b/build/external_resources/ymake/public.resources.json
index 5084b5ce047..c12679a39a4 100644
--- a/build/external_resources/ymake/public.resources.json
+++ b/build/external_resources/ymake/public.resources.json
@@ -1,19 +1,19 @@
{
"by_platform": {
"darwin": {
- "uri": "sbr:9997229151"
+ "uri": "sbr:10032497883"
},
"darwin-arm64": {
- "uri": "sbr:9997227045"
+ "uri": "sbr:10032495122"
},
"linux": {
- "uri": "sbr:9997233844"
+ "uri": "sbr:10032502884"
},
"linux-aarch64": {
- "uri": "sbr:9997224991"
+ "uri": "sbr:10032493225"
},
"win32": {
- "uri": "sbr:9997231623"
+ "uri": "sbr:10032500430"
}
}
}
diff --git a/build/external_resources/ymake/resources.json b/build/external_resources/ymake/resources.json
index 57b0aaacb90..d3185426cc3 100644
--- a/build/external_resources/ymake/resources.json
+++ b/build/external_resources/ymake/resources.json
@@ -1,19 +1,19 @@
{
"by_platform": {
"darwin": {
- "uri": "sbr:9997218958"
+ "uri": "sbr:10032485279"
},
"darwin-arm64": {
- "uri": "sbr:9997217011"
+ "uri": "sbr:10032483782"
},
"linux": {
- "uri": "sbr:9997222986"
+ "uri": "sbr:10032487670"
},
"linux-aarch64": {
- "uri": "sbr:9997215058"
+ "uri": "sbr:10032482440"
},
"win32": {
- "uri": "sbr:9997221095"
+ "uri": "sbr:10032486508"
}
}
}
diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index ca712973401..4d9a9158ad6 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -813,6 +813,7 @@
"8661627954": "{registry_endpoint}/8661627954",
"8867822795": "{registry_endpoint}/8867822795",
"9761047327": "{registry_endpoint}/9761047327",
+ "10032497883": "{registry_endpoint}/10032497883",
"5766172292": "{registry_endpoint}/5766172292",
"5805431504": "{registry_endpoint}/5805431504",
"5829027626": "{registry_endpoint}/5829027626",
@@ -920,6 +921,7 @@
"9933947344": "{registry_endpoint}/9933947344",
"9966448368": "{registry_endpoint}/9966448368",
"9997229151": "{registry_endpoint}/9997229151",
+ "10032495122": "{registry_endpoint}/10032495122",
"5766171800": "{registry_endpoint}/5766171800",
"5805430761": "{registry_endpoint}/5805430761",
"5829025456": "{registry_endpoint}/5829025456",
@@ -1027,6 +1029,7 @@
"9933946335": "{registry_endpoint}/9933946335",
"9966447538": "{registry_endpoint}/9966447538",
"9997227045": "{registry_endpoint}/9997227045",
+ "10032502884": "{registry_endpoint}/10032502884",
"5766173070": "{registry_endpoint}/5766173070",
"5805432830": "{registry_endpoint}/5805432830",
"5829031598": "{registry_endpoint}/5829031598",
@@ -1134,6 +1137,7 @@
"9933949303": "{registry_endpoint}/9933949303",
"9966450207": "{registry_endpoint}/9966450207",
"9997233844": "{registry_endpoint}/9997233844",
+ "10032493225": "{registry_endpoint}/10032493225",
"5766171341": "{registry_endpoint}/5766171341",
"5805430188": "{registry_endpoint}/5805430188",
"5829023352": "{registry_endpoint}/5829023352",
@@ -1241,6 +1245,7 @@
"9933944861": "{registry_endpoint}/9933944861",
"9966446510": "{registry_endpoint}/9966446510",
"9997224991": "{registry_endpoint}/9997224991",
+ "10032500430": "{registry_endpoint}/10032500430",
"8270821739": "{registry_endpoint}/8270821739",
"8295446553": "{registry_endpoint}/8295446553",
"8326170338": "{registry_endpoint}/8326170338",
@@ -1672,6 +1677,10 @@
"7336062757": "{registry_endpoint}/7336062757",
"9953978780": "{registry_endpoint}/9953978780",
"9953829990": "{registry_endpoint}/9953829990",
+ "10030783988": "{registry_endpoint}/10030783988",
+ "10030936443": "{registry_endpoint}/10030936443",
+ "10030741147": "{registry_endpoint}/10030741147",
+ "10031055394": "{registry_endpoint}/10031055394",
"8734866686": "{registry_endpoint}/8734866686",
"8735571670": "{registry_endpoint}/8735571670",
"8735700393": "{registry_endpoint}/8735700393",
@@ -2584,6 +2593,7 @@
"8661627954": "devtools/yexport/bin/yexport for linux",
"8867822795": "devtools/yexport/bin/yexport for linux",
"9761047327": "devtools/yexport/bin/yexport for linux",
+ "10032497883": "devtools/ymake/bin/ymake for darwin",
"5766172292": "devtools/ymake/bin/ymake for darwin",
"5805431504": "devtools/ymake/bin/ymake for darwin",
"5829027626": "devtools/ymake/bin/ymake for darwin",
@@ -2691,6 +2701,7 @@
"9933947344": "devtools/ymake/bin/ymake for darwin",
"9966448368": "devtools/ymake/bin/ymake for darwin",
"9997229151": "devtools/ymake/bin/ymake for darwin",
+ "10032495122": "devtools/ymake/bin/ymake for darwin-arm64",
"5766171800": "devtools/ymake/bin/ymake for darwin-arm64",
"5805430761": "devtools/ymake/bin/ymake for darwin-arm64",
"5829025456": "devtools/ymake/bin/ymake for darwin-arm64",
@@ -2798,6 +2809,7 @@
"9933946335": "devtools/ymake/bin/ymake for darwin-arm64",
"9966447538": "devtools/ymake/bin/ymake for darwin-arm64",
"9997227045": "devtools/ymake/bin/ymake for darwin-arm64",
+ "10032502884": "devtools/ymake/bin/ymake for linux",
"5766173070": "devtools/ymake/bin/ymake for linux",
"5805432830": "devtools/ymake/bin/ymake for linux",
"5829031598": "devtools/ymake/bin/ymake for linux",
@@ -2905,6 +2917,7 @@
"9933949303": "devtools/ymake/bin/ymake for linux",
"9966450207": "devtools/ymake/bin/ymake for linux",
"9997233844": "devtools/ymake/bin/ymake for linux",
+ "10032493225": "devtools/ymake/bin/ymake for linux-aarch64",
"5766171341": "devtools/ymake/bin/ymake for linux-aarch64",
"5805430188": "devtools/ymake/bin/ymake for linux-aarch64",
"5829023352": "devtools/ymake/bin/ymake for linux-aarch64",
@@ -3012,6 +3025,7 @@
"9933944861": "devtools/ymake/bin/ymake for linux-aarch64",
"9966446510": "devtools/ymake/bin/ymake for linux-aarch64",
"9997224991": "devtools/ymake/bin/ymake for linux-aarch64",
+ "10032500430": "devtools/ymake/bin/ymake for win32",
"8270821739": "devtools/ymake/bin/ymake for win32",
"8295446553": "devtools/ymake/bin/ymake for win32",
"8326170338": "devtools/ymake/bin/ymake for win32",
@@ -3443,6 +3457,10 @@
"7336062757": "ynd-bin-frozen-python3-mingw-w64-x86_64-eacbfe8057414a218b407c837c9dcd8f2162f810",
"9953978780": "ynd-bin-gdb-16-linux-aarch64-75b1747759471591dae24f818ccdbb9c0d0c7e5a",
"9953829990": "ynd-bin-gdb-16-linux-x86_64-75b1747759471591dae24f818ccdbb9c0d0c7e5a",
+ "10030783988": "ynd-bin-ruff-darwin-arm64-6ddad8cd4552a9c633f96c3d44dc64f8e4a2e33c",
+ "10030936443": "ynd-bin-ruff-darwin-x86_64-6ddad8cd4552a9c633f96c3d44dc64f8e4a2e33c",
+ "10030741147": "ynd-bin-ruff-linux-x86_64-6ddad8cd4552a9c633f96c3d44dc64f8e4a2e33c",
+ "10031055394": "ynd-bin-ruff-mingw-w64-x86_64-6ddad8cd4552a9c633f96c3d44dc64f8e4a2e33c",
"8734866686": "ynd-clang-18-d-darwin-arm64-d2cdf1a5dd01799b0ce7a64e64d7808dc49fcaad",
"8735571670": "ynd-clang-18-d-darwin-x86_64-d2cdf1a5dd01799b0ce7a64e64d7808dc49fcaad",
"8735700393": "ynd-clang-18-d-linux-aarch64-d2cdf1a5dd01799b0ce7a64e64d7808dc49fcaad",
diff --git a/build/platform/yfm/resources.json b/build/platform/yfm/resources.json
index c636372c228..e1d04c021a7 100644
--- a/build/platform/yfm/resources.json
+++ b/build/platform/yfm/resources.json
@@ -1,16 +1,16 @@
{
"by_platform": {
"win32-x86_64": {
- "uri": "sbr:10002275143"
+ "uri": "sbr:10046921916"
},
"darwin-x86_64": {
- "uri": "sbr:10002271803"
+ "uri": "sbr:10046919284"
},
"linux-x86_64": {
- "uri": "sbr:10002267698"
+ "uri": "sbr:10046916652"
},
"darwin-arm64": {
- "uri": "sbr:10002271803"
+ "uri": "sbr:10046919284"
}
}
}
diff --git a/build/plugins/lib/nots/package_manager/pnpm/pnpm_package_manager.py b/build/plugins/lib/nots/package_manager/pnpm/pnpm_package_manager.py
index 43c96c21cee..62d4257f21b 100644
--- a/build/plugins/lib/nots/package_manager/pnpm/pnpm_package_manager.py
+++ b/build/plugins/lib/nots/package_manager/pnpm/pnpm_package_manager.py
@@ -224,6 +224,7 @@ class PnpmPackageManager(BasePackageManager):
"--no-verify-store-integrity",
"--prefer-offline" if local_cli else "--offline",
"--config.confirmModulesPurge=false", # hack for https://st.yandex-team.ru/FBP-1295
+ "--config.preferSymlinkedExecutables=true",
"--package-import-method",
"hardlink",
# "--registry" will be set later inside self._exec_command()
diff --git a/build/scripts/decimal_md5.py b/build/scripts/decimal_md5.py
index 2a125cca60f..3284140cde2 100644
--- a/build/scripts/decimal_md5.py
+++ b/build/scripts/decimal_md5.py
@@ -28,7 +28,7 @@ def ensure_paths_exist(paths):
def _update_digest_with_file_contents(digest, path, block_size=65535):
- with open(path) as f:
+ with open(path, 'rb') as f:
while True:
block = f.read(block_size)
if not block:
diff --git a/build/scripts/go_tool.py b/build/scripts/go_tool.py
index efc40126224..82927003bff 100644
--- a/build/scripts/go_tool.py
+++ b/build/scripts/go_tool.py
@@ -895,7 +895,7 @@ if __name__ == '__main__':
parser.add_argument('++toolchain-root', required=True)
parser.add_argument('++host-os', choices=['linux', 'darwin', 'windows'], required=True)
parser.add_argument('++host-arch', choices=['amd64', 'arm64'], required=True)
- parser.add_argument('++targ-os', choices=['linux', 'darwin', 'windows'], required=True)
+ parser.add_argument('++targ-os', choices=['linux', 'darwin', 'windows', 'android'], required=True)
parser.add_argument('++targ-arch', choices=['amd64', 'x86', 'arm64', 'armv6', 'armv7'], required=True)
parser.add_argument('++peers', nargs='*')
parser.add_argument('++non-local-peers', nargs='*')
diff --git a/build/scripts/mangle_typeinfo_names.py b/build/scripts/mangle_typeinfo_names.py
index 445829deb53..6c470042e13 100755
--- a/build/scripts/mangle_typeinfo_names.py
+++ b/build/scripts/mangle_typeinfo_names.py
@@ -175,7 +175,7 @@ def patch_elf_symbol_sizes(elf_data, elf64, sections, symbol_sizes):
if not symtab:
return
- for sym_i in range(symtab.size / symtab.entry_size):
+ for sym_i in range(symtab.size // symtab.entry_size):
symtab_entry_offset = symtab.data_offset + symtab.entry_size * sym_i
symtab_entry = elf_data[symtab_entry_offset : symtab_entry_offset + symtab.entry_size]
diff --git a/build/scripts/yndexer.py b/build/scripts/yndexer.py
index 4e766e0fc86..9b2c7ebe764 100644
--- a/build/scripts/yndexer.py
+++ b/build/scripts/yndexer.py
@@ -56,7 +56,7 @@ if __name__ == '__main__':
subprocess.check_call(tail_args)
clang = tail_args[0]
- out = subprocess.check_output([clang, '-print-search-dirs'])
+ out = subprocess.check_output([clang, '-print-search-dirs'], text=True)
resource_dir = rx_resource_dir.search(out).group(1)
yndexer_args = (
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 26e9f060df0..2e853fb4b5c 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -77,6 +77,7 @@ macro _SRC(EXT, SRC, SRCFLAGS...) {
}
USE_ARCADIA_COMPILER_RUNTIME=yes
+USE_STL_SYSTEM=no
when ($LOCAL && $XCODE) {
USE_ARCADIA_COMPILER_RUNTIME=no
@@ -224,7 +225,7 @@ when ($TIDY_ENABLED == "yes") {
TIDY_EXPORT_FIXES="no"
}
- CPP_ANALYSIS_ARGS=${hide:CLANG_TIDY_FAKEID} $YMAKE_PYTHON ${input:"build/scripts/clang_tidy.py"} "--ymake-python" $YMAKE_PYTHON "--clang-tidy-bin" $CLANG_TIDY_BIN "--config-validation-script" ${input:"build/tests/config/clang_tidy/tidy_config_validation.py"} "--testing-src" ${input:SRC} "--source-root" $(SOURCE_ROOT) "--build-root" $(BUILD_ROOT) "--tidy-json" ${noauto;output;suf=${COMPILE_OUT_SUFFIX}${OBJ_CROSS_SUF}.tidyjson:SRC} "--export-fixes" $TIDY_EXPORT_FIXES
+ CPP_ANALYSIS_ARGS=${hide:CLANG_TIDY_FAKEID} $YMAKE_PYTHON ${input:"build/scripts/clang_tidy.py"} "--ymake-python" $YMAKE_PYTHON3 "--clang-tidy-bin" $CLANG_TIDY_BIN "--config-validation-script" ${input:"build/tests/config/clang_tidy/tidy_config_validation.py"} "--testing-src" ${input:SRC} "--source-root" $(SOURCE_ROOT) "--build-root" $(BUILD_ROOT) "--tidy-json" ${noauto;output;suf=${COMPILE_OUT_SUFFIX}${OBJ_CROSS_SUF}.tidyjson:SRC} "--export-fixes" $TIDY_EXPORT_FIXES
CPP_ANALYSIS_ARGS+="--default-config-file" ${input:DEFAULT_TIDY_CONFIG}
CPP_ANALYSIS_ARGS+="--project-config-file" ${input:PROJECT_TIDY_CONFIG}
when ($TIDY_CHECKS) {
@@ -283,7 +284,7 @@ otherwise {
}
when ($RETRY == "yes") {
- RETRY_ARGS=$YMAKE_PYTHON ${input:"build/scripts/retry_cc.py"}
+ RETRY_ARGS=$YMAKE_PYTHON3 ${input:"build/scripts/retry_cc.py"}
}
otherwise {
RETRY_ARGS=
@@ -324,20 +325,7 @@ when ($OS_NONE == "yes" || $MAPSMOBI_BUILD_TARGET == "yes" && $OS_LINUX != "yes"
USE_STL_SYSTEM=yes
}
-# USE_INTERNAL_STL is an internal flag (set on by default) but may be used externally to
-# select system standard C++ library when USE_INTERNAL_STL=no is set.
-#
-# USE_STL_SYSTEM=yes is a regular way to select system standard C++ library.
-#
-when ($USE_STL_SYSTEM == "yes") {
- USE_INTERNAL_STL=no
-}
-
-when ($USE_INTERNAL_STL == "no") {
- USE_STL_SYSTEM=yes
-}
-otherwise {
- USE_INTERNAL_STL=yes
+when ($USE_STL_SYSTEM != "yes") {
# TODO: Extract to conf/sysincl.conf
# This trigger doesn't work for module level since SYSINCL is processed at
# configuration stage (This means that NO_RUNTIME() macro called in ya.make
@@ -456,7 +444,7 @@ when ($OS_EMSCRIPTEN == "yes") {
###
### @see https://a.yandex-team.ru/arc/trunk/arcadia/build/scripts/check_config_h.py for exact details
macro CHECK_CONFIG_H(Conf) {
- .CMD=$YMAKE_PYTHON ${input:"build/scripts/check_config_h.py"} ${rootrel;input:Conf} ${hide;from_input;output_include:Conf} ${output;suf=.config.cpp;nopath;noext:Conf} ${hide;kv:"p CH"} ${hide;kv:"pc yellow"}
+ .CMD=$YMAKE_PYTHON3 ${input:"build/scripts/check_config_h.py"} ${rootrel;input:Conf} ${hide;from_input;output_include:Conf} ${output;suf=.config.cpp;nopath;noext:Conf} ${hide;kv:"p CH"} ${hide;kv:"pc yellow"}
.STRUCT_CMD=yes
.SEM=${hide;rootrel;input:Conf} ${hide;output;suf=.config.cpp;nopath;noext:Conf}
.STRUCT_SEM=yes
@@ -544,7 +532,7 @@ when ($IS_CROSS_SANITIZE) {
YIELD=$YMAKE_PYTHON3 ${input:"build/scripts/yield_line.py"} -- ${BINDIR}/__args
XARGS=$YMAKE_PYTHON3 ${input:"build/scripts/xargs.py"} -- ${BINDIR}/__args
-WRITER_PY=$YMAKE_PYTHON ${input:"build/scripts/writer.py"} ${hide;input:"build/scripts/process_command_files.py"}
+WRITER_PY=$YMAKE_PYTHON3 ${input:"build/scripts/writer.py"} ${hide;input:"build/scripts/process_command_files.py"}
FS_TOOLS=$YMAKE_PYTHON3 ${input:"build/scripts/fs_tools.py"} ${hide;input:"build/scripts/process_command_files.py"}
FIX_MSVC_OUTPUT=${YMAKE_PYTHON3} ${input:"build/scripts/fix_msvc_output.py"} ${hide;input:"build/scripts/process_command_files.py"}
_PROCESS_WHOLE_ARCHIVE_SCRIPT=${hide;input:"build/scripts/process_command_files.py"} ${hide;input:"build/scripts/process_whole_archive_option.py"}
@@ -772,6 +760,7 @@ module _BASE_UNIT: _BARE_UNIT {
}
when ($NORUNTIME != "yes") {
+ # Note: this library supports both Arcadia and System STL modes thus trigger doesn't include USE_STL_SYSTEM
PEERDIR+=contrib/libs/cxxsupp
when ($MAPSMOBI_BUILD_TARGET == "yes") {
PEERDIR+=build/platform/mapkit
@@ -807,7 +796,7 @@ module _BASE_UNIT: _BARE_UNIT {
# doesn't affect cl since it has united C/C++ library and doesn't need
# proxy C-headers.
# Disable all C++ headers including proxy C-headers when we use libc++.
- when ($USE_INTERNAL_STL == "yes" && $MSVC != "yes") {
+ when ($USE_STL_SYSTEM != "yes" && $MSVC != "yes") {
CXXFLAGS += -nostdinc++
}
otherwise {
@@ -1266,7 +1255,7 @@ module _BASE_PROGRAM: _LINK_UNIT {
}
when ($_CUSTOM_LINK_STEP_SCRIPT) {
- LINK_SCRIPT_EXE_FLAGS+=--python=$YMAKE_PYTHON --custom-step=${input:_CUSTOM_LINK_STEP_SCRIPT}
+ LINK_SCRIPT_EXE_FLAGS+=--python=$YMAKE_PYTHON3 --custom-step=${input:_CUSTOM_LINK_STEP_SCRIPT}
}
}
@@ -1478,7 +1467,7 @@ module FUZZ: _BASE_PROGRAM {
# tag:ios-specific
PACK_IOS_CMD=
when ($OS_IOS && $BUILD_IOS_APP) {
- PACK_IOS_CMD=$YMAKE_PYTHON ${input:"build/scripts/pack_ios.py"} --binary $TARGET --target $TARGET --temp-dir $BINDIR $PEERS
+ PACK_IOS_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/pack_ios.py"} --binary $TARGET --target $TARGET --temp-dir $BINDIR $PEERS
}
LINK_BOOSTTEST_CMD=
@@ -2198,7 +2187,7 @@ module DLL_UNIT: _LINK_UNIT {
}
when ($_CUSTOM_LINK_STEP_SCRIPT) {
- LINK_DYN_LIB_FLAGS+=--python=$YMAKE_PYTHON --custom-step=${input:_CUSTOM_LINK_STEP_SCRIPT}
+ LINK_DYN_LIB_FLAGS+=--python=$YMAKE_PYTHON3 --custom-step=${input:_CUSTOM_LINK_STEP_SCRIPT}
}
}
@@ -3228,7 +3217,7 @@ macro _SRC("rl", SRC, SRCFLAGS...) {
}
macro _SRC("xsyn", SRC, SRCFLAGS...) {
- .CMD=$YMAKE_PYTHON ${input:"library/cpp/xml/parslib/xsyn2ragel.py"} ${input:SRC} ${input:"library/cpp/xml/parslib/xmlpars.xh"} dontuse ${stdout;output;suf=.h.rl5:SRC} ${hide;kv:"p XN"} ${hide;kv:"pc yellow"}
+ .CMD=$YMAKE_PYTHON3 ${input:"library/cpp/xml/parslib/xsyn2ragel.py"} ${input:SRC} ${input:"library/cpp/xml/parslib/xmlpars.xh"} dontuse ${stdout;output;suf=.h.rl5:SRC} ${hide;kv:"p XN"} ${hide;kv:"pc yellow"}
.STRUCT_CMD=yes
}
@@ -3254,7 +3243,7 @@ macro _SRC("rl6", SRC, SRCFLAGS...) {
# tag:src-processing
macro _SRC("xsyn", SRC, SRCFLAGS...) {
- .CMD=$YMAKE_PYTHON ${input:"library/cpp/xml/parslib/xsyn2ragel.py"} ${input:SRC} ${input:"library/cpp/xml/parslib/xmlpars.xh"} dontuse ${stdout;output;suf=.h.rl5:SRC} ${hide;kv:"p XN"} ${hide;kv:"pc yellow"}
+ .CMD=$YMAKE_PYTHON3 ${input:"library/cpp/xml/parslib/xsyn2ragel.py"} ${input:SRC} ${input:"library/cpp/xml/parslib/xmlpars.xh"} dontuse ${stdout;output;suf=.h.rl5:SRC} ${hide;kv:"p XN"} ${hide;kv:"pc yellow"}
}
# tag:src-processing
@@ -3509,7 +3498,7 @@ macro _SRC("make", SRC, SRCFLAGS...) {
# tag:src-processing
macro _SRC_py2src(SRC, SRCFLAGS...) {
- .CMD=${cwd:BINDIR} $YMAKE_PYTHON3 ${input:"build/scripts/compile_pysrc.py"} --input ${input:SRC} --output ${output;suf=.py2_raw.cpp;noext:SRC} --rescompiler ${tool:"tools/rescompiler"} py2 --python $(PYTHON)/python --py_compile ${input:"build/scripts/py_compile.py"} ${hide;kv:"p P2"} ${hide;kv:"pc light-green"}
+ .CMD=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/compile_pysrc.py"} --input ${input:SRC} --output ${output;suf=.py2_raw.cpp;noext:SRC} --rescompiler ${tool:"tools/rescompiler"} py2 --python $(PYTHON)/python --py_compile ${input:"build/scripts/py_compile.py"} ${hide;kv:"p P2"} ${hide;kv:"pc light-green"}
}
# tag:src-processing
@@ -3672,7 +3661,7 @@ otherwise {
# tag:src-processing
macro _SRC("po", SRC, SRCFLAGS...) {
- .CMD=$YMAKE_PYTHON ${input:"contrib/tools/python/src/Tools/i18n/msgfmt.py"} -o $_MO_OUTPUT ${input:SRC} ${hide;kv:"p PO"} ${hide;kv:"pc yellow"}
+ .CMD=$YMAKE_PYTHON3 ${input:"contrib/tools/python3/Tools/i18n/msgfmt.py"} -o $_MO_OUTPUT ${input:SRC} ${hide;kv:"p PO"} ${hide;kv:"pc yellow"}
.STRUCT_CMD=yes
}
@@ -4222,7 +4211,7 @@ DECIMAL_MD5_FIXED=
### Generates .cpp file <fileName> with one defined function 'const char* <funcName>() { return "<calculated_md5_hash>"; }'.
### <calculated_md5_hash> will be md5 hash for all inputs passed to this macro.
macro DECIMAL_MD5_LOWER_32_BITS(File, FUNCNAME="", Opts...) {
- .CMD=$YMAKE_PYTHON ${input:DECIMAL_MD5_SCRIPT} --fixed-output=${DECIMAL_MD5_FIXED} --func-name=${FUNCNAME} --lower-bits 32 --source-root=$ARCADIA_ROOT ${context=TEXT;input=TEXT:Opts} ${stdout;output:File} ${hide;kv:"p SV"} ${hide;kv:"pc yellow"} ${hide;kv:"show_out"}
+ .CMD=$YMAKE_PYTHON3 ${input:DECIMAL_MD5_SCRIPT} --fixed-output=${DECIMAL_MD5_FIXED} --func-name=${FUNCNAME} --lower-bits 32 --source-root=$ARCADIA_ROOT ${context=TEXT;input=TEXT:Opts} ${stdout;output:File} ${hide;kv:"p SV"} ${hide;kv:"pc yellow"} ${hide;kv:"show_out"}
.STRUCT_CMD=yes
}
@@ -4388,7 +4377,7 @@ macro NO_UTIL() {
### @usage: NO_RUNTIME()
###
### This macro:
-### 1. Sets the ENABLE(NOUTIL) + DISABLE(USE_INTERNAL_STL);
+### 1. Calls NO_UTIL()
### 2. If the project that contains the macro NO_RUNTIME(), peerdir-it project does not contain NO_RUNTIME() => Warning.
### Note: use this with care. Arcadia STL most likely will be linked into executable anyway, so using STL headers/functions/classes
### may not be detected at build time and may lead to unpredictable behavors at configure time.
@@ -4879,7 +4868,7 @@ macro RUN_PY3_PROGRAM(Tool, IN{input}[], IN_NOPARSE{input}[], OUT{output}[], OUT
# tag:java-specific
macro _RUN_ANTLR_BASE(IN{input}[], IN_NOPARSE{input}[], OUT{output}[], OUT_NOAUTO{output}[], OUTPUT_INCLUDES[], INDUCED_DEPS[], TOOL[], STDOUT="", STDOUT_NOAUTO="", CWD="", JAR{input}[], SEM="run_java", ENV[], HIDE_OUTPUT?"stderr2stdout":"stdout2stderr", GRAMMAR_FILES[], GRAMMAR_CWD="", Args...) {
PEERDIR(build/platform/java/jdk $JDK_RESOURCE_PEERDIR)
- .CMD=${cwd:CWD} ${cwd;rootdir;input:GRAMMAR_CWD} ${env:ENV} $YMAKE_PYTHON ${input;pre=build/scripts/;suf=.py:HIDE_OUTPUT} $JDK_RESOURCE/bin/java -jar ${input:JAR} ${rootrel;input:GRAMMAR_FILES} $Args ${hide;tool:TOOL} ${hide;input:IN} ${hide;context=TEXT;input=TEXT:IN_NOPARSE} ${hide;output_include:OUTPUT_INCLUDES} $INDUCED_DEPS ${hide;output:OUT} ${hide;noauto;output:OUT_NOAUTO} ${stdout;output:STDOUT} ${stdout;noauto;output:STDOUT_NOAUTO} ${hide;kv:"p JV"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"}
+ .CMD=${cwd:CWD} ${cwd;rootdir;input:GRAMMAR_CWD} ${env:ENV} $YMAKE_PYTHON3 ${input;pre=build/scripts/;suf=.py:HIDE_OUTPUT} $JDK_RESOURCE/bin/java -jar ${input:JAR} ${rootrel;input:GRAMMAR_FILES} $Args ${hide;tool:TOOL} ${hide;input:IN} ${hide;context=TEXT;input=TEXT:IN_NOPARSE} ${hide;output_include:OUTPUT_INCLUDES} $INDUCED_DEPS ${hide;output:OUT} ${hide;noauto;output:OUT_NOAUTO} ${stdout;output:STDOUT} ${stdout;noauto;output:STDOUT_NOAUTO} ${hide;kv:"p JV"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"}
.STRUCT_CMD=yes
.SEM=custom_runs-ITEM && custom_runs-depends ${input:IN} && custom_runs-command $SEM && custom_runs-command $Args && custom_runs-outputs ${output:OUT} ${noauto;output:OUT_NOAUTO} && $IF(${not;empty:CWD} THEN custom_runs-cwd ${CWD})
.STRUCT_SEM=yes
@@ -5398,7 +5387,7 @@ macro TASKLET_REG(Name, Lang, Impl, Includes...) {
PEERDIR+=tasklet/v1/runtime/js
}
- .CMD=$YMAKE_PYTHON ${input:"build/scripts/gen_tasklet_reg.py"} $Name -l $Lang -i $Impl ${noauto;output;suf=.task.cpp:Name} $Includes ${hide;output_include:Includes} $TASKLET_REG_INCLUDES ${hide;kv:"p TT"} ${hide;kv:"pc yellow"}
+ .CMD=$YMAKE_PYTHON3 ${input:"build/scripts/gen_tasklet_reg.py"} $Name -l $Lang -i $Impl ${noauto;output;suf=.task.cpp:Name} $Includes ${hide;output_include:Includes} $TASKLET_REG_INCLUDES ${hide;kv:"p TT"} ${hide;kv:"pc yellow"}
.STRUCT_CMD=yes
SRCS(GLOBAL $Name.task.cpp)
}
@@ -5408,7 +5397,7 @@ macro TASKLET_REG(Name, Lang, Impl, Includes...) {
macro TASKLET_REG_EXT(Name, Lang, Impl, Wrapper, Includes...) {
PEERDIR(tasklet/v1/domain sandbox/bin sandbox/taskbox/worker)
- .CMD=$YMAKE_PYTHON ${input:"build/scripts/gen_tasklet_reg.py"} $Name -l $Lang -i $Impl -w $Wrapper ${noauto;output;suf=.task.cpp:Name} $Includes ${hide;output_include:Includes} $TASKLET_REG_INCLUDES ${hide;kv:"p TT"} ${hide;kv:"pc yellow"}
+ .CMD=$YMAKE_PYTHON3 ${input:"build/scripts/gen_tasklet_reg.py"} $Name -l $Lang -i $Impl -w $Wrapper ${noauto;output;suf=.task.cpp:Name} $Includes ${hide;output_include:Includes} $TASKLET_REG_INCLUDES ${hide;kv:"p TT"} ${hide;kv:"pc yellow"}
SRCS(GLOBAL $Name.task.cpp)
}
@@ -5560,7 +5549,7 @@ macro DARWIN_SIGNED_RESOURCE(Resource, Relpath) {
# tag:ios-specific
DELIM=__DELIM__
-PACK_IOS_ARCHIVE=$GENERATE_MF && $YMAKE_PYTHON ${input:"build/scripts/ios_wrapper.py"} bin $IBTOOL_PATH $TARGET $REALPRJNAME $BINDIR $DELIM $AUTO_INPUT $DELIM $STORYBOARD_FLAGS
+PACK_IOS_ARCHIVE=$GENERATE_MF && $YMAKE_PYTHON3 ${input:"build/scripts/ios_wrapper.py"} bin $IBTOOL_PATH $TARGET $REALPRJNAME $BINDIR $DELIM $AUTO_INPUT $DELIM $STORYBOARD_FLAGS
### @usage: IOS_INTERFACE()
### iOS GUI module definition
module IOS_INTERFACE: _BARE_UNIT {
diff --git a/build/ymake_conf.py b/build/ymake_conf.py
index e57d6cae493..462b1c4b665 100755
--- a/build/ymake_conf.py
+++ b/build/ymake_conf.py
@@ -1225,6 +1225,8 @@ class GnuToolchain(Toolchain):
'$MACOS_SDK_RESOURCE_GLOBAL/usr/bin',
'$GO_FAKE_XCRUN_RESOURCE_GLOBAL',
])
+ elif target.is_android:
+ self.env_go['PATH'] = ['{}/llvm-toolchain/bin'.format(self.tc.name_marker), '/usr/bin']
self.swift_flags_platform = []
self.swift_lib_path = None