Skip to content

Commit f4b5892

Browse files
VestniKVestniK
committed
Revert commit rXXXXXX, Enable the new command engine in miscellaneous macros, batch #2, v.2
commit_hash:9dd428cb39c1b588a1f06613f1a1a9140ac31591
1 parent 8faaecb commit f4b5892

File tree

10 files changed

+49
-163
lines changed

10 files changed

+49
-163
lines changed

‎build/conf/bison_lex.conf‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ _FLEX_TOOL_DIR=
3737
_FLEX_HEADER=
3838

3939
when ($_BISON_FLEX_SET_DEFAULTS == "yes") {
40-
_BISON_HEADER=--defines=${addincl;main;norel;output;suf=$_BISON_HEADER_SUFFIX;nopath;noext:SRC}
41-
_BISON_PP=$YMAKE_PYTHON3 ${input:"build/scripts/preprocess.py"} $_ADD_HIDDEN_INPUTS($_CPP_BISON_SKELS) ${tmp;suf=$_BISON_HEADER_SUFFIX;nopath;noext:SRC}
40+
_BISON_HEADER=--defines=${nopath;noext;main;addincl;norel;output;suf=$_BISON_HEADER_SUFFIX:SRC}
41+
_BISON_PP=$YMAKE_PYTHON3 ${input:"build/scripts/preprocess.py"} $_ADD_HIDDEN_INPUTS($_CPP_BISON_SKELS) ${nopath;noext;tmp;suf=$_BISON_HEADER_SUFFIX:SRC}
4242
_FLEX_TOOL=${tool:"contrib/tools/flex-old"}
4343
_FLEX_TOOL_DIR=contrib/tools/flex-old
4444
_FLEX_HEADER=
@@ -93,8 +93,8 @@ macro FLEX_GEN_CPP() {
9393
### Use SUFF (including extension) to name Bison defines header file. The default is just `.h`.
9494
macro BISON_HEADER(Suffix) {
9595
SET(_BISON_HEADER_SUFFIX $Suffix)
96-
SET(_BISON_HEADER --defines=\${main;addincl;norel;output;suf=$_BISON_HEADER_SUFFIX;nopath;noext:SRC})
97-
SET(_BISON_PP $YMAKE_PYTHON3 \${input:"build/scripts/preprocess.py"} $_ADD_HIDDEN_INPUTS($_CPP_BISON_SKELS) \${tmp;suf=$_BISON_HEADER_SUFFIX;nopath;noext:SRC})
96+
SET(_BISON_HEADER --defines=\${nopath;noext;main;addincl;norel;output;suf=$_BISON_HEADER_SUFFIX:SRC})
97+
SET(_BISON_PP $YMAKE_PYTHON3 \${input:"build/scripts/preprocess.py"} $_ADD_HIDDEN_INPUTS($_CPP_BISON_SKELS) \${nopath;noext;tmp;suf=$_BISON_HEADER_SUFFIX:SRC})
9898

9999
}
100100

@@ -123,7 +123,7 @@ macro USE_MODERN_FLEX() {
123123
macro USE_MODERN_FLEX_WITH_HEADER(Suffix) {
124124
SET(_FLEX_TOOL \${tool:"contrib/tools/flex"} --m4=\${tool:"contrib/tools/m4"})
125125
SET(_FLEX_TOOL_DIR contrib/tools/flex)
126-
SET(_FLEX_HEADER --header-file=\${main;addincl;norel;output;suf=$Suffix;nopath;noext:SRC})
126+
SET(_FLEX_HEADER --header-file=\${nopath;noext;main;addincl;norel;output;suf=$Suffix:SRC})
127127
}
128128

129129
### @usage: USE_OLD_FLEX()
@@ -134,25 +134,20 @@ macro USE_OLD_FLEX() {
134134
SET(_FLEX_TOOL_DIR contrib/tools/flex-old)
135135
}
136136

137-
_SRC_y_env=M4=${tool:M4_PATH} BISON_PKGDATADIR=${ARCADIA_ROOT}/${_BISON_DATA_DIR}
138137
macro _SRC("y", SRC, SRCFLAGS...) {
139138
.PEERDIR=build/induced/by_bison
140-
.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
139+
.CMD=${tool:"contrib/tools/bison"} $BISON_FLAGS ${env:"M4=${tool:M4_PATH}"} ${env:"BISON_PKGDATADIR=${ARCADIA_ROOT}/${_BISON_DATA_DIR}"} $_BISON_HEADER ${hide:_BISON_GEN_EXT} -o ${nopath;output;suf=$_BISON_GEN_EXT:SRC} ${input:SRC} ${SRCFLAGS} ${hide;kv:"p YC"} ${hide;kv:"pc light-green"} && $_BISON_PP
142140
.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;nopath;noext;output;suf=.h:SRC} ${hide;nopath;noext;addincl;output;suf=.h:SRC} && platform_vars-BISON_FLAGS ${quo: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'
143141
}
144142

145143
macro _SRC("ypp", SRC, SRCFLAGS...) {
146144
.PEERDIR=build/induced/by_bison
147-
# TODO overloading support and redirection to `$_SRC(y $SRC $SRCFLAGS)`
148-
.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
149-
.STRUCT_CMD=yes
145+
.CMD=$_SRC(y $SRC $SRCFLAGS)
150146
.SEM=$_SRC(y $SRC $SRCFLAGS)
151147
}
152148

153149
macro _SRC("l", SRC, SRCFLAGS...) {
154150
.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"}
155-
.STRUCT_CMD=yes
156151
.ADDINCL=$_FLEX_TOOL_DIR
157152
.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}
158153
}

‎build/conf/docs.conf‎

Lines changed: 0 additions & 1 deletion
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}
15-
.STRUCT_CMD=yes
1615
}
1716

1817
# tag:docs

‎build/conf/fbs.conf‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@ _PY_FBS_DEPS=contrib/python/flatbuffers
2222
### processed when --add-flatbuf-result flag is specified on the command line
2323
### for 'ya make ...' (tar archive is extracted to output directory).
2424
macro FBS_TO_PYSRC(OUT_NAME, IN_FBS_FILES...) {
25-
.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
25+
.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 ${noauto;output;tared;suf=.py3.fbs.pysrc:OUT_NAME} ${hide;kv:"p FP"} ${hide;kv:"pc light-green"} ${hide;kv:"tared_kind nodir"} ${hide:FBS_FAKEID}
2726
}
2827

2928
macro FBS_TO_PY2SRC(OUT_NAME, IN_FBS_FILES...) {
30-
.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
29+
.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 ${noauto;output;tared;suf=.py2.fbs.pysrc:OUT_NAME} ${hide;kv:"p FP"} ${hide;kv:"pc light-green"} ${hide;kv:"tared_kind nodir"} ${hide:FBS_FAKEID}
3230
}
3331

3432
# tag:fbs tag:go-specific
@@ -59,8 +57,7 @@ macro _CPP_FLATC64_CMD(SRC, SRCFLAGS...) {
5957
### --add-protobuf-result flag is specified on the command line for 'ya make ...'
6058
### (tar archive is extracted to output directory).
6159
macro _GO_FLATC_CMD(SRC, PACKAGE_NAME) {
62-
.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
60+
.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 ${output;noext;tared;suf=.fbs.gosrc:SRC} --exts .go ${hide;kv:"p FG"} ${hide;kv:"pc light-green"} ${hide;kv:"tared_kind nodir"} ${hide:FBS_FAKEID}
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: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -211,20 +211,17 @@ macro _GO_GEN_COVER_GO(GO_FILE, GO_COVER_OUTPUT, VAR_ID) {
211211
# tag:go-specific
212212
macro _GO_COMPILE_SYMABIS(FLAGS[], ASM_FILES...) {
213213
.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"}
214-
.STRUCT_CMD=yes
215214
.ADDINCL=build/scripts/go_fake_include
216215
}
217216

218217
# tag:go-specific
219218
macro _GO_COMPILE_CGO1(NAME, FLAGS[], FILES...) {
220219
.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"}
221-
.STRUCT_CMD=yes
222220
}
223221

224222
# tag:go-specific
225223
macro _GO_COMPILE_CGO2(NAME, C_FILES[], S_FILES[], OBJ_FILES[], FILES...) {
226224
.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"}
227-
.STRUCT_CMD=yes
228225

229226
_USE_LINKER()
230227
}
@@ -550,7 +547,7 @@ _GO_PROTO_GRPC_GATEWAY_OUTS=
550547
# tag:go-specific
551548
macro _GO_GRPC_GATEWAY_SRCS_IMPL(Files...) {
552549
foreach (File : $Files) {
553-
_GO_GRPC_GATEWAY_SRCS_IMPL_DISPATCH(${lastext:File} $File)
550+
[.proto]=$_GO_PROTO_CMD_IMPL($File $_GO_PROTO_GRPC_GATEWAY_OPTS $_GO_PROTO_GRPC_GATEWAY_OUTS)
554551
}
555552

556553
PEERDIR(${GOSTD}/context ${GOSTD}/io ${GOSTD}/net/http)
@@ -559,12 +556,6 @@ macro _GO_GRPC_GATEWAY_SRCS_IMPL(Files...) {
559556
PEERDIR(vendor/github.com/grpc-ecosystem/grpc-gateway/utilities)
560557
PEERDIR(vendor/google.golang.org/grpc/metadata)
561558
}
562-
macro _GO_GRPC_GATEWAY_SRCS_IMPL_DISPATCH(Ext, File) {
563-
}
564-
macro _GO_GRPC_GATEWAY_SRCS_IMPL_DISPATCH("proto", File) {
565-
.CMD=$_GO_PROTO_CMD_IMPL($File $_GO_PROTO_GRPC_GATEWAY_OPTS $_GO_PROTO_GRPC_GATEWAY_OUTS)
566-
.STRUCT_CMD=yes
567-
}
568559

569560
# tag:go-specific
570561
macro _SETUP_GO_GRPC_GATEWAY() {
@@ -621,7 +612,7 @@ _GO_PROTO_GRPC_GATEWAY_V2_OUTS=
621612
# tag:go-specific
622613
macro _GO_GRPC_GATEWAY_V2_SRCS_IMPL(Files...) {
623614
foreach (File : $Files) {
624-
_GO_GRPC_GATEWAY_V2_SRCS_IMPL_DISPATCH(${lastext:File} $File)
615+
[.proto]=$_GO_PROTO_CMD_IMPL($File $_GO_PROTO_GRPC_GATEWAY_V2_OPTS $_GO_PROTO_GRPC_GATEWAY_V2_OUTS)
625616
}
626617

627618
PEERDIR(${GOSTD}/context ${GOSTD}/errors ${GOSTD}/io ${GOSTD}/net/http)
@@ -631,12 +622,6 @@ macro _GO_GRPC_GATEWAY_V2_SRCS_IMPL(Files...) {
631622
PEERDIR(vendor/google.golang.org/grpc/metadata)
632623
PEERDIR(vendor/google.golang.org/protobuf/proto)
633624
}
634-
macro _GO_GRPC_GATEWAY_V2_SRCS_IMPL_DISPATCH(Ext, File) {
635-
}
636-
macro _GO_GRPC_GATEWAY_V2_SRCS_IMPL_DISPATCH("proto", File) {
637-
.CMD=$_GO_PROTO_CMD_IMPL($File $_GO_PROTO_GRPC_GATEWAY_V2_OPTS $_GO_PROTO_GRPC_GATEWAY_V2_OUTS)
638-
.STRUCT_CMD=yes
639-
}
640625

641626
# tag:go-specific
642627
macro _SETUP_GO_GRPC_GATEWAY_V2() {
@@ -1046,9 +1031,7 @@ module GO_TEST: GO_PROGRAM {
10461031
}
10471032

10481033
# tag:go-specific
1049-
_GO_TOOL_ENV_PATH=PATH=${GO_TOOLS_ROOT}/bin
1050-
_GO_TOOL_ENV_ROOT=GOROOT=${GO_TOOLS_ROOT}
1051-
_GO_TOOL_ENV=${env:_GO_TOOL_ENV_PATH} ${env:_GO_TOOL_ENV_ROOT} ${env:"GOCACHE=${BINDIR}/.gocache"}
1034+
_GO_TOOL_ENV=${env:"PATH=${GO_TOOLS_ROOT}/bin"} ${env:"GOROOT=${GO_TOOLS_ROOT}"} ${env:"GOCACHE=${BINDIR}/.gocache"}
10521035

10531036
# tag:go-specific
10541037
_GO_GO_MOD=${ARCADIA_ROOT}/go.mod
@@ -1121,7 +1104,6 @@ macro _GO_MOCKGEN_MOCKS_IMPL(GEN_TOOL) {
11211104
PEERDIR(vendor/go.uber.org/mock/gomock)
11221105

11231106
.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"}
1124-
.STRUCT_CMD=yes
11251107
}
11261108

11271109
# tag:go-specific
@@ -1141,7 +1123,7 @@ _GO_MOCKGEN_SOURCE_CMDLINE=\
11411123
$COPY_CMD ${context=TEXT;input=TEXT:SOURCE} ${BINDIR}/.arcadia/$SOURCE && \
11421124
${cwd;suf=/.arcadia:BINDIR} ${tool:_GO_TOOL_MOCKGEN} -package ${MOCKGEN_PACKAGE} -source ${rootrel;context=TEXT;input=TEXT:SOURCE} ${ARGS} \
11431125
$_GO_TOOL_ENV ${stdout;output;suf=.source.gen.go;noext:FILENAME} \
1144-
${hide;context=TEXT;input=TEXT:IN_NOPARSE} \
1126+
${hide;context=TEXT;input=TEXT;suf=/.arcadia/go.mod:BINDIR} ${hide;context=TEXT;input=TEXT;suf=/.arcadia/vendor/modules.txt:BINDIR} ${hide;context=TEXT;input=TEXT:IN_NOPARSE} \
11451127
${hide;kv:"p GS"} ${hide;kv:"pc blue"}
11461128

11471129
# tag:go-specific
@@ -1150,7 +1132,6 @@ macro _GO_MOCKGEN_SOURCE_IMPL(SOURCE, FILENAME, ARGS[], IN_NOPARSE[]) {
11501132
PEERDIR(${GOSTD}/context)
11511133
PEERDIR(vendor/go.uber.org/mock/gomock)
11521134
.CMD=$_GO_MOCKGEN_SOURCE_CMDLINE
1153-
.STRUCT_CMD=yes
11541135
}
11551136

11561137
# tag:go-specific
@@ -1165,7 +1146,6 @@ macro GO_MOCKGEN_SOURCE(FILE, ARGS[], IN_NOPARSE[]) {
11651146

11661147
macro _GO_OAPI_CODEGEN_IMPL(TOOL, IN, FILENAME, GENERATE="", PACKAGE="", TEMPLATES="", CONFIG="", IN_NOPARSE[], Args...) {
11671148
.CMD=${cwd:ARCADIA_BUILD_ROOT} ${tool:TOOL} ${pre=--generate :GENERATE} ${pre=--package :PACKAGE} ${pre=--templates :TEMPLATES} ${pre=--config :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"}
1168-
.STRUCT_CMD=yes
11691149
}
11701150

11711151
# tag:go-specific

‎build/conf/java.conf‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -508,14 +508,13 @@ macro _DO_2_RUN_JAR_PROGRAM(IN_DIRS_VAR="uniq_", IN_DIRS_INPUTS[], IN{input}[],
508508
_LATE_GLOB(${IN_DIRS_VAR} ${suf=/**/*:IN_DIR})
509509
_CHECK_RUN_JAVA_PROG_CLASSPATH($CLASSPATH)
510510
.PEERDIR=build/platform/java/jdk $JDK_RESOURCE_PEERDIR
511-
.CMD=${hide;kv:"p RJ"} ${hide;kv:"pc blue"} ${hide:JAVA_FAKEID} ${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/mkdir.py"} ${OUT_DIR} && ${cwd:CWD} $YMAKE_PYTHON ${input:"build/scripts/setup_java_tmpdir.py"} $YMAKE_PYTHON ${input:"build/scripts/stdout2stderr.py"} ${pre=--file=:STDOUT} ${hide;output:STDOUT} ${pre=--file=:STDOUT_NOAUTO} ${hide;noauto;output:STDOUT_NOAUTO} $YMAKE_PYTHON ${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}
512-
.STRUCT_CMD=yes
513-
.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}
511+
.CMD=${hide;kv:"p RJ"} ${hide;kv:"pc blue"} ${hide:JAVA_FAKEID} ${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/mkdir.py"} ${OUT_DIR} && ${cwd:CWD} $YMAKE_PYTHON ${input:"build/scripts/setup_java_tmpdir.py"} $YMAKE_PYTHON ${input:"build/scripts/stdout2stderr.py"} ${pre=--file=:STDOUT} ${hide;output:STDOUT} ${pre=--file=:STDOUT_NOAUTO} ${hide;noauto;output:STDOUT_NOAUTO} $YMAKE_PYTHON ${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} ${IN_DIRS_INPUTS}
512+
.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_dirs_inputs ${IN_DIRS_INPUTS} && 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}
514513
}
515514

516515
# tag:java-specific
517516
macro _DO_1_RUN_JAR_PROGRAM(IN_DIRS_VAR="uniq", Args...) {
518-
_DO_2_RUN_JAR_PROGRAM($Args IN_DIRS_VAR $IN_DIRS_VAR IN_DIRS_INPUTS ${$IN_DIRS_VAR} HASH_SUF .${hash:Args}.gentar)
517+
_DO_2_RUN_JAR_PROGRAM($Args IN_DIRS_VAR $IN_DIRS_VAR IN_DIRS_INPUTS ${"$"}{hide;input:$IN_DIRS_VAR} HASH_SUF .${hash:Args}.gentar)
519518
}
520519

521520
# tag:java-specific

‎build/conf/project_specific/yt.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
macro GENERATE_YT_RECORD(Yaml, OUTPUT_INCLUDES[]) {
22
.CMD=${tool:"yt/yt/tools/record_codegen"} --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/__main__.py"} ${input:"yt/python/yt/record_codegen_helpers/__init__.py"} && custom_runs-env "PYTHONPATH=$ENV{PYTHONPATH}:${ARCADIA_ROOT}/yt/python/yt" && custom_runs-command ${Python3_EXECUTABLE} ${input:"yt/yt/tools/record_codegen/__main__.py"} --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
54
PEERDIR(yt/yt/client)
65
}

0 commit comments

Comments
 (0)