diff options
| author | Alexander Smirnov <alex@ydb.tech> | 2024-12-24 15:46:17 +0000 |
|---|---|---|
| committer | Alexander Smirnov <alex@ydb.tech> | 2024-12-24 15:46:17 +0000 |
| commit | c7decaf9230ddcb1ec2c42d1f50fb3998166c4ef (patch) | |
| tree | 4efde4e4276bb0f24c314909403a1f6ed94c60d7 /build/conf | |
| parent | cf344b64297e6a79d1e538be9f8f59afb06a2a97 (diff) | |
| parent | b821606f7bd364dc755d37b5bcb3559130675364 (diff) | |
| download | ydb-c7decaf9230ddcb1ec2c42d1f50fb3998166c4ef.tar.gz | |
Merge branch 'rightlib' into merge-libs-241224-1545
Diffstat (limited to 'build/conf')
| -rw-r--r-- | build/conf/java.conf | 1 | ||||
| -rw-r--r-- | build/conf/proto.conf | 12 | ||||
| -rw-r--r-- | build/conf/settings.conf | 1 | ||||
| -rw-r--r-- | build/conf/ts/ts_test.conf | 2 |
4 files changed, 2 insertions, 14 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index 114f78cd95..c83a583526 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -423,6 +423,7 @@ macro _SEM_JAR_SOURCE_SET(SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[], FILES[], RES macro FULL_JAVA_SRCS(Args...) { _IDEA_JAVA_SRCS_VALUE($Args) _JAVA_SRCS($Args) + _SEM_JAR_SOURCE_SET($Args) } # tag:java-specific diff --git a/build/conf/proto.conf b/build/conf/proto.conf index 7f1194e32b..988206de22 100644 --- a/build/conf/proto.conf +++ b/build/conf/proto.conf @@ -511,18 +511,6 @@ macro _JAVA_PROTO_CMD(File) { .SEM=proto_files ${input;rootrel:File} ${hide;output:File.jsrc} } - -# tag:proto tag:perl-specific tag:deprecated -### @usage: XS_PROTO(InputProto Dir Outputs...) # deprecated -### -### Generate Perl code from protobuf. -### In order to use this macro one should predict all outputs protoc will emit from input_proto file and enlist those as outputs. -macro XS_PROTO(File, Dir, Outputs...) { - .CMD=${PROTOC_OLD} -I=${ARCADIA_ROOT}/${Dir} ${pre=-I=:_PROTO__INCLUDE} -I=${ARCADIA_ROOT} -I=${PROTOBUF_OLD_PATH} --perlxs_out=${BINDIR} $_PROTOC_FLAGS ${input:File} ${hide;output:Outputs} ${induced_deps=h+cpp;hide;nopath;noext;suf=.pb.h:File} ${hide:PROTO_FAKEID} - PEERDIR(${Dir}) - ADDINCL(${ARCADIA_BUILD_ROOT}/${Dir}) -} - # tag:proto tag:python-specific when ($PY_PROTOS_FOR == "yes") { PEERDIR+=contrib/libs/protobuf/python diff --git a/build/conf/settings.conf b/build/conf/settings.conf index 87b1ba4203..2094fce5c5 100644 --- a/build/conf/settings.conf +++ b/build/conf/settings.conf @@ -127,4 +127,3 @@ ARCADIA_TEST_ROOT=../arcadia_tests_data/ DEFAULT_REQUIREMENTS=network:restricted cpu:1 ram:32 AUTOINCLUDE_PATHS=build/conf/autoincludes.json -LINTERS_MAKE_FILENAME=linters.make.inc diff --git a/build/conf/ts/ts_test.conf b/build/conf/ts/ts_test.conf index c468139336..79f3d79bf2 100644 --- a/build/conf/ts/ts_test.conf +++ b/build/conf/ts/ts_test.conf @@ -35,7 +35,7 @@ module TS_TEST_JEST_FOR: _TS_TEST_BASE { SET(PEERDIR_TAGS TS TS_PROTO TS_PROTO_FROM_SCHEMA) # compatibility with old TS_TEST_SRCS - SET(TS_TEST_EXTENSION test.(ts|tsx|js|jsx)) + SET(TS_TEST_EXTENSION (test|spec).(ts|tsx|mts|cts|js|jsx|mjs|cjs)) SET(TS_TEST_EXTRA_SRCS_MASK /**/__mocks__/*) # nots.py will decide if we need to depend on the testing target module output |