diff options
| author | robot-srch-releaser <robot-srch-releaser@yandex-team.com> | 2023-09-12 21:05:25 +0300 |
|---|---|---|
| committer | robot-srch-releaser <robot-srch-releaser@yandex-team.com> | 2023-09-12 21:52:59 +0300 |
| commit | 780cb95adbe3fda525a69fa319bb44e52c5d89ad (patch) | |
| tree | 1c4400144ff0946658b2e80da75d416a7fe386f2 /build/ymake_conf.py | |
| parent | c8d096252888a36a59d8f192945c4a09e9c6cc88 (diff) | |
| download | ydb-780cb95adbe3fda525a69fa319bb44e52c5d89ad.tar.gz | |
Rollback: rXXXXXX
[diff-resolver:snermolaev]
Sandbox task: https://sandbox.yandex-team.ru/task/1925190358/view
Task author: robot-srch-releaser@
Commit was made by robot-srch-releaser@, but committer is deshevoy@
Description:
Note: mandatory check (NEED_CHECK) was skipped
Diffstat (limited to 'build/ymake_conf.py')
| -rwxr-xr-x | build/ymake_conf.py | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/build/ymake_conf.py b/build/ymake_conf.py index 8607b8365f..c4089df22c 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -25,14 +25,6 @@ def init_logger(verbose): logging.basicConfig(level=logging.DEBUG if verbose else logging.INFO) -def find_conf(conf_file): - script_dir = os.path.dirname(__file__) - full_path = os.path.join(script_dir, conf_file) - if os.path.exists(full_path): - return full_path - return None - - class DebugString(object): def __init__(self, get_string_func): self.get_string_func = get_string_func @@ -786,6 +778,17 @@ class YMake(object): def print_settings(self): emit_with_ignore_comment('ARCADIA_ROOT', self.arcadia.root) + @staticmethod + def _find_conf(conf_file): + script_dir = os.path.dirname(__file__) + full_path = os.path.join(script_dir, conf_file) + if os.path.exists(full_path): + return full_path + return None + + def _find_core_conf(self): + return self._find_conf('ymake.core.conf') + class System(object): def __init__(self, platform): @@ -2533,11 +2536,6 @@ def main(): build = Build(arcadia, options.build_type, options.toolchain_params, force_ignore_local_files=not options.local_distbuild) build.print_build() - _INTERNAL_CONF = 'internal/conf/internal.conf' - internal_conf_full_path = find_conf(_INTERNAL_CONF) - if internal_conf_full_path and not is_positive('DISABLE_YMAKE_CONF_CUSTOMIZATION'): - print('@import "${{CONF_ROOT}}/{}"'.format(_INTERNAL_CONF)) - emit_with_ignore_comment('CONF_SCRIPT_DEPENDS', __file__) |