Skip to content

Commit f6c547c

Browse files
authoriusauthorius
committed
Drop redundant command engine selectors
commit_hash:42c31bdc603f17c76fa501097b49cfd8774b972b
1 parent b763165 commit f6c547c

20 files changed

+0
-258
lines changed

‎build/conf/bison_lex.conf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,23 +138,18 @@ _SRC_y_env=M4=${tool:M4_PATH} BISON_PKGDATADIR=${ARCADIA_ROOT}/${_BISON_DATA_DIR
138138
macro _SRC("y", SRC, SRCFLAGS...) {
139139
.PEERDIR=build/induced/by_bison
140140
.CMD=${tool:"contrib/tools/bison"} $BISON_FLAGS ${env:_SRC_y_env} $_BISON_HEADER ${hide:_BISON_GEN_EXT} -o ${output;suf=$_BISON_GEN_EXT;nopath:SRC} ${input:SRC} ${SRCFLAGS} ${hide;kv:"p YC"} ${hide;kv:"pc light-green"} && $_BISON_PP
141-
.STRUCT_CMD=yes
142141
.SEM=target_macroses-ITEM && target_macroses-macro target_bison_parser && target_macroses-args PRIVATE ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o;nopath;noext:SRC} ${hide;output;suf=.h;nopath;noext:SRC} ${hide;addincl;output;suf=.h;nopath;noext:SRC} && platform_vars-BISON_FLAGS ${join= :BISON_FLAGS} && conan-tool_requires m4/1.4.19 && conan-imports 'bin, m4* -> ./bin/m4/bin' && conan-tool_requires bison/3.8.2 && conan-imports 'bin, bison* -> ./bin/bison/bin' && conan-imports 'res, * -> ./bin/bison/res'
143-
.STRUCT_SEM=yes
144142
}
145143

146144
macro _SRC("ypp", SRC, SRCFLAGS...) {
147145
.PEERDIR=build/induced/by_bison
148146
# TODO overloading support and redirection to `$_SRC(y $SRC $SRCFLAGS)`
149147
.CMD=${tool:"contrib/tools/bison"} $BISON_FLAGS ${env:_SRC_y_env} $_BISON_HEADER ${hide:_BISON_GEN_EXT} -o ${output;suf=$_BISON_GEN_EXT;nopath:SRC} ${input:SRC} ${SRCFLAGS} ${hide;kv:"p YC"} ${hide;kv:"pc light-green"} && $_BISON_PP
150-
.STRUCT_CMD=yes
151148
.SEM=target_macroses-ITEM && target_macroses-macro target_bison_parser && target_macroses-args PRIVATE ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o;nopath;noext:SRC} ${hide;output;suf=.h;nopath;noext:SRC} ${hide;addincl;output;suf=.h;nopath;noext:SRC} && platform_vars-BISON_FLAGS ${join= :BISON_FLAGS} && conan-tool_requires m4/1.4.19 && conan-imports 'bin, m4* -> ./bin/m4/bin' && conan-tool_requires bison/3.8.2 && conan-imports 'bin, bison* -> ./bin/bison/bin' && conan-imports 'res, * -> ./bin/bison/res'
152-
.STRUCT_SEM=yes
153149
}
154150

155151
macro _SRC("l", SRC, SRCFLAGS...) {
156152
.CMD=$_FLEX_TOOL $LEX_FLAGS ${SRCFLAGS} $_FLEX_HEADER ${hide:_FLEX_GEN_EXT} -o${output;suf=$_FLEX_GEN_EXT:SRC} ${hide;output_include:"util/system/compiler.h"} ${input:SRC} ${hide;kv:"p LX"} ${hide;kv:"pc yellow"}
157-
.STRUCT_CMD=yes
158153
.ADDINCL=$_FLEX_TOOL_DIR
159154
.SEM=target_macroses-ITEM && target_macroses-macro target_flex_lexers && target_macroses-args ${hide;tool:_FLEX_TOOL} ${hide;output;suf=${OBJ_SUF}.o:SRC} ${input:SRC} && platform_vars-LEX_FLAGS ${quo:LEX_FLAGS}
160155
}
@@ -163,14 +158,12 @@ macro _SRC("l", SRC, SRCFLAGS...) {
163158
macro _SRC("lex", SRC, SRCFLAGS...) {
164159
# TODO redirection .CMD=$_SRC(l $SRC $SRCFLAGS)
165160
.CMD=$_FLEX_TOOL $LEX_FLAGS ${SRCFLAGS} $_FLEX_HEADER ${hide:_FLEX_GEN_EXT} -o${output;suf=$_FLEX_GEN_EXT:SRC} ${hide;output_include:"util/system/compiler.h"} ${input:SRC} ${hide;kv:"p LX"} ${hide;kv:"pc yellow"}
166-
.STRUCT_CMD=yes
167161
.ADDINCL=$_FLEX_TOOL_DIR
168162
}
169163

170164
# tag:src-processing
171165
macro _SRC("lpp", SRC, SRCFLAGS...) {
172166
# TODO redirection .CMD=$_SRC(l $SRC $SRCFLAGS)
173167
.CMD=$_FLEX_TOOL $LEX_FLAGS ${SRCFLAGS} $_FLEX_HEADER ${hide:_FLEX_GEN_EXT} -o${output;suf=$_FLEX_GEN_EXT:SRC} ${hide;output_include:"util/system/compiler.h"} ${input:SRC} ${hide;kv:"p LX"} ${hide;kv:"pc yellow"}
174-
.STRUCT_CMD=yes
175168
.ADDINCL=$_FLEX_TOOL_DIR
176169
}

‎build/conf/docs.conf‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ TOUCH_DOCS_MF=$TOUCH_DOCS && $GENERATE_MF
1212
### Copy files from src_dir to $BINDIR/dst_dir
1313
macro DOCS_COPY_FILES(FROM="${CURDIR}", NAMESPACE=".", FILES...) {
1414
.CMD=$YMAKE_PYTHON3 ${input:"build/scripts/copy_docs_files.py"} ${hide;input:"build/scripts/process_command_files.py"} --source-root $ARCADIA_ROOT --build-root $ARCADIA_BUILD_ROOT --src-dir $FROM --dst-dir $BINDIR/$NAMESPACE $FILES ${hide;context=TEXT;input=TEXT;pre=${FROM}/:FILES} ${hide;output;pre=${NAMESPACE}/:FILES} $_DOCS_KV
15-
.STRUCT_CMD=yes
1615
}
1716

1817
# tag:docs
@@ -59,8 +58,6 @@ _DOCS_YFM_CMD=$_DOCS_YFM_CMD_IMPL($_DOCS_CONFIG_VALUE EXTRA_INPUTS $_DOCS_EXTRA_
5958
module _DOCS_BARE_UNIT: _BARE_UNIT {
6059
.ALLOWED=DOCS_DIR DOCS_CONFIG DOCS_VARS
6160
.CMD=$TOUCH_DOCS_MF
62-
.STRUCT_CMD=yes
63-
.STRUCT_SEM=yes
6461
.FINAL_TARGET=no
6562
.NODE_TYPE=Bundle
6663
.PEERDIR_POLICY=as_include
@@ -241,7 +238,6 @@ module DOCS_HTML: _DOCS_BARE_UNIT {
241238
.EPILOGUE=_DOCS_HTML_EPILOGUE
242239
.FINAL_TARGET=yes
243240
.PEERDIR_POLICY=as_build_from
244-
.STRUCT_CMD=yes
245241

246242
DISABLE(_DOCS_HTML_FROM_CALLED)
247243
SET(_DOCS_HTML_FROM_VALUE __unset_docslib_from__)

‎build/conf/fbs.conf‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@ _PY_FBS_DEPS=contrib/python/flatbuffers
2323
### for 'ya make ...' (tar archive is extracted to output directory).
2424
macro FBS_TO_PYSRC(OUT_NAME, IN_FBS_FILES...) {
2525
.CMD=${cwd:ARCADIA_BUILD_ROOT} ${tool:FLATC} --python --no-warnings --python-typing --gen-mutable ${FLATC_FLAGS_VALUE} ${pre=-I :_FLATC__INCLUDE} -o ${BINDIR} ${input:IN_FBS_FILES} && $YMAKE_PYTHON3 ${input:"build/scripts/tar_sources.py"} --exts .py --input $BINDIR --output ${tared;noauto;output;suf=.py3.fbs.pysrc:OUT_NAME} ${hide;kv:"p FP"} ${hide;kv:"pc light-green"} ${hide;kv:"tared_kind nodir"} ${hide:FBS_FAKEID}
26-
.STRUCT_CMD=yes
2726
}
2827

2928
macro FBS_TO_PY2SRC(OUT_NAME, IN_FBS_FILES...) {
3029
.CMD=${cwd:ARCADIA_BUILD_ROOT} ${tool:"contrib/deprecated/flatc"} --python --gen-mutable ${FLATC_FLAGS_VALUE} ${pre=-I :_FLATC__INCLUDE} -o ${BINDIR} ${input:IN_FBS_FILES} && $YMAKE_PYTHON3 ${input:"build/scripts/tar_sources.py"} --exts .py --input $BINDIR --output ${tared;noauto;output;suf=.py2.fbs.pysrc:OUT_NAME} ${hide;kv:"p FP"} ${hide;kv:"pc light-green"} ${hide;kv:"tared_kind nodir"} ${hide:FBS_FAKEID}
31-
.STRUCT_CMD=yes
3230
}
3331

3432
# tag:fbs tag:go-specific
@@ -60,7 +58,6 @@ macro _CPP_FLATC64_CMD(SRC, SRCFLAGS...) {
6058
### (tar archive is extracted to output directory).
6159
macro _GO_FLATC_CMD(SRC, PACKAGE_NAME) {
6260
.CMD=${cwd:ARCADIA_BUILD_ROOT} ${tool:FLATC} --go --gen-mutable --go-namespace ${PACKAGE_NAME} ${FLATC_FLAGS_VALUE} ${pre=-I :_FLATC__INCLUDE} -o ${BINDIR}/_generated ${input:SRC} && $YMAKE_PYTHON3 ${input:"build/scripts/postprocess_go_fbs.py"} --arcadia-prefix ${GO_ARCADIA_PROJECT_PREFIX} --input-dir ${BINDIR} --map $_FBS_NAMESPACE_MAP_GLOBAL && $YMAKE_PYTHON3 ${input:"build/scripts/tar_sources.py"} --flat --input ${BINDIR}/_generated --output ${tared;output;suf=.fbs.gosrc;noext:SRC} --exts .go ${hide;kv:"p FG"} ${hide;kv:"pc light-green"} ${hide;kv:"tared_kind nodir"} ${hide:FBS_FAKEID}
63-
.STRUCT_CMD=yes
6461
.PEERDIR=${_GO_FLATC_IMPORTS}
6562
}
6663

@@ -154,7 +151,6 @@ macro FBS_CMD(SRC, SRCFLAGS...) {
154151
### Produce flatbuf schema out of protobuf description.
155152
macro PROTO2FBS(File) {
156153
.CMD=${cwd:BINDIR} ${tool:FLATC} -I . -I ${ARCADIA_ROOT} --proto ${input:File} ${hide;norel;output;suf=.fbs;noext:File} ${hide;kv:"p FBS"} ${hide;kv:"pc yellow"} && $MOVE_FILE ${BINDIR}/${suf=.fbs;nopath;noext:File} ${norel;output;suf=.fbs;noext:File}
157-
.STRUCT_CMD=yes
158154
}
159155

160156
_CPP_FLATC_CMDLINE=$_CPP_FLATC_CMD($SRC $SRCFLAGS)

‎build/conf/go.conf‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -215,29 +215,22 @@ _GO_TOOL_COMMON_FLAGS=\
215215
# tag:go-specific
216216
macro _GO_GEN_COVER_GO(GO_FILE, GO_COVER_OUTPUT, VAR_ID) {
217217
.CMD=${hide:_GO_FAKEID} ${cwd;rootdir;input:GO_FILE} $GO_TOOLS_ROOT/pkg/tool/$_GO_TC_PATH/cover -mode set -var $VAR_ID -o ${output;suf=.cover.go;noext:GO_COVER_OUTPUT} ${rootrel;input:GO_FILE} ${hide;kv:"p go"} ${hide;kv:"pc light-blue"}
218-
.STRUCT_CMD=yes
219218
}
220219

221220
# tag:go-specific
222221
macro _GO_COMPILE_SYMABIS(FLAGS[], ASM_FILES...) {
223222
.CMD=${hide:_CGO_FAKEID} $GO_TOOLS_ROOT/pkg/tool/$_GO_TC_PATH/asm $_GO_COMPILE_SYMABIS_TRIMPATH__NO_UID__ ${pre=-I :_C__INCLUDE} -I $GO_TOOLS_ROOT/pkg/include -D GOOS_${GO_TARG_OS} -D GOARCH_${GO_TARG_ARCH} $FLAGS $GO_ASM_FLAGS_VALUE -gensymabis -o ${output:"gen.symabis"} ${input:ASM_FILES} ${hide;kv:"p go"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"}
224-
.STRUCT_CMD=yes
225-
.STRUCT_SEM=yes
226223
.ADDINCL=build/scripts/go_fake_include
227224
}
228225

229226
# tag:go-specific
230227
macro _GO_COMPILE_CGO1(NAME, FLAGS[], FILES...) {
231228
.CMD=${hide:_CGO_FAKEID} ${cwd:ARCADIA_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/cgo1_wrapper.py"} $_GO_CGO1_WRAPPER_FLAGS --build-root ${ARCADIA_BUILD_ROOT} --source-root ${ARCADIA_ROOT} --cgo1-files ${output;suf=.cgo1.go;noext:FILES} --cgo2-files ${noauto;output;suf=.cgo2.c;noext:FILES} -- ${GO_TOOLS_ROOT}/pkg/tool/$_GO_TC_PATH/cgo -objdir $BINDIR -importpath $NAME $GO_CGO1_FLAGS_VALUE $FLAGS -- $C_FLAGS_PLATFORM ${pre=-I:_C__INCLUDE} ${CGO_CFLAGS_VALUE} ${input:FILES} ${hide;output:"_cgo_export.h"} ${hide;output:"_cgo_export.c"} ${hide;output:"_cgo_gotypes.go"} ${hide;noauto;output:"_cgo_main.c"} $GO_TOOLCHAIN_ENV ${hide;kv:"p go"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"}
232-
.STRUCT_CMD=yes
233-
.STRUCT_SEM=yes
234229
}
235230

236231
# tag:go-specific
237232
macro _GO_COMPILE_CGO2(NAME, C_FILES[], S_FILES[], OBJ_FILES[], FILES...) {
238233
.CMD=${hide:_CGO_FAKEID} $C_COMPILER $C_FLAGS_PLATFORM ${pre=-I:_C__INCLUDE} $CGO_CFLAGS_VALUE ${tobindir;input:"_cgo_main.c"} -c -o ${noauto;tmp;suf=${OBJECT_SUF}:"_cgo_main.c"} && $YMAKE_PYTHON3 ${input:"build/scripts/link_o.py"} $C_COMPILER $C_FLAGS_PLATFORM ${pre=-I:_C__INCLUDE} -o ${noauto;tmp;suf=${OBJECT_SUF}:"_cgo_"} $LDFLAGS $LDFLAGS_GLOBAL $CGO2_LDFLAGS_VALUE ${hide;input:"_cgo_export.h"} ${noauto;tmp;suf=${OBJECT_SUF}:"_cgo_main.c"} ${input;suf=${OBJECT_SUF}:"_cgo_export.c"} ${input;suf=.cgo2.c${OBJECT_SUF};nopath;noext:FILES} ${input;suf=${OBJECT_SUF}:C_FILES} ${input;suf=.o:S_FILES} ${input:OBJ_FILES} $CGO_LDFLAGS_VALUE && ${GO_TOOLS_ROOT}/pkg/tool/$_GO_TC_PATH/cgo -dynpackage $NAME -dynimport ${noauto;tmp;suf=${OBJECT_SUF}:"_cgo_"} -dynout ${output:"_cgo_import.go"} -dynlinker $GO_CGO2_FLAGS_VALUE $GO_TOOLCHAIN_ENV ${hide;kv:"p go"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"}
239-
.STRUCT_CMD=yes
240-
.STRUCT_SEM=yes
241234

242235
_USE_LINKER()
243236
}
@@ -580,7 +573,6 @@ macro _GO_GRPC_GATEWAY_SRCS_IMPL_DISPATCH(Ext, File) {
580573
}
581574
macro _GO_GRPC_GATEWAY_SRCS_IMPL_DISPATCH("proto", File) {
582575
.CMD=$_GO_PROTO_CMD_IMPL($File $_GO_PROTO_GRPC_GATEWAY_OPTS $_GO_PROTO_GRPC_GATEWAY_OUTS)
583-
.STRUCT_CMD=yes
584576
}
585577

586578
# tag:go-specific
@@ -652,7 +644,6 @@ macro _GO_GRPC_GATEWAY_V2_SRCS_IMPL_DISPATCH(Ext, File) {
652644
}
653645
macro _GO_GRPC_GATEWAY_V2_SRCS_IMPL_DISPATCH("proto", File) {
654646
.CMD=$_GO_PROTO_CMD_IMPL($File $_GO_PROTO_GRPC_GATEWAY_V2_OPTS $_GO_PROTO_GRPC_GATEWAY_V2_OUTS)
655-
.STRUCT_CMD=yes
656647
}
657648

658649
# tag:go-specific
@@ -682,8 +673,6 @@ otherwise {
682673
module _GO_BASE_UNIT: _BASE_UNIT {
683674
.EXTS=.go .gosrc .o .obj .sbom .a .symabis .mf .pyplugin
684675
.CMD=$TOUCH_UNIT
685-
.STRUCT_CMD=yes
686-
.STRUCT_SEM=yes
687676
.NODE_TYPE=Bundle
688677
.GLOBAL=GO_LDFLAGS OBJADDE_LIB
689678
.PEERDIR_POLICY=as_build_from
@@ -1130,7 +1119,6 @@ macro GO_MOCKGEN_REFLECT() {
11301119
PEERDIR(${MOCKGEN_FROM})
11311120

11321121
.CMD=${cwd:BINDIR} ${tool:_GO_TOOL_REFLECTOR} ${MOCKGEN_MODULE} ${MOCKGEN_TYPES} ${stdout;output:"main.go"} ${hide;kv:"p GR"} ${hide;kv:"pc blue"}
1133-
.STRUCT_CMD=yes
11341122
}
11351123

11361124
# tag:go-specific
@@ -1139,7 +1127,6 @@ macro _GO_MOCKGEN_MOCKS_IMPL(GEN_TOOL) {
11391127
PEERDIR(vendor/go.uber.org/mock/gomock)
11401128

11411129
.CMD=${cwd:BINDIR} ${tool:GEN_TOOL} -output gob.data && ${cwd:BINDIR} ${tool:_GO_TOOL_MOCKGEN} -package ${MOCKGEN_PACKAGE} -model_gob gob.data ${stdout;output:"main.go"} $_GO_TOOL_ENV ${hide;kv:"p GM"} ${hide;kv:"pc blue"}
1142-
.STRUCT_CMD=yes
11431130
}
11441131

11451132
# tag:go-specific
@@ -1168,7 +1155,6 @@ macro _GO_MOCKGEN_SOURCE_IMPL(SOURCE, FILENAME, ARGS[], IN_NOPARSE[]) {
11681155
PEERDIR(${GOSTD}/context)
11691156
PEERDIR(vendor/go.uber.org/mock/gomock)
11701157
.CMD=$_GO_MOCKGEN_SOURCE_CMDLINE
1171-
.STRUCT_CMD=yes
11721158
}
11731159

11741160
# tag:go-specific
@@ -1183,7 +1169,6 @@ macro GO_MOCKGEN_SOURCE(FILE, ARGS[], IN_NOPARSE[]) {
11831169

11841170
macro _GO_OAPI_CODEGEN_IMPL(TOOL, IN, FILENAME, GENERATE="", PACKAGE="", TEMPLATES="", CONFIG="", IN_NOPARSE[], Args...) {
11851171
.CMD=${cwd:ARCADIA_BUILD_ROOT} ${tool:TOOL} ${pre=--generate :GENERATE} ${pre=--package :PACKAGE} ${pre=--templates :TEMPLATES} ${pre=--config ;context=TEXT;input=TEXT:CONFIG} $Args ${context=TEXT;input=TEXT:IN} ${hide;context=TEXT;input=TEXT:IN_NOPARSE} ${stdout;output:FILENAME} ${_GO_TOOL_ENV} ${hide;kv:"p GC"} ${hide;kv:"pc blue"}
1186-
.STRUCT_CMD=yes
11871172
}
11881173

11891174
# tag:go-specific

‎build/conf/java.conf‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ macro _INPUT_WITH_FLAG(Flag, IN[]) {
55
macro ACCELEO(XSD{input}[], MTL{input}[], MTL_ROOT="${MODDIR}", LANG{input}[], OUT{output}[], OUT_NOAUTO{output}[], OUTPUT_INCLUDES[], DEBUG?"stdout2stderr":"stderr2stdout") {
66
.PEERDIR=build/platform/java/jdk $JDK_RESOURCE_PEERDIR
77
.CMD=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input;pre=build/scripts/;suf=.py:DEBUG} $JDK_RESOURCE/bin/java -Dfile.encoding=utf8 -classpath ${RUN_JAR_PROG_CP_PRE}${tool:"tools/acceleo"}${RUN_JAR_PROG_CP_SUF} ru.yandex.se.logsng.tool.Cli $_INPUT_WITH_FLAG(--xsd IN $XSD) $_INPUT_WITH_FLAG(--mtl IN $MTL) $_INPUT_WITH_FLAG(--lang IN $LANG) --output-dir $BINDIR --build-root ${ARCADIA_BUILD_ROOT} --source-root ${ARCADIA_ROOT} --mtl-root $MTL_ROOT ${hide;output_include:OUTPUT_INCLUDES} ${hide;output:OUT} ${hide;noauto;output:OUT_NOAUTO} ${hide;kv:"p JV"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"}
8-
.STRUCT_CMD=yes
98
}
109

1110
### @usage: JAVA_LIBRARY()
@@ -412,7 +411,6 @@ EXT_JAVA_VCS_INFO=no
412411
### By default this is disabled.
413412
macro EMBED_JAVA_VCS_INFO() {
414413
.SEM=add_vcs_info_to_mf ${hide;output:"VcsInfoMfDummy.java"}
415-
.STRUCT_SEM=yes
416414
ENABLE(EXT_JAVA_VCS_INFO)
417415
}
418416

@@ -433,7 +431,6 @@ module EXTERNAL_JAVA_LIBRARY: _BASE_UNIT {
433431
.NODE_TYPE=Bundle
434432
.CMD=$COMPILE_JAVA_MF
435433
.SEM=$_EXTERNAL_JAVA_LIBRARY_SEM
436-
.STRUCT_CMD=yes
437434
.PEERDIR_POLICY=as_build_from
438435
.FINAL_TARGET=no
439436
.ALIASES=SRCS=_SRCS_NO_GLOBAL
@@ -581,9 +578,7 @@ macro _DO_2_RUN_JAR_PROGRAM(IN_DIRS_VAR="uniq_", IN_DIRS_INPUTS[], IN{input}[],
581578
_CHECK_RUN_JAVA_PROG_CLASSPATH($CLASSPATH)
582579
.PEERDIR=build/platform/java/jdk $JDK_RESOURCE_PEERDIR
583580
.CMD=${hide;kv:"p RJ"} ${hide;kv:"pc blue"} ${hide:JAVA_FAKEID} ${cwd:BINDIR} $YMAKE_PYTHON3 ${input:"build/scripts/mkdir.py"} ${OUT_DIR} && ${cwd:CWD} $YMAKE_PYTHON3 ${input:"build/scripts/setup_java_tmpdir.py"} $YMAKE_PYTHON3 ${input:"build/scripts/stdout2stderr.py"} ${pre=--file=:STDOUT} ${hide;output:STDOUT} ${pre=--file=:STDOUT_NOAUTO} ${hide;noauto;output:STDOUT_NOAUTO} $YMAKE_PYTHON3 ${input:"build/scripts/fix_java_command_file_cp.py"} --build-root ${ARCADIA_BUILD_ROOT} $JDK_RESOURCE/bin/java -Dfile.encoding=utf8 -classpath ${RUN_JAR_PROG_CP_PRE}${tool:CLASSPATH}${RUN_JAR_PROG_CP_SUF} ${Args} && $_GENTAR_HELPER(HASH_SUF $HASH_SUF OUT_DIR $OUT_DIR) ${hide;input:IN} ${hide;context=TEXT;input=TEXT:IN_NOPARSE} ${hide;noauto;output:OUT_NOAUTO} ${hide;output:OUT} ${hide;tool:TOOL} ${hide;input:IN_DIRS_INPUTS}
584-
.STRUCT_CMD=yes
585581
.SEM=runs-ITEM && runs-args ${Args} && runs-classpath ${RUN_JAR_PROG_CP_PRE}${tool:CLASSPATH}${RUN_JAR_PROG_CP_SUF} && runs-cwd ${CWD} ${hide;cwd:CWD} && runs-in ${IN} ${hide;input:IN} && runs-in_dir ${IN_DIR} && runs-in_noparse ${IN_NOPARSE} ${hide;context=TEXT;input=TEXT:IN_NOPARSE} && runs-out ${OUT} ${hide;output:OUT} ${OUT_NOAUTO} ${hide;noauto;output:OUT_NOAUTO} $_GENTAR_HELPER(HASH_SUF $HASH_SUF OUT_DIR $OUT_DIR) && runs-out_dir ${OUT_DIR} && runs-tool ${tool:TOOL}
586-
.STRUCT_SEM=yes
587582
}
588583

589584
# tag:java-specific
@@ -640,8 +635,6 @@ macro _NOOP_MACRO(Args...) {
640635
module _JAR_BASE: _BARE_UNIT {
641636
.NODE_TYPE=Bundle
642637
.CMD=$TOUCH_UNIT
643-
.STRUCT_CMD=yes
644-
.STRUCT_SEM=yes
645638
.PEERDIR_POLICY=as_build_from
646639
.FINAL_TARGET=no
647640
.ALIASES=SRCS=_SRCS_NO_GLOBAL
@@ -2284,8 +2277,6 @@ module JSRC_LIBRARY: _BARE_UNIT {
22842277
.EXTS=.java
22852278
.FINAL_TARGET=no
22862279
.PEERDIR_POLICY=as_include
2287-
.STRUCT_CMD=yes
2288-
.STRUCT_SEM=yes
22892280
PEERDIR_TAGS=JAVA JAVA_PROTO JAVA_PROTO_FROM_SCHEMA JAVA_FBS JAVA_IDL
22902281
MODULE_TYPE=LIBRARY
22912282
SET(MODULE_SUFFIX .jsrc)
@@ -2322,7 +2313,6 @@ otherwise {
23222313
### Specify JDK version for module
23232314
macro _JDK_VERSION_INTERNAL(Arg) {
23242315
.SEM=required_jdk $Arg ${hide;output:"JdkVersionFakeProp.java"}
2325-
.STRUCT_SEM=yes
23262316
SET(JDK_REAL_VERSION $Arg)
23272317
_JDK_VERSION_MACRO_CHECK($Arg)
23282318
ENABLE(HAS_PER_MODULE_JDK_VERSION)

‎build/conf/project_specific/other.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@ BUILD_CATBOOST_SCRIPT=build/scripts/build_catboost.py
88
### CatBoost specific macro.
99
macro BUILD_CATBOOST(CbModel, CbName) {
1010
.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"}
11-
.STRUCT_CMD=yes
1211
}

‎build/conf/project_specific/yt.conf‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
macro GENERATE_YT_RECORD(Yaml, OUTPUT_INCLUDES[]) {
22
.CMD=${tool:"yt/yt/tools/record_codegen/yt_record_codegen/bin"} --input ${input:Yaml} --output-root $ARCADIA_BUILD_ROOT --output-cpp ${norel;output;suf=.record.cpp;noext:Yaml} ${hide;norel;output;suf=.record.h;noext:Yaml} ${pre=--output-include :OUTPUT_INCLUDES} ${hide;output_include:OUTPUT_INCLUDES} ${hide;output_include:"yt/yt/client/table_client/record_codegen_deps.h"} ${hide;kv:"p RC"}
3-
.STRUCT_CMD=yes
43
.SEM=custom_runs-ITEM && custom_runs-outputs ${norel;output;suf=.record.cpp;noext:Yaml} ${norel;output;suf=.record.h;noext:Yaml} && custom_runs-depends ${input:Yaml} ${input:"yt/yt/tools/record_codegen/yt_record_codegen/__init__.py"} ${input:"yt/yt/tools/record_codegen/yt_record_codegen/templates/cpp.j2"} ${input:"yt/yt/tools/record_codegen/yt_record_codegen/templates/h.j2"} ${input:"yt/yt/tools/record_codegen/yt_record_codegen/lib/__init__.py"} ${input:"yt/yt/tools/record_codegen/yt_record_codegen/bin/__main__.py"} && custom_runs-cwd ${ARCADIA_ROOT}/yt/yt/tools/record_codegen && custom_runs-command ${"$"}{Python3_EXECUTABLE} -B -m yt_record_codegen.bin --input ${input:Yaml} --output-root $ARCADIA_BUILD_ROOT --output-cpp ${norel;output;suf=.record.cpp;noext:Yaml} ${pre=--output-include :OUTPUT_INCLUDES} ${hide;norel;output;suf=.record.h;noext:Yaml} && custom_runs-cmake_packages-ITEM && custom_runs-cmake_packages-name Python3
5-
.STRUCT_SEM=yes
64
PEERDIR(yt/yt/client)
75
}

0 commit comments

Comments
 (0)