diff options
| author | stanly <stanly@yandex-team.ru> | 2022-02-10 16:46:49 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:46:49 +0300 |
| commit | 6170310e8721e225f64ddabf7a7358253d7a1249 (patch) | |
| tree | 49e222ea1c5804306084bb3ae065bb702625360f /build | |
| parent | cde218e65dfef5ce03a48d641fd8f7913cf17b2d (diff) | |
| download | ydb-6170310e8721e225f64ddabf7a7358253d7a1249.tar.gz | |
Restoring authorship annotation for <stanly@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'build')
| -rw-r--r-- | build/ya.conf.json | 26 | ||||
| -rwxr-xr-x | build/ymake_conf.py | 18 |
2 files changed, 22 insertions, 22 deletions
diff --git a/build/ya.conf.json b/build/ya.conf.json index 912694e0ea..5f7cc875d6 100644 --- a/build/ya.conf.json +++ b/build/ya.conf.json @@ -1109,14 +1109,14 @@ } ] }, - "arc": { - "tools": { + "arc": { + "tools": { "arc": { "bottle": "arc", "executable": "arc" } - }, - "platforms": [ + }, + "platforms": [ { "host": { "os": "LINUX" @@ -1135,8 +1135,8 @@ }, "default": true } - ] - }, + ] + }, "yo": { "tools": { "yo": { @@ -5795,19 +5795,19 @@ ] } }, - "arc": { - "formula": { + "arc": { + "formula": { "sandbox_id": [ 1205199935 ], - "match": "arc" - }, - "executable": { + "match": "arc" + }, + "executable": { "arc": [ "arc" ] - } - }, + } + }, "godoc": { "formula": { "sandbox_id": 511821444, diff --git a/build/ymake_conf.py b/build/ymake_conf.py index 0730447c48..30219eb85e 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -646,7 +646,7 @@ class Build(object): else: def find_svn(): for i in range(0, 3): - for path in (['.svn', 'wc.db'], ['.svn', 'entries'], ['.git', 'logs', 'HEAD']): + for path in (['.svn', 'wc.db'], ['.svn', 'entries'], ['.git', 'logs', 'HEAD']): path_parts = [os.pardir] * i + path full_path = os.path.join(self.arcadia.root, *path_parts) # HACK(somov): No "normpath" here. ymake fails with the "source file name is outside the build tree" error @@ -654,14 +654,14 @@ class Build(object): if os.path.exists(full_path): out_path = os.path.join('${ARCADIA_ROOT}', *path_parts) return '${input;hide:"%s"}' % out_path - - # Special processing for arc repository since .arc may be a symlink. - dot_arc = os.path.realpath(os.path.join(self.arcadia.root, '.arc')) - full_path = os.path.join(dot_arc, 'TREE') - if os.path.exists(full_path): - out_path = os.path.join('${ARCADIA_ROOT}', os.path.relpath(full_path, self.arcadia.root)) - return '${input;hide:"%s"}' % out_path - + + # Special processing for arc repository since .arc may be a symlink. + dot_arc = os.path.realpath(os.path.join(self.arcadia.root, '.arc')) + full_path = os.path.join(dot_arc, 'TREE') + if os.path.exists(full_path): + out_path = os.path.join('${ARCADIA_ROOT}', os.path.relpath(full_path, self.arcadia.root)) + return '${input;hide:"%s"}' % out_path + return '' emit_with_ignore_comment('SVN_DEPENDS', find_svn()) |