diff options
| author | nechda <[email protected]> | 2025-10-08 21:44:50 +0300 |
|---|---|---|
| committer | nechda <[email protected]> | 2025-10-08 22:05:59 +0300 |
| commit | 95d64bdb8ebb5ede32ef6b552d4fee72b2d3a04e (patch) | |
| tree | 0fcc70c87696a9c4720c1b945b7fcbfac9192a61 | |
| parent | 80cc6bcce370ede66d3c6819797a3fce6b804be1 (diff) | |
More scripts
Migrated scripts:
build/scripts/run\_tool.py
build/scripts/yield\_line.py
build/scripts/xargs.py
build/scripts/f2c.py
build/scripts/gen\_py\_reg.py
build/scripts/gen\_py3\_reg.py
build/scripts/configure\_file.py
build/scripts/mkver.py
build/scripts/symlink.py
build/scripts/fetch\_from\_archive.py
build/scripts/llvm\_opt\_wrapper.py
commit_hash:6ae158c774ba30642a97b15dde78f7c2a539856f
| -rw-r--r-- | build/scripts/f2c.py | 1 | ||||
| -rw-r--r-- | build/ymake.core.conf | 22 |
2 files changed, 12 insertions, 11 deletions
diff --git a/build/scripts/f2c.py b/build/scripts/f2c.py index fc1c1d0f8a1..d63092f336c 100644 --- a/build/scripts/f2c.py +++ b/build/scripts/f2c.py @@ -45,6 +45,7 @@ if __name__ == '__main__': stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE, + text=True, ) stdout, stderr = p.communicate(input=open(args.input).read()) ret = p.wait() diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 87bf606b003..06a4c1088c3 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -534,15 +534,15 @@ macro RESOURCE(Args...) { } # tag:sanitize -RUN_NO_SANITIZE=$YMAKE_PYTHON ${input:"build/scripts/run_tool.py"} -- +RUN_NO_SANITIZE=$YMAKE_PYTHON3 ${input:"build/scripts/run_tool.py"} -- # tag:sanitize when ($IS_CROSS_SANITIZE) { RUN_NO_SANITIZE= } -YIELD=$YMAKE_PYTHON ${input:"build/scripts/yield_line.py"} -- ${BINDIR}/__args -XARGS=$YMAKE_PYTHON ${input:"build/scripts/xargs.py"} -- ${BINDIR}/__args +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"} FS_TOOLS=$YMAKE_PYTHON3 ${input:"build/scripts/fs_tools.py"} ${hide;input:"build/scripts/process_command_files.py"} @@ -3345,7 +3345,7 @@ macro _SRC_f_new(SRC, SRCFLAGS...) { } macro _SRC_f_old(SRC, SRCFLAGS...) { - .CMD=$YMAKE_PYTHON ${input:"build/scripts/f2c.py"} -t ${tool:"contrib/tools/f2c"} -c ${input:SRC} -o ${output;suf=.c:SRC} ${hide;output_include:"f2c.h"} ${hide;kv:"p FT"} ${hide;kv:"pc light-green"} + .CMD=$YMAKE_PYTHON3 ${input:"build/scripts/f2c.py"} -t ${tool:"contrib/tools/f2c"} -c ${input:SRC} -o ${output;suf=.c:SRC} ${hide;output_include:"f2c.h"} ${hide;kv:"p FT"} ${hide;kv:"pc light-green"} .PEERDIR=contrib/libs/libf2c .ADDINCL=contrib/libs/libf2c } @@ -4079,7 +4079,7 @@ macro BUILDWITH_RAGEL6(Src, Options...) { ### ### Documentation: https://wiki.yandex-team.ru/devtools/commandsandvars/pysrcs/#makrospyregister macro _PY_REGISTER(Func) { - .CMD=$YMAKE_PYTHON ${input:"build/scripts/gen_py_reg.py"} $Func ${noauto;output;suf=.reg.cpp:Func} ${hide;kv:"p PY"} ${hide;kv:"pc yellow"} + .CMD=$YMAKE_PYTHON3 ${input:"build/scripts/gen_py_reg.py"} $Func ${noauto;output;suf=.reg.cpp:Func} ${hide;kv:"p PY"} ${hide;kv:"pc yellow"} .STRUCT_CMD=yes .STRUCT_SEM=yes SRCS(GLOBAL $Func.reg.cpp) @@ -4092,7 +4092,7 @@ macro _PY_REGISTER(Func) { ### ### Documentation: https://wiki.yandex-team.ru/devtools/commandsandvars/pysrcs/#makrospyregister macro _PY3_REGISTER(Func) { - .CMD=$YMAKE_PYTHON ${input:"build/scripts/gen_py3_reg.py"} $Func ${noauto;output;suf=.reg3.cpp:Func} ${hide;kv:"p PY"} ${hide;kv:"pc yellow"} + .CMD=$YMAKE_PYTHON3 ${input:"build/scripts/gen_py3_reg.py"} $Func ${noauto;output;suf=.reg3.cpp:Func} ${hide;kv:"p PY"} ${hide;kv:"pc yellow"} .STRUCT_CMD=yes .STRUCT_SEM=yes SRCS(GLOBAL $Func.reg3.cpp) @@ -4260,7 +4260,7 @@ macro CFG_VARS() { ### The values are collected during configure stage, while replacement itself happens during build stage. ### Used implicitly for .in-files processing. macro CONFIGURE_FILE(Src, Dst) { - .CMD=$YMAKE_PYTHON ${input:"build/scripts/configure_file.py"} ${input:Src} ${addincl;output:Dst} $CFG_VARS ${hide;kv:"p CF"} ${hide;kv:"pc yellow"} + .CMD=$YMAKE_PYTHON3 ${input:"build/scripts/configure_file.py"} ${input:Src} ${addincl;output:Dst} $CFG_VARS ${hide;kv:"p CF"} ${hide;kv:"pc yellow"} .STRUCT_CMD=yes .SEM=dir_macroses-ITEM && dir_macroses-macro set_vars && dir_macroses-args ${CFG_VARS} && target_commands-ITEM && target_commands-macro configure_file && target_commands-args ${"$S"}/${rootrel;input:Src} ${"$B"}/${rootrel;addincl;output:Dst} .STRUCT_SEM=yes @@ -4578,7 +4578,7 @@ macro GENERATE_ENUM_SERIALIZATION_WITH_HEADER(File) { ### ### Creates a header file DebianVersion.h define the DEBIAN_VERSION taken from the File. macro DEB_VERSION(File) { - .CMD=$YMAKE_PYTHON ${input:"build/scripts/mkver.py"} ${input:File} ${stdout;output:"DebianVersion.h"} ${hide;kv:"p CL"} ${hide;kv:"pc yellow"} + .CMD=$YMAKE_PYTHON3 ${input:"build/scripts/mkver.py"} ${input:File} ${stdout;output:"DebianVersion.h"} ${hide;kv:"p CL"} ${hide;kv:"pc yellow"} .STRUCT_CMD=yes } @@ -4672,7 +4672,7 @@ macro GEN_SCHEEME2(ScheemeName, FromFile) { ### @usage: SYMLINK(from to) ### Add symlink macro SYMLINK(From, To) { - .CMD=$YMAKE_PYTHON ${input:"build/scripts/symlink.py"} ${dirallowed;input:From} ${noauto;output:To} ${hide;kv:"p LN"} ${hide;kv:"pc light-cyan"} + .CMD=$YMAKE_PYTHON3 ${input:"build/scripts/symlink.py"} ${dirallowed;input:From} ${noauto;output:To} ${hide;kv:"p LN"} ${hide;kv:"pc light-cyan"} #.STRUCT_CMD=yes } @@ -4950,7 +4950,7 @@ macro LARGE_FILES(AUTOUPDATED?, Files...) { ### ### Process file archive as [FROM_SANDBOX()](#macro_FROM_SANDBOX). macro FROM_ARCHIVE(Src, OUT{output}[], OUT_NOAUTO{output}[], OUTPUT_INCLUDES[], INDUCED_DEPS[], PREFIX=".", RENAME[], EXECUTABLE?"--executable":"") { - .CMD=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/fetch_from_archive.py"} "--archive" ${input:Src} "--file-name" ${suf=-:Src} "--untar-to" $PREFIX ${pre=--rename :RENAME} $EXECUTABLE -- $OUT $OUT_NOAUTO ${hide;input:"build/scripts/fetch_from.py"} ${hide;output_include:OUTPUT_INCLUDES} $INDUCED_DEPS ${hide;output:OUT} ${hide;noauto;output:OUT_NOAUTO} ${hide;kv:"p FA"} ${hide;kv:"pc yellow"} ${hide;kv:"show_out"} + .CMD=${cwd:BINDIR} $YMAKE_PYTHON3 ${input:"build/scripts/fetch_from_archive.py"} "--archive" ${input:Src} "--file-name" ${suf=-:Src} "--untar-to" $PREFIX ${pre=--rename :RENAME} $EXECUTABLE -- $OUT $OUT_NOAUTO ${hide;input:"build/scripts/fetch_from.py"} ${hide;output_include:OUTPUT_INCLUDES} $INDUCED_DEPS ${hide;output:OUT} ${hide;noauto;output:OUT_NOAUTO} ${hide;kv:"p FA"} ${hide;kv:"pc yellow"} ${hide;kv:"show_out"} .STRUCT_CMD=yes } @@ -5098,7 +5098,7 @@ macro LLVM_LINK(Output, Inputs...) { ### Call llvm-opt with set of Opts on Input to produce Output. ### Note: Output name is used as is, no extension added. macro LLVM_OPT(Input, Output, Opts...) { - .CMD=$YMAKE_PYTHON ${input:"build/scripts/llvm_opt_wrapper.py"} ${CLANG_BC_ROOT}/bin/opt ${input:Input} -o ${noauto;output:Output} $Opts ${hide;kv:"p OP"} ${hide;kv:"pc yellow"} + .CMD=$YMAKE_PYTHON3 ${input:"build/scripts/llvm_opt_wrapper.py"} ${CLANG_BC_ROOT}/bin/opt ${input:Input} -o ${noauto;output:Output} $Opts ${hide;kv:"p OP"} ${hide;kv:"pc yellow"} .STRUCT_CMD=yes .SEM=custom_runs-ITEM && custom_runs-depends ${input:Input} && custom_runs-command ${"${LLVMOPT}"} ${input:Input} -o ${noauto;output:Output} $Opts && custom_runs-outputs ${noauto;output:Output} .STRUCT_SEM=yes |
