diff options
| author | dimdim11 <dimdim11@yandex-team.com> | 2025-02-28 08:50:46 +0300 |
|---|---|---|
| committer | dimdim11 <dimdim11@yandex-team.com> | 2025-02-28 09:15:05 +0300 |
| commit | d98754aa913bbc24c0aa3fc5a27654843b335b8b (patch) | |
| tree | 983501588c195dc27576d384656865645d99acf5 /build | |
| parent | 35d7c485a4db047e51377145f5fb8db47b3d1eec (diff) | |
| download | ydb-d98754aa913bbc24c0aa3fc5a27654843b335b8b.tar.gz | |
Hash for _RESOURCE_SEM by all args
Hash for _RESOURCE_SEM by all args
commit_hash:9ec01ef7665f894a7d177387eb6c6e5d41781ee0
Diffstat (limited to 'build')
| -rw-r--r-- | build/conf/java.conf | 5 | ||||
| -rw-r--r-- | build/ymake.core.conf | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index dbc53bb371..f76b0cfc90 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -451,11 +451,6 @@ macro DEFAULT_JUNIT_JAVA_SRCS_LAYOUT() { FULL_JAVA_SRCS(RESOURCES SRCDIR resources **/* SKIP_CHECK_SRCDIR) } -macro _HASH_HELPER(Args...) { - .CMD=${hash:Args} - .SEM=${hash:Args} -} - macro _GENTAR_HELPER(HASH_SUF="hash_suf", OUT_DIR[]) { .CMD=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/autotar_gendirs.py"} --pack ${OUT_DIR} --outs ${output;tared;suf=$HASH_SUF:OUT_DIR} ${hide;kv:"tared_kind nodir"} .SEM=${hide;suf=$HASH_SUF;tared;output:OUT_DIR} diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 1ed20b6aab..95c637803f 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -487,8 +487,13 @@ macro CHECK_DEPENDENT_DIRS(TYPE, ALL?"UNUSED":"", PEERDIRS?"PEERDIRS":"ALL", RES SET_APPEND(CHECK_DEPENDENT_DIRS_TYPES $TYPE) } +macro _HASH_HELPER(Args...) { + .CMD=${hash:Args} + .SEM=${hash:Args} +} + macro _RESOURCE_SEM(INPUTS[], KEYS[], OPTS[]) { - SET(RESOURCE_OUTPUT ${hash:INPUTS}.cpp) + SET(RESOURCE_OUTPUT $_HASH_HELPER($INPUTS $KEYS $OPTS).cpp) .SEM=target_macroses-ITEM && target_macroses-macro resources && target_macroses-args ${output;global:RESOURCE_OUTPUT} INPUTS ${input:INPUTS} KEYS $KEYS OPTS $OPTS ${hide;tool:"tools/rescompiler/bin"} } |