Skip to content

Commit 065c998

Browse files
NechdaNechda
committed
More scripts py3 migration
commit_hash:1a2377789930bc46d1b675e5efee76dd379cfc79
1 parent 5a8e43a commit 065c998

File tree

8 files changed

+28
-28
lines changed

8 files changed

+28
-28
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/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/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/scripts/decimal_md5.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def ensure_paths_exist(paths):
2828

2929

3030
def _update_digest_with_file_contents(digest, path, block_size=65535):
31-
with open(path) as f:
31+
with open(path, 'rb') as f:
3232
while True:
3333
block = f.read(block_size)
3434
if not block:

‎build/scripts/mangle_typeinfo_names.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def patch_elf_symbol_sizes(elf_data, elf64, sections, symbol_sizes):
175175
if not symtab:
176176
return
177177

178-
for sym_i in range(symtab.size / symtab.entry_size):
178+
for sym_i in range(symtab.size // symtab.entry_size):
179179
symtab_entry_offset = symtab.data_offset + symtab.entry_size * sym_i
180180
symtab_entry = elf_data[symtab_entry_offset : symtab_entry_offset + symtab.entry_size]
181181

‎build/ymake.core.conf‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ when ($TIDY_ENABLED == "yes") {
225225
TIDY_EXPORT_FIXES="no"
226226
}
227227

228-
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
228+
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
229229
CPP_ANALYSIS_ARGS+="--default-config-file" ${input:DEFAULT_TIDY_CONFIG}
230230
CPP_ANALYSIS_ARGS+="--project-config-file" ${input:PROJECT_TIDY_CONFIG}
231231
when ($TIDY_CHECKS) {
@@ -284,7 +284,7 @@ otherwise {
284284
}
285285

286286
when ($RETRY == "yes") {
287-
RETRY_ARGS=$YMAKE_PYTHON ${input:"build/scripts/retry_cc.py"}
287+
RETRY_ARGS=$YMAKE_PYTHON3 ${input:"build/scripts/retry_cc.py"}
288288
}
289289
otherwise {
290290
RETRY_ARGS=
@@ -444,7 +444,7 @@ when ($OS_EMSCRIPTEN == "yes") {
444444
###
445445
### @see https://a.yandex-team.ru/arc/trunk/arcadia/build/scripts/check_config_h.py for exact details
446446
macro CHECK_CONFIG_H(Conf) {
447-
.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"}
447+
.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"}
448448
.STRUCT_CMD=yes
449449
.SEM=${hide;rootrel;input:Conf} ${hide;output;suf=.config.cpp;nopath;noext:Conf}
450450
.STRUCT_SEM=yes
@@ -532,7 +532,7 @@ when ($IS_CROSS_SANITIZE) {
532532
YIELD=$YMAKE_PYTHON3 ${input:"build/scripts/yield_line.py"} -- ${BINDIR}/__args
533533
XARGS=$YMAKE_PYTHON3 ${input:"build/scripts/xargs.py"} -- ${BINDIR}/__args
534534

535-
WRITER_PY=$YMAKE_PYTHON ${input:"build/scripts/writer.py"} ${hide;input:"build/scripts/process_command_files.py"}
535+
WRITER_PY=$YMAKE_PYTHON3 ${input:"build/scripts/writer.py"} ${hide;input:"build/scripts/process_command_files.py"}
536536
FS_TOOLS=$YMAKE_PYTHON3 ${input:"build/scripts/fs_tools.py"} ${hide;input:"build/scripts/process_command_files.py"}
537537
FIX_MSVC_OUTPUT=${YMAKE_PYTHON3} ${input:"build/scripts/fix_msvc_output.py"} ${hide;input:"build/scripts/process_command_files.py"}
538538
_PROCESS_WHOLE_ARCHIVE_SCRIPT=${hide;input:"build/scripts/process_command_files.py"} ${hide;input:"build/scripts/process_whole_archive_option.py"}
@@ -1255,7 +1255,7 @@ module _BASE_PROGRAM: _LINK_UNIT {
12551255
}
12561256

12571257
when ($_CUSTOM_LINK_STEP_SCRIPT) {
1258-
LINK_SCRIPT_EXE_FLAGS+=--python=$YMAKE_PYTHON --custom-step=${input:_CUSTOM_LINK_STEP_SCRIPT}
1258+
LINK_SCRIPT_EXE_FLAGS+=--python=$YMAKE_PYTHON3 --custom-step=${input:_CUSTOM_LINK_STEP_SCRIPT}
12591259
}
12601260
}
12611261

@@ -1467,7 +1467,7 @@ module FUZZ: _BASE_PROGRAM {
14671467
# tag:ios-specific
14681468
PACK_IOS_CMD=
14691469
when ($OS_IOS && $BUILD_IOS_APP) {
1470-
PACK_IOS_CMD=$YMAKE_PYTHON ${input:"build/scripts/pack_ios.py"} --binary $TARGET --target $TARGET --temp-dir $BINDIR $PEERS
1470+
PACK_IOS_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/pack_ios.py"} --binary $TARGET --target $TARGET --temp-dir $BINDIR $PEERS
14711471
}
14721472

14731473
LINK_BOOSTTEST_CMD=
@@ -2187,7 +2187,7 @@ module DLL_UNIT: _LINK_UNIT {
21872187
}
21882188

21892189
when ($_CUSTOM_LINK_STEP_SCRIPT) {
2190-
LINK_DYN_LIB_FLAGS+=--python=$YMAKE_PYTHON --custom-step=${input:_CUSTOM_LINK_STEP_SCRIPT}
2190+
LINK_DYN_LIB_FLAGS+=--python=$YMAKE_PYTHON3 --custom-step=${input:_CUSTOM_LINK_STEP_SCRIPT}
21912191
}
21922192
}
21932193

@@ -3217,7 +3217,7 @@ macro _SRC("rl", SRC, SRCFLAGS...) {
32173217
}
32183218

32193219
macro _SRC("xsyn", SRC, SRCFLAGS...) {
3220-
.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"}
3220+
.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"}
32213221
.STRUCT_CMD=yes
32223222
}
32233223

@@ -3243,7 +3243,7 @@ macro _SRC("rl6", SRC, SRCFLAGS...) {
32433243

32443244
# tag:src-processing
32453245
macro _SRC("xsyn", SRC, SRCFLAGS...) {
3246-
.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"}
3246+
.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"}
32473247
}
32483248

32493249
# tag:src-processing
@@ -3498,7 +3498,7 @@ macro _SRC("make", SRC, SRCFLAGS...) {
34983498

34993499
# tag:src-processing
35003500
macro _SRC_py2src(SRC, SRCFLAGS...) {
3501-
.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"}
3501+
.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"}
35023502
}
35033503

35043504
# tag:src-processing
@@ -3661,7 +3661,7 @@ otherwise {
36613661

36623662
# tag:src-processing
36633663
macro _SRC("po", SRC, SRCFLAGS...) {
3664-
.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"}
3664+
.CMD=$YMAKE_PYTHON3 ${input:"contrib/tools/python3/Tools/i18n/msgfmt.py"} -o $_MO_OUTPUT ${input:SRC} ${hide;kv:"p PO"} ${hide;kv:"pc yellow"}
36653665
.STRUCT_CMD=yes
36663666
}
36673667

@@ -4211,7 +4211,7 @@ DECIMAL_MD5_FIXED=
42114211
### Generates .cpp file <fileName> with one defined function 'const char* <funcName>() { return "<calculated_md5_hash>"; }'.
42124212
### <calculated_md5_hash> will be md5 hash for all inputs passed to this macro.
42134213
macro DECIMAL_MD5_LOWER_32_BITS(File, FUNCNAME="", Opts...) {
4214-
.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"}
4214+
.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"}
42154215
.STRUCT_CMD=yes
42164216
}
42174217

@@ -4868,7 +4868,7 @@ macro RUN_PY3_PROGRAM(Tool, IN{input}[], IN_NOPARSE{input}[], OUT{output}[], OUT
48684868
# tag:java-specific
48694869
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...) {
48704870
PEERDIR(build/platform/java/jdk $JDK_RESOURCE_PEERDIR)
4871-
.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"}
4871+
.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"}
48724872
.STRUCT_CMD=yes
48734873
.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})
48744874
.STRUCT_SEM=yes
@@ -5387,7 +5387,7 @@ macro TASKLET_REG(Name, Lang, Impl, Includes...) {
53875387
PEERDIR+=tasklet/v1/runtime/js
53885388
}
53895389

5390-
.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"}
5390+
.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"}
53915391
.STRUCT_CMD=yes
53925392
SRCS(GLOBAL $Name.task.cpp)
53935393
}
@@ -5397,7 +5397,7 @@ macro TASKLET_REG(Name, Lang, Impl, Includes...) {
53975397
macro TASKLET_REG_EXT(Name, Lang, Impl, Wrapper, Includes...) {
53985398
PEERDIR(tasklet/v1/domain sandbox/bin sandbox/taskbox/worker)
53995399

5400-
.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"}
5400+
.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"}
54015401
SRCS(GLOBAL $Name.task.cpp)
54025402
}
54035403

@@ -5549,7 +5549,7 @@ macro DARWIN_SIGNED_RESOURCE(Resource, Relpath) {
55495549

55505550
# tag:ios-specific
55515551
DELIM=__DELIM__
5552-
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
5552+
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
55535553
### @usage: IOS_INTERFACE()
55545554
### iOS GUI module definition
55555555
module IOS_INTERFACE: _BARE_UNIT {

0 commit comments

Comments
 (0)