diff options
author | zaverden <zaverden@yandex-team.com> | 2024-10-17 09:07:08 +0300 |
---|---|---|
committer | zaverden <zaverden@yandex-team.com> | 2024-10-17 09:23:20 +0300 |
commit | 68f2bcc600fc15fb8400346624c43d6be3ec81b2 (patch) | |
tree | d68f5ff3b9413a3026e6364bf41d13739b8d9511 /build/conf | |
parent | fe7dabb9c4f211cb4ba4884d0c323e77873800c3 (diff) | |
download | ydb-68f2bcc600fc15fb8400346624c43d6be3ec81b2.tar.gz |
feat(conf+builder): remove contrib-related code
commit_hash:cfbd74bf877107b5db0cb2ea60977b4849e15af5
Diffstat (limited to 'build/conf')
-rw-r--r-- | build/conf/ts/node_modules.conf | 51 | ||||
-rw-r--r-- | build/conf/ts/ts.conf | 1 |
2 files changed, 1 insertions, 51 deletions
diff --git a/build/conf/ts/node_modules.conf b/build/conf/ts/node_modules.conf index f33668db45..719aceb578 100644 --- a/build/conf/ts/node_modules.conf +++ b/build/conf/ts/node_modules.conf @@ -7,59 +7,10 @@ NPM_SCRIPT=$NPM_ROOT/node_modules/npm/bin/npm-cli.js PM_SCRIPT= PM_TYPE= -NPM_CONTRIBS_PATH=- -# combined input/outputs records as list of directives ${hide;input:<path>} ${hide;output:<path>}, used in builders +# combined input/outputs records as list of directives ${input;hide:<path>} ${output;hide:<path>}, used in builders _NODE_MODULES_INOUTS= _YATOOL_PREBUILDER_ARG= -macro CUSTOM_CONTRIB_TYPESCRIPT(P) { - SET(NPM_CONTRIBS_PATH -) -} - -macro NO_CONTRIB_TYPESCRIPT() { - SET(NPM_CONTRIBS_PATH -) -} - -### @usage: NPM_CONTRIBS() # internal -### -### Defines special module that provides contrib tarballs from internal npm registry. -### -### @see [FROM_NPM_LOCKFILES()](#macro_FROM_NPM_LOCKFILES) -module NPM_CONTRIBS: _BARE_UNIT { - .CMD=TOUCH_UNIT - .PEERDIR_POLICY=as_build_from - .FINAL_TARGET=no - .ALLOWED=FROM_NPM_LOCKFILES - .RESTRICTED=PEERDIR - .EXTS=_ # Ignore all files, so module is not affected by FROM_NPM output (.EXTS=* is inherited from _BARE_UNIT) - - SET(MODULE_TAG NPM_CONTRIBS) - SET(MODULE_LANG TS) - - # .fake tells builder to not materialize it in results - SET(MODULE_SUFFIX .fake) -} - -### @usage: FROM_NPM_LOCKFILES(LOCKFILES...) # internal -### -### Defines lockfile list for `NPM_CONTRIBS` module. -### -### @see [NPM_CONTRIBS()](#module_NPM_CONTRIBS) -macro FROM_NPM_LOCKFILES(LOCKFILES...) { - # SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS $LOCKFILES) - # See implementation in build/plugins/nots.py - # _FROM_NPM_LOCKFILES($LOCKFILES) - MESSAGE("NPM_CONTRIBS and FROM_NPM_LOCKFILES are disabled. Please exclude them from your build process") -} - -FROM_NPM_CWD=$ARCADIA_BUILD_ROOT/$NPM_CONTRIBS_PATH -macro _FROM_NPM(TARBALL_URL, SKY_ID, INTEGRITY, INTEGRITY_ALGO, TARBALL_PATH) { - .CMD=${cwd:FROM_NPM_CWD} $YMAKE_PYTHON ${input:"build/scripts/fetch_from_npm.py"} ${hide;input:"build/scripts/fetch_from.py"} ${hide;input:"build/scripts/sky.py"} --tarball-url $TARBALL_URL --sky-id $SKY_ID --integrity $INTEGRITY --integrity-algorithm $INTEGRITY_ALGO --copy-to ${noauto;output:TARBALL_PATH} ${requirements;hide:"network:full"} ${hide;kv:"p TS_FNPM"} ${hide;kv:"pc magenta"} - # we want output to be available for other modules without affecting NPM_CONTRIBS - # we need to expose it (some details in https://st.yandex-team.ru/YMAKE-34) - _EXPOSE($TARBALL_PATH) -} - macro _TS_ADD_NODE_MODULES_FOR_BUILDER() { # Calculate inputs and outputs of node_modules, fill `_NODE_MODULES_INOUTS` variable _NODE_MODULES_CONFIGURE() diff --git a/build/conf/ts/ts.conf b/build/conf/ts/ts.conf index d793b6a7bd..0fb8cba30d 100644 --- a/build/conf/ts/ts.conf +++ b/build/conf/ts/ts.conf @@ -33,7 +33,6 @@ NOTS_TOOL_BASE_ARGS=\ --nodejs-bin $NODEJS_BIN \ --pm-script $PM_SCRIPT \ --pm-type $PM_TYPE \ - --contribs $NPM_CONTRIBS_PATH \ --trace $TS_TRACE \ --verbose $TS_LOG \ $_YATOOL_PREBUILDER_ARG |