Skip to content

Commit 95d64bd

Browse files
NechdaNechda
committed
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
1 parent 80cc6bc commit 95d64bd

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

‎build/scripts/f2c.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ def mkdir_p(directory):
4545
stdout=subprocess.PIPE,
4646
stderr=subprocess.PIPE,
4747
stdin=subprocess.PIPE,
48+
text=True,
4849
)
4950
stdout, stderr = p.communicate(input=open(args.input).read())
5051
ret = p.wait()

‎build/ymake.core.conf‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -534,15 +534,15 @@ macro RESOURCE(Args...) {
534534
}
535535

536536
# tag:sanitize
537-
RUN_NO_SANITIZE=$YMAKE_PYTHON ${input:"build/scripts/run_tool.py"} --
537+
RUN_NO_SANITIZE=$YMAKE_PYTHON3 ${input:"build/scripts/run_tool.py"} --
538538

539539
# tag:sanitize
540540
when ($IS_CROSS_SANITIZE) {
541541
RUN_NO_SANITIZE=
542542
}
543543

544-
YIELD=$YMAKE_PYTHON ${input:"build/scripts/yield_line.py"} -- ${BINDIR}/__args
545-
XARGS=$YMAKE_PYTHON ${input:"build/scripts/xargs.py"} -- ${BINDIR}/__args
544+
YIELD=$YMAKE_PYTHON3 ${input:"build/scripts/yield_line.py"} -- ${BINDIR}/__args
545+
XARGS=$YMAKE_PYTHON3 ${input:"build/scripts/xargs.py"} -- ${BINDIR}/__args
546546

547547
WRITER_PY=$YMAKE_PYTHON ${input:"build/scripts/writer.py"} ${hide;input:"build/scripts/process_command_files.py"}
548548
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...) {
33453345
}
33463346

33473347
macro _SRC_f_old(SRC, SRCFLAGS...) {
3348-
.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"}
3348+
.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"}
33493349
.PEERDIR=contrib/libs/libf2c
33503350
.ADDINCL=contrib/libs/libf2c
33513351
}
@@ -4079,7 +4079,7 @@ macro BUILDWITH_RAGEL6(Src, Options...) {
40794079
###
40804080
### Documentation: https://wiki.yandex-team.ru/devtools/commandsandvars/pysrcs/#makrospyregister
40814081
macro _PY_REGISTER(Func) {
4082-
.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"}
4082+
.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"}
40834083
.STRUCT_CMD=yes
40844084
.STRUCT_SEM=yes
40854085
SRCS(GLOBAL $Func.reg.cpp)
@@ -4092,7 +4092,7 @@ macro _PY_REGISTER(Func) {
40924092
###
40934093
### Documentation: https://wiki.yandex-team.ru/devtools/commandsandvars/pysrcs/#makrospyregister
40944094
macro _PY3_REGISTER(Func) {
4095-
.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"}
4095+
.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"}
40964096
.STRUCT_CMD=yes
40974097
.STRUCT_SEM=yes
40984098
SRCS(GLOBAL $Func.reg3.cpp)
@@ -4260,7 +4260,7 @@ macro CFG_VARS() {
42604260
### The values are collected during configure stage, while replacement itself happens during build stage.
42614261
### Used implicitly for .in-files processing.
42624262
macro CONFIGURE_FILE(Src, Dst) {
4263-
.CMD=$YMAKE_PYTHON ${input:"build/scripts/configure_file.py"} ${input:Src} ${addincl;output:Dst} $CFG_VARS ${hide;kv:"p CF"} ${hide;kv:"pc yellow"}
4263+
.CMD=$YMAKE_PYTHON3 ${input:"build/scripts/configure_file.py"} ${input:Src} ${addincl;output:Dst} $CFG_VARS ${hide;kv:"p CF"} ${hide;kv:"pc yellow"}
42644264
.STRUCT_CMD=yes
42654265
.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}
42664266
.STRUCT_SEM=yes
@@ -4578,7 +4578,7 @@ macro GENERATE_ENUM_SERIALIZATION_WITH_HEADER(File) {
45784578
###
45794579
### Creates a header file DebianVersion.h define the DEBIAN_VERSION taken from the File.
45804580
macro DEB_VERSION(File) {
4581-
.CMD=$YMAKE_PYTHON ${input:"build/scripts/mkver.py"} ${input:File} ${stdout;output:"DebianVersion.h"} ${hide;kv:"p CL"} ${hide;kv:"pc yellow"}
4581+
.CMD=$YMAKE_PYTHON3 ${input:"build/scripts/mkver.py"} ${input:File} ${stdout;output:"DebianVersion.h"} ${hide;kv:"p CL"} ${hide;kv:"pc yellow"}
45824582
.STRUCT_CMD=yes
45834583
}
45844584

@@ -4672,7 +4672,7 @@ macro GEN_SCHEEME2(ScheemeName, FromFile) {
46724672
### @usage: SYMLINK(from to)
46734673
### Add symlink
46744674
macro SYMLINK(From, To) {
4675-
.CMD=$YMAKE_PYTHON ${input:"build/scripts/symlink.py"} ${dirallowed;input:From} ${noauto;output:To} ${hide;kv:"p LN"} ${hide;kv:"pc light-cyan"}
4675+
.CMD=$YMAKE_PYTHON3 ${input:"build/scripts/symlink.py"} ${dirallowed;input:From} ${noauto;output:To} ${hide;kv:"p LN"} ${hide;kv:"pc light-cyan"}
46764676
#.STRUCT_CMD=yes
46774677
}
46784678

@@ -4950,7 +4950,7 @@ macro LARGE_FILES(AUTOUPDATED?, Files...) {
49504950
###
49514951
### Process file archive as [FROM_SANDBOX()](#macro_FROM_SANDBOX).
49524952
macro FROM_ARCHIVE(Src, OUT{output}[], OUT_NOAUTO{output}[], OUTPUT_INCLUDES[], INDUCED_DEPS[], PREFIX=".", RENAME[], EXECUTABLE?"--executable":"") {
4953-
.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"}
4953+
.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"}
49544954
.STRUCT_CMD=yes
49554955
}
49564956

@@ -5098,7 +5098,7 @@ macro LLVM_LINK(Output, Inputs...) {
50985098
### Call llvm-opt with set of Opts on Input to produce Output.
50995099
### Note: Output name is used as is, no extension added.
51005100
macro LLVM_OPT(Input, Output, Opts...) {
5101-
.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"}
5101+
.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"}
51025102
.STRUCT_CMD=yes
51035103
.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}
51045104
.STRUCT_SEM=yes

0 commit comments

Comments
 (0)