Merge pull request #8529 from maximyurchuk/manual_import

Library import (manual because of merge conflicts)

Author: maximyurchuk

build/conf/fbs.conf

@@ -1,5 +1,5 @@
 FLATC=contrib/libs/flatbuffers/flatc
-FLATC64=contrib/tools/flatc64
+FLATC64=contrib/libs/flatbuffers64/flatc
 
 # tag:fbs
 FLATC_FLAGS_VALUE=

build/conf/java.conf

@@ -1121,7 +1121,11 @@ _PACK_JDK=
 DO_GEN_JAVA_RUN_SH=
 _SOURCE_JARS=
 _SOURCE_JARS_CPLIST=
-GEN_JAVA_RUN_SH=$SCRIPTGEN_RESOURCE_GLOBAL/scriptgen --java $JDK_RESOURCE/bin/java --output ${output:"run.sh"} -D GENERATE_DEFAULT_RUNNER=yes -D JAR_NAME=${REALPRJNAME}.jar -D CLASSPATH=${nopath;join;pre="::":MANAGED_PEERS_CLOSURE} -D PROJECT_DIR=${REALPRJNAME} -D JAR_BASENAME=${REALPRJNAME}
+_GEN_JAVA_RUN_SH_OUTPUT=run.sh
+when ($HOST_OS_WINDOWS == "yes") {
+    _GEN_JAVA_RUN_SH_OUTPUT=run.bat
+}
+GEN_JAVA_RUN_SH=$SCRIPTGEN_RESOURCE_GLOBAL/scriptgen --java $JDK_RESOURCE/bin/java --output ${output:_GEN_JAVA_RUN_SH_OUTPUT} -D GENERATE_DEFAULT_RUNNER=yes -D JAR_NAME=${REALPRJNAME}.jar -D CLASSPATH=${nopath;join;pre="::":MANAGED_PEERS_CLOSURE} -D PROJECT_DIR=${REALPRJNAME} -D JAR_BASENAME=${REALPRJNAME}
 GEN_RUN_CP=${WRITER_PY} --file ${BINDIR}/run-bf.txt -Q -m --ya-start-command-file ${nopath;qe;pre=$REALPRJNAME/:MANAGED_PEERS_CLOSURE} --ya-end-command-file && ${YMAKE_PYTHON} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/run-bf.txt ${TARGET}
 COLLECT_JAR_PROGRAM_CP=$FS_TOOLS link_or_copy_to_dir --ya-start-command-file ${ext=.jar:MANAGED_PEERS_CLOSURE} ${ext=.so:MANAGED_PEERS_CLOSURE} ${ext=.dll:MANAGED_PEERS_CLOSURE} ${ext=.dylib:MANAGED_PEERS_CLOSURE} ${_SOURCE_JARS} --ya-end-command-file ${BINDIR}/${REALPRJNAME} ${hide;late_out;nopath;ext=.jar;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${hide;late_out;nopath;ext=.so;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${hide;late_out;nopath;ext=.dll;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${hide;late_out;nopath;ext=.dylib;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE}
 MAKE_JAR_PROGRAM_CPLST=${MAKE_JAVA_CLASSPATH_FILE} --from-args ${output;pre=$MODULE_PREFIX;suf=${MODULE_SUFFIX}.cplst:REALPRJNAME} --ya-start-command-file ${nopath;rootrel;ext=.jar;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${_SOURCE_JARS_CPLIST} --ya-end-command-file
@@ -1330,14 +1334,14 @@ when (!$USE_SYSTEM_ERROR_PRONE) {
         ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_18_0_RESOURCE_GLOBAL
     }
     elsewhen ($JDK_REAL_VERSION == "21") {
-        ERROR_PRONE_VERSION=2.18.0
-        ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.18.0
-        ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_18_0_RESOURCE_GLOBAL
+        ERROR_PRONE_VERSION=2.30.0
+        ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.30.0
+        ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_30_0_RESOURCE_GLOBAL
     }
     elsewhen ($JDK_REAL_VERSION == "22") {
-        ERROR_PRONE_VERSION=2.18.0
-        ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.18.0
-        ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_18_0_RESOURCE_GLOBAL
+        ERROR_PRONE_VERSION=2.30.0
+        ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.30.0
+        ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_30_0_RESOURCE_GLOBAL
     }
     otherwise {
         ERROR_PRONE_VERSION=2.7.1

build/conf/settings.conf

@@ -15,7 +15,7 @@ ENABLE_RERESOLVE_FOR_GENERATED_FILES=yes
 REPORT_ALL_DUPSRC=yes
 DEPS_CACHE_CONTROL_UIDS_CACHE=yes
 INCLUDE_BLACKLIST_TO_CONF_HASH=no
-INCLUDE_ISOLATED_PROJECTS_TO_CONF_HASH=yes
+INCLUDE_ISOLATED_PROJECTS_TO_CONF_HASH=no
 USE_GRAND_BYPASS=no
 USE_GLOBAL_CMD=yes
 YMAKE_USE_NEW_UIDS=yes
@@ -129,4 +129,3 @@ _FOLDABLE_VARS=\
 
 ARCADIA_TEST_ROOT=../arcadia_tests_data/
 DEFAULT_REQUIREMENTS=network:restricted cpu:1 ram:32
-

build/conf/ts/ts.conf

@@ -40,11 +40,22 @@ NOTS_TOOL_BASE_ARGS=\
 
 NOTS_TOOL_BUILD_ENV=
 
+# All variable that potentially can affect CMD are listed for UID generation
+# Requirements does not have effect on output
+# By adding __NO_UID__ suffix we show that this variable is not a part of the UID
+NOTS_TOOL_BUILD_REQUIREMENTS__NO_UID__=
+
+when($AUTOCHECK == "yes") {
+  # we don't want to have requirements for local runs
+  NOTS_TOOL_BUILD_REQUIREMENTS__NO_UID__=${requirements;hide:"cpu:4"}
+}
+
 # Arguments for builders' commands, passed after the command
 NOTS_TOOL_COMMON_BUILDER_ARGS=\
   --output-file ${output:TS_OUTPUT_FILE} ${output;hide:TS_OUTPUT_FILE_UUID} \
   --tsconfigs $TS_CONFIG_PATH \
   --vcs-info "${VCS_INFO_FILE}" \
+  $NOTS_TOOL_BUILD_REQUIREMENTS__NO_UID__ \
   $NOTS_TOOL_BUILD_ENV
 
 ERM_PACKAGES_PATH=devtools/frontend_build_platform/erm/erm-packages.json

build/conf/ts/ts_next.conf

@@ -40,7 +40,6 @@ TS_NEXT_CMD=$TOUCH_UNIT \
     $_NODE_MODULES_INOUTS ${hide:PEERS} \
     ${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
     ${output;hide:"package.json"} \
-    ${requirements;hide:"cpu:2"} \
     ${kv;hide:"pc magenta"} ${kv;hide:"p TS_NXT"}
 
 ### @usage: TS_NEXT([name])

build/conf/ts/ts_proto.conf

@@ -9,7 +9,6 @@ _TS_PROTO_IMPL_CMD=$TOUCH_UNIT \
         ${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
         ${output;hide:"package.json"} \
         ${hide:PROTO_FAKEID} \
-        ${requirements;hide:"cpu:2"} \
         ${kv;hide:"pc magenta"} ${kv;hide:"p TS_PRO"}
 
 

build/conf/ts/ts_tsc.conf

@@ -4,7 +4,6 @@ TS_TSC_CMD=$TOUCH_UNIT \
     $_NODE_MODULES_INOUTS ${hide:PEERS} \
     ${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
     ${output;hide:"package.json"} \
-    ${requirements;hide:"cpu:2"} \
     ${kv;hide:"pc magenta"} ${kv;hide:"p TS_TSC"}
 
 ### @usage: TS_TSC([name])

build/conf/ts/ts_vite.conf

@@ -42,7 +42,6 @@ TS_VITE_CMD=$TOUCH_UNIT \
     $_NODE_MODULES_INOUTS ${hide:PEERS} \
     ${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
     ${output;hide:"package.json"} \
-    ${requirements;hide:"cpu:2"} \
     ${kv;hide:"pc magenta"} ${kv;hide:"p TS_VIT"}
 
 ### @usage: TS_VITE([name])

build/conf/ts/ts_webpack.conf

@@ -39,7 +39,6 @@ TS_WEBPACK_CMD=$TOUCH_UNIT \
     $_NODE_MODULES_INOUTS ${hide:PEERS} \
     ${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
     ${output;hide:"package.json"} \
-    ${requirements;hide:"cpu:2"} \
     ${kv;hide:"pc magenta"} ${kv;hide:"p TS_WPK"}
 
 ### @usage: TS_WEBPACK([name])