Browse Source

Simplify CI_GROUP command to avoid having massive results + use package scripts from python3

This avoids having CI_GROUP as PACKAGE to avoid having as result everything it PEERDIRS and contains. Its PEERDIRs still be built and cached, but won't become single massive result. Though if UNION or PACKAGE is PEERDIRed they will be preserved in autocheck grah and will be cached as denedency, but not as result.
66f802e32b35570fd095d4ab1963eb579d7449ee
spreis 8 months ago
parent
commit
d3d76f92c7
1 changed files with 4 additions and 4 deletions
  1. 4 4
      build/ymake.core.conf

+ 4 - 4
build/ymake.core.conf

@@ -2450,7 +2450,7 @@ multimodule PACKAGE {
     }
 }
 
-TOUCH_GROUP=$TOUCH_PACKAGE ${hide;kv:"p CI"}
+TOUCH_GROUP=$FAKE_PACKAGE_CMD $VCS_INFO_DISABLE_CACHE__NO_UID__ ${hide:PEERS} ${hide:AUTO_INPUT} ${hide:SRCS_GLOBAL} ${hide;kv:"p CI"} ${hide;kv:"package PACKAGE"}
 
 ### @usage: CI_GROUP()
 ###
@@ -4878,9 +4878,9 @@ macro TOUCH(Outputs...) {
     .CMD=$YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${output:Outputs}
 }
 
-TOUCH_UNIT=$YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${hide;kv:"p UN"} ${hide;kv:"pc light-cyan"} $TARGET
-FAKE_PACKAGE_CMD=$YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${hide;kv:"pc light-red"} $TARGET
-COPY_PACKAGE_CMD=$YMAKE_PYTHON ${input:"build/scripts/copy_to_dir.py"} --dest-dir $BINDIR --build-root $ARCADIA_BUILD_ROOT $PACKED_PACKAGE_ARGS $SRCS_GLOBAL $PEERS_LATE_OUTS ${skip_by_ext=.pkg.fake:PEERS} ${hide;late_out:AUTO_INPUT} ${hide;late_out;to_namespace=$BINDIR/:SRCS_GLOBAL} ${hide;late_out;to_namespace=$BINDIR/:PEERS_LATE_OUTS} ${hide;late_out;skip_by_ext=.pkg.fake;to_namespace=$BINDIR/:PEERS} ${hide;kv:"package PACKAGE"}
+TOUCH_UNIT=$YMAKE_PYTHON3 ${input:"build/scripts/touch.py"} ${hide;kv:"p UN"} ${hide;kv:"pc light-cyan"} $TARGET
+FAKE_PACKAGE_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/touch.py"} ${hide;kv:"pc light-red"} $TARGET
+COPY_PACKAGE_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/copy_to_dir.py"} --dest-dir $BINDIR --build-root $ARCADIA_BUILD_ROOT $PACKED_PACKAGE_ARGS $SRCS_GLOBAL $PEERS_LATE_OUTS ${skip_by_ext=.pkg.fake:PEERS} ${hide;late_out:AUTO_INPUT} ${hide;late_out;to_namespace=$BINDIR/:SRCS_GLOBAL} ${hide;late_out;to_namespace=$BINDIR/:PEERS_LATE_OUTS} ${hide;late_out;skip_by_ext=.pkg.fake;to_namespace=$BINDIR/:PEERS} ${hide;kv:"package PACKAGE"}
 TOUCH_PACKAGE=$FAKE_PACKAGE_CMD $VCS_INFO_DISABLE_CACHE__NO_UID__ && $COPY_PACKAGE_CMD
 _P_PK=${hide;kv:"p PK"}
 TOUCH_PACKAGE_MF=$GENERATE_MF && $TOUCH_PACKAGE $_P_PK && $ADD_VCS_INFO_FILE_CMD