diff options
| author | nechda <[email protected]> | 2025-10-20 09:12:34 +0300 |
|---|---|---|
| committer | nechda <[email protected]> | 2025-10-20 09:42:01 +0300 |
| commit | d6427b59fba7225b222f4137dcb9646ec80e0a31 (patch) | |
| tree | 1907e02d07e8dbaf6db65327b9e8be6d17f273f6 | |
| parent | bf6454375dff753aa121c9565efa6f28f173f77c (diff) | |
More scripts py3 migration
commit_hash:1a2377789930bc46d1b675e5efee76dd379cfc79
| -rw-r--r-- | build/conf/compilers/gnu_compiler.conf | 2 | ||||
| -rw-r--r-- | build/conf/project_specific/other.conf | 2 | ||||
| -rw-r--r-- | build/conf/proto.conf | 2 | ||||
| -rw-r--r-- | build/conf/python.conf | 12 | ||||
| -rw-r--r-- | build/conf/yndexing/cpp_instrumentation.conf | 2 | ||||
| -rw-r--r-- | build/scripts/decimal_md5.py | 2 | ||||
| -rwxr-xr-x | build/scripts/mangle_typeinfo_names.py | 2 | ||||
| -rw-r--r-- | build/ymake.core.conf | 32 |
8 files changed, 28 insertions, 28 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/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/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/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/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/ymake.core.conf b/build/ymake.core.conf index 74da3f8e79f..2e853fb4b5c 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -225,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) { @@ -284,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= @@ -444,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 @@ -532,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"} @@ -1255,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} } } @@ -1467,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= @@ -2187,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} } } @@ -3217,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 } @@ -3243,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 @@ -3498,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 @@ -3661,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 } @@ -4211,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 } @@ -4868,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 @@ -5387,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) } @@ -5397,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) } @@ -5549,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 { |
