Skip to content

Commit 959cf5a

Browse files
ydbotydbot
committed
Sync branches 251008-0050
2 parents 0f457b9 + 0e770f9 commit 959cf5a

File tree

458 files changed

+31819
-31350
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

458 files changed

+31819
-31350
lines changed

‎build/conf/java.conf‎

Lines changed: 11 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
12131213
PEERDIR+=$ERROR_PRONE_PEERDIR
12141214
RUN_JAVAC_ARGS=--error-prone $ERROR_PRONE_RESOURCE/error_prone.jar
12151215

1216-
when ($JDK_REAL_VERSION == "17" || $JDK_REAL_VERSION == "20" || $JDK_REAL_VERSION == "21" || $JDK_REAL_VERSION == "22" || $JDK_REAL_VERSION == "23" || $JDK_REAL_VERSION == "24" || $JDK_REAL_VERSION == "25") {
1216+
when ($JDK_REAL_VERSION == "17" || $JDK_REAL_VERSION == "21" || $JDK_REAL_VERSION == "22" || $JDK_REAL_VERSION == "23" || $JDK_REAL_VERSION == "24" || $JDK_REAL_VERSION == "25") {
12171217
JAVAC_FLAGS_VALUE+=$ERROR_PRONE_JDK16PLUS_ADD_OPENS
12181218
JAVAC_OPTS+=$ERROR_PRONE_JDK16PLUS_ADD_OPENS
12191219
_JAVAC_SEM+= && javac-flags $ERROR_PRONE_JDK16PLUS_ADD_OPENS
@@ -1397,9 +1397,6 @@ elsewhen ($JDK_VERSION == "22") {
13971397
elsewhen ($JDK_VERSION == "21") {
13981398
JDK_REAL_VERSION=21
13991399
}
1400-
elsewhen ($JDK_VERSION == "20") {
1401-
JDK_REAL_VERSION=20
1402-
}
14031400
elsewhen ($JDK_VERSION == "17") {
14041401
JDK_REAL_VERSION=17
14051402
}
@@ -1433,9 +1430,6 @@ otherwise {
14331430
when ($JDK_REAL_VERSION == "21") {
14341431
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk21
14351432
}
1436-
when ($JDK_REAL_VERSION == "20") {
1437-
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk20
1438-
}
14391433
when ($JDK_REAL_VERSION == "17") {
14401434
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk17
14411435
}
@@ -1460,9 +1454,6 @@ when ($JDK_REAL_VERSION == "22") {
14601454
when ($JDK_REAL_VERSION == "21") {
14611455
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar21
14621456
}
1463-
when ($JDK_REAL_VERSION == "20") {
1464-
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar20
1465-
}
14661457
when ($JDK_REAL_VERSION == "17") {
14671458
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar17
14681459
}
@@ -1492,9 +1483,6 @@ otherwise {
14921483
when ($JDK_REAL_VERSION == "21") {
14931484
JDK_RESOURCE=$JDK21_RESOURCE_GLOBAL
14941485
}
1495-
when ($JDK_REAL_VERSION == "20") {
1496-
JDK_RESOURCE=$JDK20_RESOURCE_GLOBAL
1497-
}
14981486
when ($JDK_REAL_VERSION == "17") {
14991487
JDK_RESOURCE=$JDK17_RESOURCE_GLOBAL
15001488
}
@@ -1516,34 +1504,12 @@ when (!$USE_SYSTEM_ERROR_PRONE) {
15161504
ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.10.0
15171505
ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_10_0_RESOURCE_GLOBAL
15181506
}
1519-
elsewhen ($JDK_REAL_VERSION == "20") {
1520-
ERROR_PRONE_VERSION=2.18.0
1521-
ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.18.0
1522-
ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_18_0_RESOURCE_GLOBAL
1523-
}
1524-
elsewhen ($JDK_REAL_VERSION == "21") {
1525-
ERROR_PRONE_VERSION=2.30.0
1526-
ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.30.0
1527-
ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_30_0_RESOURCE_GLOBAL
1528-
}
1529-
elsewhen ($JDK_REAL_VERSION == "22") {
1530-
ERROR_PRONE_VERSION=2.30.0
1531-
ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.30.0
1532-
ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_30_0_RESOURCE_GLOBAL
1533-
}
1534-
elsewhen ($JDK_REAL_VERSION == "23") {
1507+
elsewhen ($JDK_REAL_VERSION == "21" || $JDK_REAL_VERSION == "22" || $JDK_REAL_VERSION == "23") {
15351508
ERROR_PRONE_VERSION=2.30.0
15361509
ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.30.0
15371510
ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_30_0_RESOURCE_GLOBAL
15381511
}
1539-
elsewhen ($JDK_REAL_VERSION == "24") {
1540-
ERROR_PRONE_VERSION=2.41.0
1541-
ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.41.0
1542-
ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_41_0_RESOURCE_GLOBAL
1543-
JAVAC_FLAGS_VALUE+=$ERROR_PRONE_2_3_7_FORCED_OPTS
1544-
JAVAC_OPTS+=$ERROR_PRONE_2_3_7_FORCED_OPTS
1545-
}
1546-
elsewhen ($JDK_REAL_VERSION == "25") {
1512+
elsewhen ($JDK_REAL_VERSION == "24" || $JDK_REAL_VERSION == "25") {
15471513
ERROR_PRONE_VERSION=2.41.0
15481514
ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.41.0
15491515
ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_41_0_RESOURCE_GLOBAL
@@ -1582,9 +1548,6 @@ otherwise {
15821548
when ($JDK_REAL_VERSION == "21") {
15831549
UBERJAR_RESOURCE=$UBERJAR21_RESOURCE_GLOBAL
15841550
}
1585-
when ($JDK_REAL_VERSION == "20") {
1586-
UBERJAR_RESOURCE=$UBERJAR20_RESOURCE_GLOBAL
1587-
}
15881551
when ($JDK_REAL_VERSION == "17") {
15891552
UBERJAR_RESOURCE=$UBERJAR17_RESOURCE_GLOBAL
15901553
}
@@ -1609,9 +1572,6 @@ when ($JDK_REAL_VERSION == "22") {
16091572
when ($JDK_REAL_VERSION == "21") {
16101573
WITH_JDK_RESOURCE=$WITH_JDK21_RESOURCE_GLOBAL
16111574
}
1612-
when ($JDK_REAL_VERSION == "20") {
1613-
WITH_JDK_RESOURCE=$WITH_JDK20_RESOURCE_GLOBAL
1614-
}
16151575
when ($JDK_REAL_VERSION == "17") {
16161576
WITH_JDK_RESOURCE=$WITH_JDK17_RESOURCE_GLOBAL
16171577
}
@@ -1636,7 +1596,14 @@ elsewhen ($JDK_VERSION == "" && $HAS_PER_MODULE_JDK_VERSION == "no") {
16361596
otherwise {
16371597
EXTERNAL_JAVA_JDK_RESOURCE=$JDK_RESOURCE
16381598
}
1639-
COMPILE_JAVA=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/compile_java.py"} --ya-start-command-file --java-bin $EXTERNAL_JAVA_JDK_RESOURCE/bin/java --javac-bin $EXTERNAL_JAVA_JDK_RESOURCE/bin/javac --jar-bin $JDK_RESOURCE/bin/jar --kotlin-compiler $KOTLIN_COMPILER_RESOURCE_GLOBAL/kotlin-compiler.jar $JAVA_VCS_MF_ARG $PACKAGE_PREFIX_ARGS --jar-output $TARGET --srcs-jar-output ${output;suf=-sources.jar:REALPRJNAME} $AUTO_INPUT DELIM $JAVAC_OPTS $EXTERNAL_JAVA_JAVAC_OPTS DELIM $MANAGED_PEERS_CLOSURE DELIM -no-stdlib -module-name $REALPRJNAME -jvm-target ${KOTLIN_JVM_TARGET} ${KOTLINC_OPTS_VALUE} --ya-end-command-file ${hide;kv:"p JV"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"} ${hide;requirements:"cpu:4"} ${hide;input:"build/scripts/java_command_file.py"} ${hide;input:"build/scripts/process_command_files.py"}
1599+
DISABLE_SOURCES_JAR_FOR_EXTERNAL_LIBRARY=
1600+
when ($DISABLE_SOURCES_JAR_FOR_EXTERNAL_LIBRARY == "yes") {
1601+
SOURCES_JAR_FLAGS=
1602+
}
1603+
otherwise {
1604+
SOURCES_JAR_FLAGS=--srcs-jar-output ${output;suf=-sources.jar:REALPRJNAME}
1605+
}
1606+
COMPILE_JAVA=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/compile_java.py"} --ya-start-command-file --java-bin $EXTERNAL_JAVA_JDK_RESOURCE/bin/java --javac-bin $EXTERNAL_JAVA_JDK_RESOURCE/bin/javac --jar-bin $JDK_RESOURCE/bin/jar --kotlin-compiler $KOTLIN_COMPILER_RESOURCE_GLOBAL/kotlin-compiler.jar $JAVA_VCS_MF_ARG $PACKAGE_PREFIX_ARGS --jar-output $TARGET $SOURCES_JAR_FLAGS $AUTO_INPUT DELIM $JAVAC_OPTS $EXTERNAL_JAVA_JAVAC_OPTS DELIM $MANAGED_PEERS_CLOSURE DELIM -no-stdlib -module-name $REALPRJNAME -jvm-target ${KOTLIN_JVM_TARGET} ${KOTLINC_OPTS_VALUE} --ya-end-command-file ${hide;kv:"p JV"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"} ${hide;requirements:"cpu:4"} ${hide;input:"build/scripts/java_command_file.py"} ${hide;input:"build/scripts/process_command_files.py"}
16401607

16411608
ARGS_DELIM="MACRO_CALLS_DELIM"
16421609

‎build/conf/ts/node_modules.conf‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
PNPM_ROOT=
22
PNPM_SCRIPT=$PNPM_ROOT/node_modules/pnpm/dist/pnpm.cjs
33

4-
NPM_ROOT=
5-
NPM_SCRIPT=$NPM_ROOT/node_modules/npm/bin/npm-cli.js
6-
7-
PM_SCRIPT=
8-
PM_TYPE=
4+
PM_SCRIPT=$PNPM_SCRIPT
5+
PM_TYPE=pnpm
96

107
# combined input/outputs records as list of directives ${hide;input:<path>} ${hide;output:<path>}, used in builders
118
_NODE_MODULES_INOUTS=
@@ -74,8 +71,8 @@ module _PREPARE_DEPS_BASE: _BARE_UNIT {
7471
DISABLE(START_TARGET)
7572

7673
# we read pnpm-lock.yaml and package.json during configuration
77-
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS ${CURDIR}/pnpm-lock.yaml ${CURDIR}/package-lock.json ${CURDIR}/package.json)
74+
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS ${CURDIR}/pnpm-lock.yaml ${CURDIR}/package.json)
7875

79-
_SET_PACKAGE_MANAGER()
76+
_PEERDIR_TS_RESOURCE(nodejs $PM_TYPE)
8077
_PREPARE_DEPS_CONFIGURE()
8178
}

‎build/conf/ts/ts.conf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,7 @@ module _TS_BASE_UNIT: _BARE_UNIT {
117117
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS ${ARCADIA_ROOT}/$ERM_PACKAGES_PATH)
118118

119119
# PEERDIR that reads required version of tool from package.json
120-
_PEERDIR_TS_RESOURCE(nodejs)
121-
_SET_PACKAGE_MANAGER()
120+
_PEERDIR_TS_RESOURCE(nodejs $PM_TYPE)
122121
}
123122

124123
# tag:test

‎build/conf/ts/ts_test.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ module _TS_TEST_BASE: _BARE_UNIT {
166166
# parse module args
167167
_TS_TEST_FOR_ARGS($MODULE_ARGS_RAW)
168168

169-
# Set PM values from TS_TEST_FOR_DIR
170-
_SET_PACKAGE_MANAGER()
169+
# PEERDIR that reads required version of tool from package.json
170+
_PEERDIR_TS_RESOURCE(nodejs $PM_TYPE)
171171

172172
# we don't want to have TS outputs for tests
173173
DISABLE(TS_CONFIG_DEDUCE_OUT)

‎build/conf/ts/ts_tsc.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ multimodule TS_TSC {
3838

3939
_TS_CONFIGURE()
4040

41-
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS ${CURDIR}/package.json ${CURDIR}/pnpm-lock.yaml ${CURDIR}/package-lock.json ${CURDIR}/${TS_CONFIG_PATH})
41+
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS ${CURDIR}/package.json ${CURDIR}/pnpm-lock.yaml ${CURDIR}/${TS_CONFIG_PATH})
4242
_TS_ADD_NODE_MODULES_FOR_BUILDER()
4343
}
4444

‎build/mapping.conf.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,7 @@
623623
"9824364966": "{registry_endpoint}/9824364966",
624624
"9854287477": "{registry_endpoint}/9854287477",
625625
"9909336016": "{registry_endpoint}/9909336016",
626+
"9920199096": "{registry_endpoint}/9920199096",
626627
"5486731632": "{registry_endpoint}/5486731632",
627628
"5514350352": "{registry_endpoint}/5514350352",
628629
"5514360398": "{registry_endpoint}/5514360398",
@@ -2319,6 +2320,7 @@
23192320
"9824364966": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
23202321
"9854287477": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
23212322
"9909336016": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
2323+
"9920199096": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
23222324
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
23232325
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
23242326
"5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",

‎build/platform/java/jdk/jdk11/ya.make‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
RESOURCES_LIBRARY()
22

3+
TOOLCHAIN(JDK)
4+
VERSION(11.0.28+6)
5+
36
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK11 jdk.json)
47
SET_RESOURCE_URI_FROM_JSON(WITH_JDK11_URI jdk.json)
58

‎build/platform/java/jdk/jdk17/ya.make‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
RESOURCES_LIBRARY()
22

3+
TOOLCHAIN(JDK)
4+
VERSION(17.0.16+8)
5+
36
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK17 jdk.json)
47
SET_RESOURCE_URI_FROM_JSON(WITH_JDK17_URI jdk.json)
58

‎build/platform/java/jdk/jdk20/jdk.json‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎build/platform/java/jdk/jdk20/ya.make‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)