diff options
| author | deshevoy <deshevoy@yandex-team.com> | 2025-05-20 10:11:55 +0300 |
|---|---|---|
| committer | deshevoy <deshevoy@yandex-team.com> | 2025-05-20 10:42:35 +0300 |
| commit | f6feaf78f8303074cd409a1300c386d9c754a85d (patch) | |
| tree | 0532cd66babf20a9b22c5073844673d638f92a93 | |
| parent | 68cf18d5ea6913da54fcd36e31e2b6a178900729 (diff) | |
| download | ydb-f6feaf78f8303074cd409a1300c386d9c754a85d.tar.gz | |
[build] Move PACKAGE_FINAL out of the multimodule to allow inheritance
commit_hash:ada3d2aa3a0918a5cfea996b15bafdde559e60ec
| -rw-r--r-- | build/ymake.core.conf | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 61a1354cb43..9e94e66b827 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -2315,6 +2315,27 @@ macro PACK(Ext) { SET(PACKED_PACKAGE_EXT $Ext) } +module _PACKAGE_FINAL: _BASE_UNIT { + .CMD=TOUCH_PACKAGE_MF + .ALIASES=SRCS=FILES + .ALLOWED=PACK + .USE_PEERS_LATE_OUTS=yes + .PEERDIR_POLICY=as_build_from + .FINAL_TARGET=yes + + SET(PEERDIR_TAGS CPP_PROTO CPP_PROTO_FROM_SCHEMA CPP_FBS PY2 PY3 PY2_NATIVE PY3_NATIVE YQL_UDF_SHARED __EMPTY__ RESOURCE_LIB DOCSBOOK JAR_RUNNABLE PY3_BIN PY3TEST_PROGRAM DLL GO_PROGRAM TS PACKAGE_UNION) + + SET(MODULE_SUFFIX .final.pkg.fake) + SET(DONT_RESOLVE_INCLUDES yes) + NO_PLATFORM() + when ($PACKED_PACKAGE_EXT) { + PACKED_PACKAGE_ARGS+=--dest-arch ${output;pre=$MODULE_PREFIX;suf=.$PACKED_PACKAGE_EXT:REALPRJNAME} + } + SET(NEED_PLATFORM_PEERDIRS no) + SET(_COPY_FILE_CONTEXT TEXT) + DISABLE(_NEED_SBOM_INFO) +} + ### @usage: PACKAGE(name) ### ### Module collects what is described directly inside it, builds and collects all its transitively available PEERDIRs. @@ -2327,27 +2348,10 @@ macro PACK(Ext) { ### ### @see: [PACK()](#macro_PACK) multimodule PACKAGE { - module PACKAGE_FINAL: _BASE_UNIT { - .CMD=TOUCH_PACKAGE_MF - .ALIASES=SRCS=FILES - .ALLOWED=PACK + module PACKAGE_FINAL: _PACKAGE_FINAL { .PEERDIRSELF=PACKAGE_UNION - .USE_PEERS_LATE_OUTS=yes - .PEERDIR_POLICY=as_build_from - .FINAL_TARGET=yes - - SET(PEERDIR_TAGS CPP_PROTO CPP_PROTO_FROM_SCHEMA CPP_FBS PY2 PY3 PY2_NATIVE PY3_NATIVE YQL_UDF_SHARED __EMPTY__ RESOURCE_LIB DOCSBOOK JAR_RUNNABLE PY3_BIN PY3TEST_PROGRAM DLL GO_PROGRAM TS PACKAGE_UNION) - - SET(MODULE_SUFFIX .final.pkg.fake) - SET(DONT_RESOLVE_INCLUDES yes) - NO_PLATFORM() - when ($PACKED_PACKAGE_EXT) { - PACKED_PACKAGE_ARGS+=--dest-arch ${output;pre=$MODULE_PREFIX;suf=.$PACKED_PACKAGE_EXT:REALPRJNAME} - } - SET(NEED_PLATFORM_PEERDIRS no) - SET(_COPY_FILE_CONTEXT TEXT) - DISABLE(_NEED_SBOM_INFO) } + module PACKAGE_UNION: UNION { .CMD=UNION_CMD .FINAL_TARGET=no |