Skip to content

Commit 397a82f

Browse files
Fix LIST_PROTO dependency on incorrect properties passing between main and additional outputs
bb4a52dc41ed160f50f9dece539dbd788be97430
1 parent 1eaba9d commit 397a82f

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

build/conf/proto.conf

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,10 +634,15 @@ macro _GENERATE_PY_EVS_INTERNAL(FILES...) {
634634
###
635635
### TODO: proper implementation needed
636636
macro LIST_PROTO(TO="files.proto", Files...) {
637-
.CMD=$YMAKE_PYTHON3 ${input:"build/scripts/list.py"} ${Files} ${input;hide:Files} ${stdout;output;noauto:TO} ${output_include;from_input;hide:Files} && $YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${output;noext;suf=.pb.h:TO}
637+
.CMD=$YMAKE_PYTHON3 ${input:"build/scripts/list.py"} ${Files} ${input;hide:Files} ${stdout;output;noauto:TO} ${output_include;from_input;hide:Files}
638+
_COMPILE_LIST_PROTO(${TO})
638639
_EXPOSE(${TO})
639640
}
640641

642+
macro _COMPILE_LIST_PROTO(SRC) {
643+
.CMD=$YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${input;hide:SRC} ${output;noext;suf=.pb.h:SRC}
644+
}
645+
641646
# tag:proto
642647
macro _PROTO_DESC_RAWPROTO_CMD(File) {
643648
.CMD=${cwd;rootdir;input:File} $YMAKE_PYTHON3 ${input:"build/scripts/desc_rawproto_wrapper.py"} --desc-output ${output;suf=.desc:File} --rawproto-output ${output;norel;suf=.${_MODDIR_HASH}.rawproto:File} --proto-file ${input;rootrel:File} -- $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_BUILD_ROOT -I=$PROTOBUF_INCLUDE_PATH --include_source_info $_PROTOC_FLAGS ${hide:PROTO_FAKEID}

0 commit comments

Comments
 (0)