summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxinull <[email protected]>2022-04-15 16:22:47 +0300
committerxinull <[email protected]>2022-04-15 16:22:47 +0300
commit3375bbfda1e2afb03aa2072bf5f2f2c3a26026e8 (patch)
treeaffe2cbbe92fa52b624f8f825eb0dd456c677213
parent09208e509e895685f4cf48abb2346edd7554b9c2 (diff)
YMAKE-114: Add two default attributes
Remove hardcode Add attrs to configs Add expose func and parser by value ref:d2acd0e040aae950e0d344d3fd2e1638818b268f
-rw-r--r--build/conf/java.ymake.conf1
-rw-r--r--build/ymake.core.conf23
2 files changed, 24 insertions, 0 deletions
diff --git a/build/conf/java.ymake.conf b/build/conf/java.ymake.conf
index 7854e5199cd..ca1e75daf44 100644
--- a/build/conf/java.ymake.conf
+++ b/build/conf/java.ymake.conf
@@ -151,6 +151,7 @@ multimodule JAVA_CONTRIB_PROGRAM {
}
module _DLL_COMPATIBLE_JAVA_LIBRARY: EXTERNAL_JAVA_LIBRARY {
+ .ARGS_PARSER=DLL
SET(DONT_RESOLVE_INCLUDES yes)
}
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 5c5b88fb75e..6313044aaad 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -1642,6 +1642,8 @@ module _LINK_UNIT: _BASE_UNIT {
.NODE_TYPE=Program
.PEERDIR_POLICY=as_build_from
.FINAL_TARGET=yes
+ .DEFAULT_NAME_GENERATOR=DirName
+ .ARGS_PARSER=Base
DEFAULT(ALLOCATOR $DEFAULT_ALLOCATOR)
_USE_LINKER()
@@ -1935,6 +1937,8 @@ UNITTEST_SEM=$CPP_PROGRAM_SEM && add_test NAME $REALPRJNAME COMMAND $REALPRJNAME
### Documentation: https://wiki.yandex-team.ru/yatool/test/#opisanievya.make1
module UNITTEST: _BASE_UNITTEST {
.SEM=UNITTEST_SEM
+ .DEFAULT_NAME_GENERATOR=FullPath
+ .ARGS_PARSER=Base
PEERDIR(library/cpp/testing/unittest_main)
ADD_YTEST($MODULE_PREFIX$REALPRJNAME unittest.py)
SET(MODULE_LANG CPP)
@@ -1966,6 +1970,8 @@ module UNITTEST_WITH_CUSTOM_ENTRY_POINT: _BASE_UNITTEST {
### Documentation: https://docs.yandex-team.ru/arcadia-cpp/cpp_test
module GTEST: _BASE_UNITTEST {
.SEM=UNITTEST_SEM
+ .DEFAULT_NAME_GENERATOR=FullPath
+ .ARGS_PARSER=Base
PEERDIR(library/cpp/testing/gtest library/cpp/testing/gtest_main)
ADD_YTEST($MODULE_PREFIX$REALPRJNAME gunittest)
SET(MODULE_LANG CPP)
@@ -2256,6 +2262,8 @@ module _BASE_PYTEST: _BASE_PY_PROGRAM {
### Same as PY2TEST. Don't use this, use PY2TEST instead.
module PYTEST_BIN: _BASE_PYTEST {
.NODE_TYPE=Program
+ .DEFAULT_NAME_GENERATOR=FullPath
+ .ARGS_PARSER=Base
SETUP_PYTEST_BIN()
}
@@ -2271,6 +2279,8 @@ module PYTEST_BIN: _BASE_PYTEST {
### Documentation about the Arcadia test system: https://wiki.yandex-team.ru/yatool/test/
module PY2TEST: PYTEST_BIN {
.RESTRICTED=STYLE_PYTHON
+ .DEFAULT_NAME_GENERATOR=FullPath
+ .ARGS_PARSER=Base
when ($FAIL_PY2 == "yes") {
_OK=no
}
@@ -2289,6 +2299,8 @@ module PY3TEST_BIN: _BASE_PY3_PROGRAM {
.NODE_TYPE=Program
.FINAL_TARGET=no
.ALLOWED=YT_SPEC NO_DOCTESTS
+ .DEFAULT_NAME_GENERATOR=FullPath
+ .ARGS_PARSER=Base
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
SET(MODULE_LANG PY3)
SETUP_PYTEST_BIN()
@@ -2382,6 +2394,8 @@ module EXECTEST: _BARE_UNIT {
.FINAL_TARGET=no
.ALLOWED=YT_SPEC
.RESTRICTED=FORK_TEST_FILES
+ .DEFAULT_NAME_GENERATOR=FullPath
+ .ARGS_PARSER=Base
SET(MODULE_SUFFIX .pkg.fake)
SETUP_EXECTEST()
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
@@ -2532,6 +2546,8 @@ module LIBRARY: _LIBRARY {
.GLOBAL=_AARS _PROGUARD_RULES
.SEM=CPP_LIBRARY_SEM
.GLOBAL_SEM=CPP_OBJ_LIBRARY_SEM
+ .DEFAULT_NAME_GENERATOR=ThreeDirNames
+ .ARGS_PARSER=Base
when ($CMAKE_PACKAGE_COMPONENT != "") {
CMAKE_FIND_PKG_COMP=COMPONENTS $CMAKE_PACKAGE_COMPONENT
@@ -2708,6 +2724,8 @@ module DLL_UNIT: _LINK_UNIT {
.SYMLINK_POLICY=SO
.GLOBAL=USER_CFLAGS USER_CXXFLAGS USER_CONLYFLAGS LDFLAGS _WHOLE_ARCHIVE_LIBS_VALUE RPATH
.ALLOWED=WHOLE_ARCHIVE
+ .DEFAULT_NAME_GENERATOR=TwoDirNames
+ .ARGS_PARSER=DLL
DYNAMIC_LINK=yes
ALLOCATOR(FAKE)
SET(MODULE_TYPE DLL)
@@ -3092,6 +3110,8 @@ macro ALL_SRCS(GLOBAL?"GLOBAL":"", Files...) {
### same set of arguments. So this module is just library that accepts but
### ignores all DLL arguments.
module _DLL_COMPATIBLE_LIBRARY: LIBRARY {
+ .DEFAULT_NAME_GENERATOR=TwoDirNames
+ .ARGS_PARSER=DLL
}
@import "${CONF_ROOT}/conf/project_specific/yql_udf.conf"
@@ -3392,6 +3412,7 @@ module _JAR_BASE: _BARE_UNIT {
.FINAL_TARGET=no
.ALIASES=SRCS=_SRCS_NO_GLOBAL
.ALLOWED=EMBED_JAVA_VCS_INFO DEPENDENCY_MANAGEMENT EXCLUDE
+ .DEFAULT_NAME_GENERATOR=TwoDirNames
PEERDIR_TAGS=JAVA_PROTO JAVA_FBS JAVA_IDL DLL JAR_COMPILATION __EMPTY__
@@ -8430,6 +8451,7 @@ module _GO_BASE_UNIT: _BASE_UNIT {
.ALIASES=SRCS=_GO_SRCS RESOURCE=_GO_RESOURCE GO_TEST_SRCS=_GO_UNUSED_SRCS GO_XTEST_SRCS=_GO_UNUSED_SRCS GRPC=_GO_GRPC GO_GRPC_GATEWAY_SRCS=_GO_GRPC_GATEWAY_SRCS GO_GRPC_GATEWAY_SWAGGER_SRCS=_GO_GRPC_GATEWAY_SWAGGER_SRCS CFLAGS=CGO_CFLAGS GO_TEST_EMBED_PATTERN=_GO_UNUSED_SRCS GO_XTEST_EMBED_PATTERN=_GO_UNUSED_SRCS GO_TEST_EMBED_DIR=_GO_UNUSED_SRCS GO_XTEST_EMBED_DIR=_GO_UNUSED_SRCS
.ALLOWED=GO_PROTO_PLUGIN USE_CXX USE_UTIL RESOURCE_FILES
.IGNORED=GO_SKIP_TESTS USE_SKIFF
+ .DEFAULT_NAME_GENERATOR=UseDirNameOrSetGoPackage
ENABLE(_GO_MODULE)
SET(MODULE_TAG GO)
@@ -8643,6 +8665,7 @@ module _GO_DLL_BASE_UNIT: GO_PROGRAM {
.CMD=GO_LINK_DLL
.SYMLINK_POLICY=SO
.ALLOWED=WHOLE_ARCHIVE
+ .ARGS_PARSER=DLL
SET(_GO_TOOL_MODE dll)
SET(MODULE_TYPE DLL)