diff options
author | spreis <spreis@yandex-team.ru> | 2022-02-10 16:47:13 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:13 +0300 |
commit | b49848d6e361b76904f094b7d5e10d6edea75afe (patch) | |
tree | 9814fbd1c3effac9b8377c5d604b367b14e2db55 /build/conf | |
parent | bcd1126cbd5d445cd0665d295198aa39c6ab8cbe (diff) | |
download | ydb-b49848d6e361b76904f094b7d5e10d6edea75afe.tar.gz |
Restoring authorship annotation for <spreis@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'build/conf')
-rw-r--r-- | build/conf/java.ymake.conf | 4 | ||||
-rw-r--r-- | build/conf/license.conf | 6 | ||||
-rw-r--r-- | build/conf/opensource.conf | 26 | ||||
-rw-r--r-- | build/conf/project_specific/maps/aar.conf | 2 | ||||
-rw-r--r-- | build/conf/sysincl.conf | 4 | ||||
-rw-r--r-- | build/conf/ts.conf | 6 |
6 files changed, 24 insertions, 24 deletions
diff --git a/build/conf/java.ymake.conf b/build/conf/java.ymake.conf index a44abb6d40..ed85153c78 100644 --- a/build/conf/java.ymake.conf +++ b/build/conf/java.ymake.conf @@ -20,7 +20,7 @@ macro ACCELEO(XSD{input}[], MTL{input}[], MTL_ROOT="${MODDIR}", LANG{input}[], O ### ### Documentation: https://wiki.yandex-team.ru/yatool/java/ module JAVA_LIBRARY: JAR_LIBRARY { - .ALIASES=REQUIREMENTS=JAVA_REQUIREMENTS + .ALIASES=REQUIREMENTS=JAVA_REQUIREMENTS } ### @usage: JAVA_PROGRAM() @@ -47,7 +47,7 @@ multimodule JAVA_PROGRAM { } module JAR_COMPILATION: JAR_LIBRARY { .IGNORED=JAVA_RUNTIME_PEERDIR JAVA_RUNTIME_EXCLUDE - .ALIASES=JAVA_RUNTIME_PEERDIR=_NOOP_MACRO JAVA_RUNTIME_EXCLUDE=_NOOP_MACRO REQUIREMENTS=JAVA_REQUIREMENTS + .ALIASES=JAVA_RUNTIME_PEERDIR=_NOOP_MACRO JAVA_RUNTIME_EXCLUDE=_NOOP_MACRO REQUIREMENTS=JAVA_REQUIREMENTS .FINAL_TARGET=no SET(MODULE_TYPE JAVA_PROGRAM) } diff --git a/build/conf/license.conf b/build/conf/license.conf index 3bed882ca0..f2fb576b0d 100644 --- a/build/conf/license.conf +++ b/build/conf/license.conf @@ -1,5 +1,5 @@ LICENSE_EXPRESSION_IMPLICIT_OR=yes -LICENSE_EXPRESSION_IMPLICIT_AND=yes +LICENSE_EXPRESSION_IMPLICIT_AND=yes LICENSE_EXPRESSION= LICENSE_NAMES= @@ -252,8 +252,8 @@ LICENSES_PERMISSIVE= \ JSON \ Khronos \ Libpbm \ - LicenseRef-scancode-bitstream \ - LicenseRef-scancode-ams-fonts \ + LicenseRef-scancode-bitstream \ + LicenseRef-scancode-ams-fonts \ Linux-OpenIB \ Libpng \ libpng-2.0 \ diff --git a/build/conf/opensource.conf b/build/conf/opensource.conf index 1eec5cd236..c0ab8489b8 100644 --- a/build/conf/opensource.conf +++ b/build/conf/opensource.conf @@ -1,14 +1,14 @@ -when ($CATBOOST_OPENSOURCE == "yes") { - OPENSOURCE=yes -} - -when ($OPENSOURCE) { - LOCAL_YDB_DOCKER_PUBLIC_BUILD=yes - CATBOOST_OPENSOURCE=yes - USE_DYNAMIC_IDN=yes - USE_DYNAMIC_AIO=yes - USE_DYNAMIC_ICONV=yes - USE_ASMLIB=no - SO_OUTPUTS=yes +when ($CATBOOST_OPENSOURCE == "yes") { + OPENSOURCE=yes +} + +when ($OPENSOURCE) { + LOCAL_YDB_DOCKER_PUBLIC_BUILD=yes + CATBOOST_OPENSOURCE=yes + USE_DYNAMIC_IDN=yes + USE_DYNAMIC_AIO=yes + USE_DYNAMIC_ICONV=yes + USE_ASMLIB=no + SO_OUTPUTS=yes UDF_NO_PROBE=yes -} +} diff --git a/build/conf/project_specific/maps/aar.conf b/build/conf/project_specific/maps/aar.conf index 059ab91d04..780ff38984 100644 --- a/build/conf/project_specific/maps/aar.conf +++ b/build/conf/project_specific/maps/aar.conf @@ -163,7 +163,7 @@ module MOBILE_TEST_APK: DLL { module MOBILE_BOOST_TEST_APK: MOBILE_TEST_APK { PEERDIR(devtools/dummy_arcadia/test/test_apk/template) PEERDIR(build/external_resources/mapsmobi_maven_repo) - ADD_YTEST($MODULE_PREFIX$REALPRJNAME boost.test) + ADD_YTEST($MODULE_PREFIX$REALPRJNAME boost.test) MOBILE_TEST_APK_TEMPLATE(${ARCADIA_ROOT}/devtools/dummy_arcadia/test/test_apk/template Manifest.xml java/com/yandex/test/unittests/RunTestsActivity.java res/values/strings.xml) } diff --git a/build/conf/sysincl.conf b/build/conf/sysincl.conf index 91b5e6b0f9..60e641e2db 100644 --- a/build/conf/sysincl.conf +++ b/build/conf/sysincl.conf @@ -21,7 +21,7 @@ when ($USE_SYSTEM_JDK) { SYSINCL+=build/sysincl/system-jdk.yml } -when ($OPENSOURCE != "yes") { +when ($OPENSOURCE != "yes") { SYSINCL+=build/yandex_specific/sysincl/speechkit.yml SYSINCL+=build/yandex_specific/sysincl/sophos.yml SYSINCL+=build/yandex_specific/sysincl/misc.yml @@ -35,7 +35,7 @@ when ($MUSL == "yes") { when ($OS_WINDOWS == "yes") { SYSINCL+=build/sysincl/misc-win.yml - when ($OPENSOURCE !="yes") { + when ($OPENSOURCE !="yes") { SYSINCL+=build/yandex_specific/sysincl/misc-win.yml } } diff --git a/build/conf/ts.conf b/build/conf/ts.conf index 80c2b7fc7a..8fc221c3ca 100644 --- a/build/conf/ts.conf +++ b/build/conf/ts.conf @@ -43,7 +43,7 @@ macro FROM_NPM_LOCKFILES(LOCKFILES...) { ### @usage: FROM_NPM(NAME VERSION SKY_ID INTEGRITY INTEGRITY_ALGO TARBALL_PATH) macro FROM_NPM(NAME, VERSION, SKY_ID, INTEGRITY, INTEGRITY_ALGO, TARBALL_PATH) { - .CMD=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/fetch_from_npm.py"} ${input;hide:"build/scripts/fetch_from.py"} ${input;hide:"build/scripts/sky.py"} --name $NAME --version $VERSION --sky-id $SKY_ID --integrity $INTEGRITY --integrity-algorithm $INTEGRITY_ALGO --copy-to ${output:TARBALL_PATH} ${requirements;hide:"network:full"} ${kv;hide:"p NP"} ${kv;hide:"pc yellow"} + .CMD=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/fetch_from_npm.py"} ${input;hide:"build/scripts/fetch_from.py"} ${input;hide:"build/scripts/sky.py"} --name $NAME --version $VERSION --sky-id $SKY_ID --integrity $INTEGRITY --integrity-algorithm $INTEGRITY_ALGO --copy-to ${output:TARBALL_PATH} ${requirements;hide:"network:full"} ${kv;hide:"p NP"} ${kv;hide:"pc yellow"} } ### @usage: NODE_MODULES() @@ -61,7 +61,7 @@ macro _NODE_MODULES(IN{input}[], OUT{output}[]) { PEERDIR($NPM_CONTRIBS_PATH) SET(_NODE_MODULES_INPUTS \${input;hide:node_modules.tar}) - .CMD=${cwd:BINDIR} $NOTS_TOOL create-node-modules $NOTS_TOOL_BASE_ARGS --pnpm-script $PNPM_SCRIPT --contribs $NPM_CONTRIBS_PATH ${input;hide:IN} ${output;global;hide:OUT} ${kv;hide:"p NM"} ${kv;hide:"pc yellow"} + .CMD=${cwd:BINDIR} $NOTS_TOOL create-node-modules $NOTS_TOOL_BASE_ARGS --pnpm-script $PNPM_SCRIPT --contribs $NPM_CONTRIBS_PATH ${input;hide:IN} ${output;global;hide:OUT} ${kv;hide:"p NM"} ${kv;hide:"pc yellow"} } module _TS_BASE_UNIT: _BASE_UNIT { @@ -79,7 +79,7 @@ module _TS_BASE_UNIT: _BASE_UNIT { TS_CONFIG_PATH=tsconfig.json -TS_COMPILE=${cwd:BINDIR} $NOTS_TOOL compile-ts $NOTS_TOOL_BASE_ARGS --tsc-script $TSC_SCRIPT --config ${input:TS_CONFIG_PATH} $_NODE_MODULES_INPUTS ${output;hide:"package.json"} ${kv;hide:"p FE"} ${kv;hide:"pc yellow"} && $TOUCH_UNIT +TS_COMPILE=${cwd:BINDIR} $NOTS_TOOL compile-ts $NOTS_TOOL_BASE_ARGS --tsc-script $TSC_SCRIPT --config ${input:TS_CONFIG_PATH} $_NODE_MODULES_INPUTS ${output;hide:"package.json"} ${kv;hide:"p FE"} ${kv;hide:"pc yellow"} && $TOUCH_UNIT ### @usage: TS_LIBRARY([name]) ### |