Browse Source

move misc.conf to build/internal/conf

snermolaev 1 year ago
parent
commit
49b036d38a
3 changed files with 0 additions and 48 deletions
  1. 0 37
      build/conf/misc.conf
  2. 0 9
      build/plugins/container_layers.py
  3. 0 2
      build/ymake.core.conf

+ 0 - 37
build/conf/misc.conf

@@ -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)
-}

+ 0 - 9
build/plugins/container_layers.py

@@ -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"]
-        )

+ 0 - 2
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"