Skip to content

Commit 49a7745

Browse files
committed
Revert commit rXXXXXX,GO STRUCT_CMD
commit_hash:cabcffa40ef1631e94462aa7edbdd7969dfd645a
1 parent 20c026b commit 49a7745

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

build/conf/go.conf

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ GO_CONTRIB_PROJECT_PREFIX=vendor/
107107
GO_SKIP_IMPORTS=unsafe C
108108
GO_VET_INFO_EXT=.vet.out
109109
GO_VET_REPORT_EXT=.vet.txt
110-
GO_VET_OUTPUT_INFO=${hide;rootrel;output;pre=${MODULE_PREFIX};suf=${MODULE_SUFFIX}${GO_VET_INFO_EXT}:REALPRJNAME}
111-
GO_VET_OUTPUT_REPORT=${hide;rootrel;output;pre=${MODULE_PREFIX};suf=${MODULE_SUFFIX}${GO_VET_REPORT_EXT}:REALPRJNAME}
110+
GO_VET_OUTPUT_INFO=${output;rootrel;hide;pre=${MODULE_PREFIX};suf=${MODULE_SUFFIX}${GO_VET_INFO_EXT}:REALPRJNAME}
111+
GO_VET_OUTPUT_REPORT=${output;rootrel;hide;pre=${MODULE_PREFIX};suf=${MODULE_SUFFIX}${GO_VET_REPORT_EXT}:REALPRJNAME}
112112

113113
# tag:go-specific tag:codenav
114114
_GO_YNDEXER_EXT=.ydx.pb2
@@ -225,17 +225,17 @@ GO_TOOL=$YMAKE_PYTHON3 ${input:"build/scripts/go_tool.py"} $_PROCESS_WHOLE_ARCHI
225225

226226
# tag:go-specific
227227
macro _GO_LINK_LIB_IMPL(CGO_FILES[], EXTRA_INPUTS[], EXTRA_TEXT_INPUTS[], GO_FILES...) {
228-
.CMD=${hide:_GO_FAKEID} $GO_TOOL ${hide;input:EXTRA_INPUTS} ${hide;context=TEXT;input:EXTRA_TEXT_INPUTS} --ya-start-command-file $_GO_TOOL_COMMON_FLAGS ++peers ${rootrel;tags_in=local,GO|local,GO_PROTO|local,GO_FBS:PEERS} --ya-end-command-file ${hide;kv:"p GO"} ${hide;kv:"pc light-red"} ${hide;kv:"show_out"}
228+
.CMD=${hide:_GO_FAKEID} $GO_TOOL ${hide;input:EXTRA_INPUTS} ${hide;input;context=TEXT:EXTRA_TEXT_INPUTS} --ya-start-command-file $_GO_TOOL_COMMON_FLAGS ++peers ${rootrel;tags_in=local,GO|local,GO_PROTO|local,GO_FBS:PEERS} --ya-end-command-file ${kv;hide:"p GO"} ${kv;hide:"pc light-red"} ${kv;hide:"show_out"}
229229
}
230230

231231
# tag:go-specific
232232
macro _GO_LINK_EXE_IMPL(CGO_FILES[], EXTRA_INPUTS[], EXTRA_TEXT_INPUTS[], GO_FILES...) {
233-
.CMD=${hide:_GO_FAKEID} $GO_TOOL ${hide;input:EXTRA_INPUTS} ${hide;context=TEXT;input:EXTRA_TEXT_INPUTS} --ya-start-command-file $_GO_TOOL_COMMON_FLAGS ++vcs $VCS_GO $GO_WITH_MUSL $GO_EXTLD ++peers ${rootrel;tags_in=local,GO|local,GO_PROTO|local,GO_FBS:PEERS} ++non-local-peers ${rootrel;tags_in=GO|GO_PROTO|GO_FBS|;tags_out=local:PEERS} ++cgo-peers ${VCS_C_OBJ_RR} ${_EXTRA_OBJS} ${rootrel;tags_out=GO|GO_PROTO|GO_FBS|RESOURCE_LIB:PEERS} --ya-end-command-file ${hide;kv:"p LD"} ${hide;kv:"pc light-red"} ${hide;kv:"show_out"} && $_GO_LINK_EXE_EXT_CMD
233+
.CMD=${hide:_GO_FAKEID} $GO_TOOL ${hide;input:EXTRA_INPUTS} ${hide;input;context=TEXT:EXTRA_TEXT_INPUTS} --ya-start-command-file $_GO_TOOL_COMMON_FLAGS ++vcs $VCS_GO $GO_WITH_MUSL $GO_EXTLD ++peers ${rootrel;tags_in=local,GO|local,GO_PROTO|local,GO_FBS:PEERS} ++non-local-peers ${rootrel;tags_in=GO|GO_PROTO|GO_FBS|;tags_out=local:PEERS} ++cgo-peers ${VCS_C_OBJ_RR} ${_EXTRA_OBJS} ${rootrel;tags_out=GO|GO_PROTO|GO_FBS|RESOURCE_LIB:PEERS} --ya-end-command-file ${kv;hide:"p LD"} ${kv;hide:"pc light-red"} ${kv;hide:"show_out"} $_GO_LINK_EXE_EXT_CMD
234234
}
235235

236236
# tag:go-specific
237237
macro _GO_LINK_TEST_IMPL(CGO_FILES[], EXTRA_INPUTS[], EXTRA_TEXT_INPUTS[], GO_TEST_FILES[], GO_XTEST_FILES[], GO_FILES...) {
238-
.CMD=${hide:_GO_FAKEID} $GO_TOOL ${hide;input:EXTRA_INPUTS} ${hide;context=TEXT;input:EXTRA_TEXT_INPUTS} --ya-start-command-file $_GO_TOOL_COMMON_FLAGS ++vcs $VCS_GO $GO_WITH_MUSL $GO_EXTLD ++test-miner $GO_TEST_MINER ++test-import-path $GO_TEST_IMPORT_PATH ++peers ${rootrel;tags_in=local,GO|local,GO_PROGRAM|local,GO_PROTO|local,GO_FBS:PEERS} ++non-local-peers ${rootrel;tags_in=GO|GO_PROTO|GO_FBS;tags_out=local:PEERS} ++cgo-peers ${VCS_C_OBJ_RR} ${rootrel;tags_out=GO|GO_PROGRAM|GO_PROTO|GO_FBS|RESOURCE_LIB:PEERS} ++test_srcs ${input:GO_TEST_FILES} ++xtest_srcs ${input:GO_XTEST_FILES} ++cover_info $GO_COVER_INFO_VALUE ++skip-tests $_GO_SKIP_TEST_VALUE --ya-end-command-file ${hide;kv:"p GO"} ${hide;kv:"pc light-red"} ${hide;kv:"show_out"}
238+
.CMD=${hide:_GO_FAKEID} $GO_TOOL ${hide;input:EXTRA_INPUTS} ${hide;input;context=TEXT:EXTRA_TEXT_INPUTS} --ya-start-command-file $_GO_TOOL_COMMON_FLAGS ++vcs $VCS_GO $GO_WITH_MUSL $GO_EXTLD ++test-miner $GO_TEST_MINER ++test-import-path $GO_TEST_IMPORT_PATH ++peers ${rootrel;tags_in=local,GO|local,GO_PROGRAM|local,GO_PROTO|local,GO_FBS:PEERS} ++non-local-peers ${rootrel;tags_in=GO|GO_PROTO|GO_FBS;tags_out=local:PEERS} ++cgo-peers ${VCS_C_OBJ_RR} ${rootrel;tags_out=GO|GO_PROGRAM|GO_PROTO|GO_FBS|RESOURCE_LIB:PEERS} ++test_srcs ${input:GO_TEST_FILES} ++xtest_srcs ${input:GO_XTEST_FILES} ++cover_info $GO_COVER_INFO_VALUE ++skip-tests $_GO_SKIP_TEST_VALUE --ya-end-command-file ${kv;hide:"p GO"} ${kv;hide:"pc light-red"} ${kv;hide:"show_out"}
239239
}
240240

241241
# tag:go-specific
@@ -636,8 +636,7 @@ otherwise {
636636
### The base module of all golang modules. Defines common properties, dependencies and rules for go build.
637637
module _GO_BASE_UNIT: _BASE_UNIT {
638638
.EXTS=.go .gosrc .o .obj .sbom .a .symabis .mf
639-
.CMD=$TOUCH_UNIT
640-
.STRUCT_CMD=yes
639+
.CMD=TOUCH_UNIT
641640
.NODE_TYPE=Bundle
642641
.GLOBAL=GO_LDFLAGS OBJADDE_LIB
643642
.PEERDIR_POLICY=as_build_from
@@ -810,7 +809,7 @@ module _GO_BASE_UNIT: _BASE_UNIT {
810809
### Compile Go module as a library suitable for PEERDIR from other Go modules.
811810
### Will select Go implementation on PEERDIR to PROTO_LIBRARY.
812811
module GO_LIBRARY: _GO_BASE_UNIT {
813-
.CMD=$GO_LINK_LIB
812+
.CMD=GO_LINK_LIB
814813
.NODE_TYPE=Bundle
815814
.FINAL_TARGET=no
816815
SET(_GO_TOOL_MODE lib)
@@ -828,7 +827,7 @@ module GO_LIBRARY: _GO_BASE_UNIT {
828827
### Compile and link Go module to an executable program.
829828
### Will select Go implementation on PEERDIR to PROTO_LIBRARY.
830829
module GO_PROGRAM: _GO_BASE_UNIT {
831-
.CMD=$GO_LINK_EXE
830+
.CMD=GO_LINK_EXE
832831
.NODE_TYPE=Program
833832
.PROXY=yes
834833
.SYMLINK_POLICY=EXE
@@ -888,7 +887,7 @@ module GO_PROGRAM: _GO_BASE_UNIT {
888887

889888
# tag:go-specific
890889
module _GO_DLL_BASE_UNIT: GO_PROGRAM {
891-
.CMD=$GO_LINK_DLL
890+
.CMD=GO_LINK_DLL
892891
.SYMLINK_POLICY=SO
893892
.ALLOWED=WHOLE_ARCHIVE
894893
.ARGS_PARSER=DLL
@@ -952,7 +951,7 @@ macro GO_BENCH_TIMEOUT(bench_timeout) {
952951
### All usual testing support macros like DATA, DEPENDS, SIZE, REQUIREMENTS etc. are supported.
953952
### Will select Go implementation on PEERDIR to PROTO_LIBRARY.
954953
module GO_TEST: GO_PROGRAM {
955-
.CMD=$GO_LINK_TEST
954+
.CMD=GO_LINK_TEST
956955
.ALIASES=GO_TEST_SRCS=GO_TEST_SRCS GO_XTEST_SRCS=GO_XTEST_SRCS GO_TEST_EMBED_PATTERN=GO_TEST_EMBED_PATTERN GO_XTEST_EMBED_PATTERN=GO_XTEST_EMBED_PATTERN GO_TEST_EMBED_DIR=GO_TEST_EMBED_DIR GO_XTEST_EMBED_DIR=GO_XTEST_EMBED_DIR GO_TEST_EMBED_BINDIR=GO_TEST_EMBED_BINDIR GO_XTEST_EMBED_BINDIR=GO_XTEST_EMBED_BINDIR
957956
.ALLOWED=GO_SKIP_TESTS YT_SPEC
958957
.FINAL_TARGET=no

build/ymake.core.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2818,7 +2818,7 @@ macro SIZE(Type) {
28182818
### This macro doesn't place all file into Out, it emits #include<Src>... Use the for C++ source files only.
28192819
### You should specify file name with the extension as Out. Further processing will be done according this extension.
28202820
macro JOIN_SRCS(Out, Src...) {
2821-
.CMD=$YMAKE_PYTHON3 ${input:"build/scripts/gen_join_srcs.py"} ${hide;input:"build/scripts/process_command_files.py"} ${output:Out} --ya-start-command-file ${context=TEXT;input;rootrel:Src} --ya-end-command-file ${output_include;from_input;hide:Src} ${hide;kv:"p JS"} ${hide;kv:"pc magenta"}
2821+
.CMD=$YMAKE_PYTHON3 ${input:"build/scripts/gen_join_srcs.py"} ${hide;input:"build/scripts/process_command_files.py"} ${output:Out} --ya-start-command-file ${input;rootrel;context=TEXT:Src} --ya-end-command-file ${output_include;from_input;hide:Src} ${hide;kv:"p JS"} ${hide;kv:"pc magenta"}
28222822
.SEM=target_joined_source $Out ${input:Src} ${hide;output;suf=.o:Out} ${hide;input:"build/scripts/gen_join_srcs.py"} ${hide;input:"build/scripts/process_command_files.py"} && target_macroses-ITEM && target_macroses-macro target_joined_source && target_macroses-args $Out ${input:Src} ${hide;output;suf=.o:Out} ${hide;input:"build/scripts/gen_join_srcs.py"} ${hide;input:"build/scripts/process_command_files.py"}
28232823
_CONDITIONAL_SRCS($TIDY_VALUE $Src)
28242824
}

0 commit comments

Comments
 (0)