aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorsnermolaev <snermolaev@yandex-team.com>2023-11-09 08:33:43 +0300
committersnermolaev <snermolaev@yandex-team.com>2023-11-09 09:18:58 +0300
commit49b036d38a50af696a69812c9ce5941a41054206 (patch)
treea131f3653d47ef3e82ca6081582cf60211ceafb2 /build
parent775f72c179df3640067807bd068a78ac5a61c865 (diff)
downloadydb-49b036d38a50af696a69812c9ce5941a41054206.tar.gz
move misc.conf to build/internal/conf
Diffstat (limited to 'build')
-rw-r--r--build/conf/misc.conf37
-rw-r--r--build/plugins/container_layers.py9
-rw-r--r--build/ymake.core.conf2
3 files changed, 0 insertions, 48 deletions
diff --git a/build/conf/misc.conf b/build/conf/misc.conf
deleted file mode 100644
index d640f6ff4c..0000000000
--- a/build/conf/misc.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-
-# tag:external-build
-CONTAINER_LAYER_CMD=$YMAKE_PYTHON ${input:"build/scripts/make_container_layer.py"} -s $SQUASHFS_RESOURCE_GLOBAL -o $TARGET $AUTO_INPUT ${cwd:ARCADIA_BUILD_ROOT} ${kv;hide:"p CL"} ${kv;hide:"pc blue"}
-CONTAINER_CMD=$YMAKE_PYTHON ${input:"build/scripts/make_container.py"} -s $SQUASHFS_RESOURCE_GLOBAL -o $TARGET ${rootrel:PEERS} ${cwd:ARCADIA_BUILD_ROOT} ${kv;hide:"p CN"} ${kv;hide:"pc blue"}
-
-# tag:external-build
-module CONTAINER_LAYER: _BARE_UNIT {
- .CMD=CONTAINER_LAYER_CMD
- PEERDIR(build/external_resources/squashfs_tools)
-
- MODULE_SUFFIX=.container_layer
- CHECK_ALLOWED_PATH()
- CHECK_DEPENDENT_DIRS(ALLOW_ONLY PEERDIRS base_layers build/external_resources/squashfs_tools build/platform/python/ymake_python3 junk)
-}
-
-# tag:external-build
-module CONTAINER: _BARE_UNIT {
- .NODE_TYPE=Bundle
- .PEERDIR_POLICY=as_build_from
- .FINAL_TARGET=yes
- .CMD=CONTAINER_CMD
- PEERDIR(build/external_resources/squashfs_tools)
- PEERDIR(devtools/contrib/cake/entry)
-}
-
-# tag:external-build
-CUSTOM_BUILD_LIBRARY_USE=
-CUSTOM_BUILD_LIBRARY_CMD=$GENERATE_MF && ${tool:"devtools/experimental/solar/outbuild/runner"} ${hide:PEERS} --script=${input:CUSTOM_SCRIPT} --output $TARGET --python=${tool:"contrib/tools/python3"} --isolator=${tool:"devtools/experimental/solar/outbuild/isolator"} $CUSTOM_BUILD_LIBRARY_USE
-
-# tag:external-build
-module CUSTOM_BUILD_LIBRARY: LIBRARY {
- .NODE_TYPE=Bundle
- .PEERDIR_POLICY=as_build_from
- .PROXY=yes
- .CMD=CUSTOM_BUILD_LIBRARY_CMD
- DISABLE(NEED_ADD_FAKE_SRC)
-}
diff --git a/build/plugins/container_layers.py b/build/plugins/container_layers.py
deleted file mode 100644
index 5fa1530474..0000000000
--- a/build/plugins/container_layers.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from _common import rootrel_arc_src
-
-
-def oncheck_allowed_path(unit, *args):
- module_path = rootrel_arc_src(unit.path(), unit)
- if not (module_path.startswith("junk") or module_path.startswith("base_layers")):
- unit.message(
- ["error", "Cannot create container layer in this directory. See https://st.yandex-team.ru/DTCC-1123"]
- )
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index b60d20cdd4..802a6e905d 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -5670,5 +5670,3 @@ macro CLANG_EMIT_AST_CXX_RUN_TOOL(SOURCES[], OPTS[], Tool, IN{input}[], IN_NOPAR
.CMD=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS ${CLANG_CPP_COMPILER_BIN} ${pre=-I:_C__INCLUDE} $CXXFLAGS $C_FLAGS_PLATFORM $LLVM_OPTS -emit-ast -c ${input:SOURCES} ${hide;tmp;noext;nopath:SOURCES.ast} $OPTS ${kv;hide:"p ST"} ${kv;hide:"pc light-green"} && ${cwd:CWD} ${env:ENV} ${tool:Tool} $Args ${input;hide:IN} ${input;context=TEXT;hide:IN_NOPARSE} ${input;hide:IN_DEPS} ${output_include;hide:OUTPUT_INCLUDES} $INDUCED_DEPS ${tool;hide:TOOL} ${output;hide:OUT} ${output;noauto;hide:OUT_NOAUTO} ${output;stdout:STDOUT} ${output;stdout;noauto:STDOUT_NOAUTO} ${kv;hide:"p PR"} ${kv;hide:"pc yellow"} ${kv;hide:"show_out"}
PEERDIR(build/platform/clang)
}
-
-@import "${CONF_ROOT}/conf/misc.conf"