diff options
author | wawaka <wawaka@yandex-team.ru> | 2022-02-10 16:47:48 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:48 +0300 |
commit | ed524783c88c81047033c5d6e5543db3a2251ad5 (patch) | |
tree | 5c595c0ac1b14fbb70e7e71df44b52e47f850387 /build | |
parent | 11ec0273ab97c87692cd0004865c7f24d14f9902 (diff) | |
download | ydb-ed524783c88c81047033c5d6e5543db3a2251ad5.tar.gz |
Restoring authorship annotation for <wawaka@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'build')
-rw-r--r-- | build/ya.conf.json | 44 | ||||
-rwxr-xr-x | build/ymake_conf.py | 26 |
2 files changed, 35 insertions, 35 deletions
diff --git a/build/ya.conf.json b/build/ya.conf.json index 5f7cc875d6..c8dcf864d8 100644 --- a/build/ya.conf.json +++ b/build/ya.conf.json @@ -3414,13 +3414,13 @@ } ] }, - "cmake": { - "tools": { + "cmake": { + "tools": { "cmake": { "bottle": "cmake", "executable": "cmake" } - }, + }, "platforms": [ { "host": { @@ -3441,7 +3441,7 @@ "default": true } ] - }, + }, "cling": { "tools": { "cling": { @@ -3464,13 +3464,13 @@ } ] }, - "ninja": { - "tools": { + "ninja": { + "tools": { "ninja": { "bottle": "ninja", "executable": "ninja" } - }, + }, "platforms": [ { "host": { @@ -3491,7 +3491,7 @@ "default": true } ] - }, + }, "valgrind": { "tools": { "valgrind": { @@ -6994,18 +6994,18 @@ ] } }, - "cmake": { - "formula": { + "cmake": { + "formula": { "sandbox_id": 105454515, - "match": "cmake" - }, - "executable": { + "match": "cmake" + }, + "executable": { "cmake": [ "bin", "cmake" ] - } - }, + } + }, "cling": { "formula": { "sandbox_id": 87671454, @@ -7017,13 +7017,13 @@ ] } }, - "ninja": { - "formula": { - "sandbox_id": 19094385, - "match": "ninja" - }, - "executable": "ninja" - }, + "ninja": { + "formula": { + "sandbox_id": 19094385, + "match": "ninja" + }, + "executable": "ninja" + }, "kwfeed": { "formula": { "sandbox_id": 36077631, diff --git a/build/ymake_conf.py b/build/ymake_conf.py index 30219eb85e..782dc17f1e 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -219,12 +219,12 @@ def which(prog): return None path = os.getenv('PATH', '') - + pathext = os.environ.get('PATHEXT') # На Windows %PATHEXT% указывает на список расширений, которые нужно проверять # при поиске команды в пути. Точное совпадение без расширения имеет приоритет. pathext = [''] if pathext is None else [''] + pathext.lower().split(os.pathsep) - + for dir_ in path.split(os.path.pathsep): for ext in pathext: p = os.path.join(dir_, prog + ext) @@ -399,15 +399,15 @@ def unique(it): class Options(object): def __init__(self, argv): - def parse_presets(raw_presets): - presets = {} + def parse_presets(raw_presets): + presets = {} for p in raw_presets: toks = p.split('=', 1) - name = toks[0] - value = toks[1] if len(toks) >= 2 else '' - presets[name] = value - return presets - + name = toks[0] + value = toks[1] if len(toks) >= 2 else '' + presets[name] = value + return presets + parser = optparse.OptionParser(add_help_option=False) opt_group = optparse.OptionGroup(parser, 'Conf script options') opt_group.add_option('--toolchain-params', dest='toolchain_params', action='store', help='Set toolchain params via file') @@ -446,7 +446,7 @@ class Profiler(object): Generic = 'generic' GProf = 'gprof' - + class Arcadia(object): def __init__(self, root): self.root = root @@ -969,7 +969,7 @@ class ToolchainOptions(object): logger.debug('c_compiler=%s', self.c_compiler) logger.debug('cxx_compiler=%s', self.cxx_compiler) - + self.compiler_platform_projects = self.target.find_in_dict(self.params.get('platform'), []) def version_at_least(self, *args): @@ -1011,8 +1011,8 @@ class ToolchainOptions(object): logger.debug('Unexpected values in environment: %s', self._env) raise ConfigureError('Internal error') return r - - + + class GnuToolchainOptions(ToolchainOptions): def __init__(self, build, detector): super(GnuToolchainOptions, self).__init__(build, detector) |