diff options
author | workfork <workfork@yandex-team.ru> | 2022-02-10 16:46:43 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:46:43 +0300 |
commit | c3745173272d1cf5b0642debb40d019e7ae71094 (patch) | |
tree | daee509c9d920ccdc727dbf1254b2183bf5f64aa /build/scripts | |
parent | 656921707c02b816d730f31c1fdc1d615adbfe00 (diff) | |
download | ydb-c3745173272d1cf5b0642debb40d019e7ae71094.tar.gz |
Restoring authorship annotation for <workfork@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'build/scripts')
-rw-r--r-- | build/scripts/build_dll_and_java.py | 2 | ||||
-rw-r--r-- | build/scripts/clang_wrapper.py | 78 | ||||
-rw-r--r-- | build/scripts/collect_java_srcs.py | 2 | ||||
-rwxr-xr-x | build/scripts/fetch_from_sandbox.py | 2 | ||||
-rw-r--r-- | build/scripts/fs_tools.py | 6 | ||||
-rw-r--r-- | build/scripts/generate_mf.py | 96 | ||||
-rw-r--r-- | build/scripts/link_exe.py | 12 | ||||
-rw-r--r-- | build/scripts/llvm_opt_wrapper.py | 6 | ||||
-rw-r--r-- | build/scripts/tar_directory.py | 48 | ||||
-rw-r--r-- | build/scripts/ya.make | 2 |
10 files changed, 127 insertions, 127 deletions
diff --git a/build/scripts/build_dll_and_java.py b/build/scripts/build_dll_and_java.py index b9d8aff4df..f857875f2a 100644 --- a/build/scripts/build_dll_and_java.py +++ b/build/scripts/build_dll_and_java.py @@ -36,7 +36,7 @@ def just_do_it(argv): inp = os.path.join(build_root, inp) if sys.platform == 'win32': inp = inp.replace('\\', '/') - dll_cmd.remove(inp) + dll_cmd.remove(inp) java_cmd.insert(java_cmd.index(dll_out), java_out) java_cmd.remove(dll_out) subprocess.check_call(java_cmd) diff --git a/build/scripts/clang_wrapper.py b/build/scripts/clang_wrapper.py index af3869f789..844ae856d6 100644 --- a/build/scripts/clang_wrapper.py +++ b/build/scripts/clang_wrapper.py @@ -1,4 +1,4 @@ -import subprocess +import subprocess import sys @@ -6,48 +6,48 @@ def fix(s): # disable dbg DEVTOOLS-2744 if s == '-g': return None - if s == '/Z7' or s == '/Od' or s == '/Ob0' or s == '/D_DEBUG': - return None - - # disable sanitizers for generated code - if s.startswith('-fsanitize') or s == '-Dmemory_sanitizer_enabled' or s.startswith('-fsanitize-blacklist'): - return None - - # strip gcc toolchain flags (appear when crosscompiling) - if s.startswith('-fabi-version'): - return None - + if s == '/Z7' or s == '/Od' or s == '/Ob0' or s == '/D_DEBUG': + return None + + # disable sanitizers for generated code + if s.startswith('-fsanitize') or s == '-Dmemory_sanitizer_enabled' or s.startswith('-fsanitize-blacklist'): + return None + + # strip gcc toolchain flags (appear when crosscompiling) + if s.startswith('-fabi-version'): + return None + # remove arguments unknown to clang-cl if s == '-fcase-insensitive-paths': # or s == '-fno-lto': # DEVTOOLSSUPPORT-3966 return None - # Paths under .ya/tools/v3/.../msvc/include are divided with '\' - return s.replace('\\', '/') - - -def fix_path(p): - try: - i = p.rfind('/bin/clang') - p = p[:i] + '/bin/clang-cl' - except ValueError: - pass - return p + # Paths under .ya/tools/v3/.../msvc/include are divided with '\' + return s.replace('\\', '/') +def fix_path(p): + try: + i = p.rfind('/bin/clang') + p = p[:i] + '/bin/clang-cl' + except ValueError: + pass + return p + + if __name__ == '__main__': - is_on_win = sys.argv[1] == 'yes' - path = sys.argv[2] - args = filter(None, [fix(s) for s in sys.argv[3:]]) - if is_on_win: - path = fix_path(path) - try: - i = args.index('-emit-llvm') - args[i:i+1] = ['-Xclang', '-emit-llvm'] - except ValueError: - pass - args.append('-fms-compatibility-version=19') - - cmd = [path] + args - - rc = subprocess.call(cmd, shell=False, stderr=sys.stderr, stdout=sys.stdout) - sys.exit(rc) + is_on_win = sys.argv[1] == 'yes' + path = sys.argv[2] + args = filter(None, [fix(s) for s in sys.argv[3:]]) + if is_on_win: + path = fix_path(path) + try: + i = args.index('-emit-llvm') + args[i:i+1] = ['-Xclang', '-emit-llvm'] + except ValueError: + pass + args.append('-fms-compatibility-version=19') + + cmd = [path] + args + + rc = subprocess.call(cmd, shell=False, stderr=sys.stderr, stdout=sys.stdout) + sys.exit(rc) diff --git a/build/scripts/collect_java_srcs.py b/build/scripts/collect_java_srcs.py index 170002520a..5e9adb136d 100644 --- a/build/scripts/collect_java_srcs.py +++ b/build/scripts/collect_java_srcs.py @@ -44,7 +44,7 @@ if __name__ == '__main__': tf.extractall(dst) elif src.endswith('-sources.jar'): - with zipfile.ZipFile(src) as zf: + with zipfile.ZipFile(src) as zf: zf.extractall(dst) else: diff --git a/build/scripts/fetch_from_sandbox.py b/build/scripts/fetch_from_sandbox.py index a99542e174..ab35f9e719 100755 --- a/build/scripts/fetch_from_sandbox.py +++ b/build/scripts/fetch_from_sandbox.py @@ -24,7 +24,7 @@ def parse_args(): parser.add_argument('--resource-id', type=int, required=True) parser.add_argument('--custom-fetcher') parser.add_argument('--resource-file') - return parser.parse_args() + return parser.parse_args() class ResourceInfoError(Exception): diff --git a/build/scripts/fs_tools.py b/build/scripts/fs_tools.py index dec4c349c8..beb916831e 100644 --- a/build/scripts/fs_tools.py +++ b/build/scripts/fs_tools.py @@ -29,9 +29,9 @@ if __name__ == '__main__': if mode == 'copy': shutil.copy(args[0], args[1]) - elif mode == 'copy_tree_no_link': - dst = args[1] - shutil.copytree(args[0], dst, ignore=lambda dirname, names: [n for n in names if os.path.islink(os.path.join(dirname, n))]) + elif mode == 'copy_tree_no_link': + dst = args[1] + shutil.copytree(args[0], dst, ignore=lambda dirname, names: [n for n in names if os.path.islink(os.path.join(dirname, n))]) elif mode == 'copy_files': src = args[0] dst = args[1] diff --git a/build/scripts/generate_mf.py b/build/scripts/generate_mf.py index a44a969980..76997020cc 100644 --- a/build/scripts/generate_mf.py +++ b/build/scripts/generate_mf.py @@ -1,20 +1,20 @@ -import json -import logging -import optparse -import os -import sys +import json +import logging +import optparse +import os +import sys import io - + import process_command_files as pcf - -class BadMfError(Exception): - pass - - -class GplNotAllowed(Exception): - pass - - + +class BadMfError(Exception): + pass + + +class GplNotAllowed(Exception): + pass + + def process_quotes(s): for quote_char in '\'"': if s.startswith(quote_char) and s.endswith(quote_char): @@ -22,40 +22,40 @@ def process_quotes(s): return s -def parse_args(): +def parse_args(): args = pcf.get_args(sys.argv[1:]) lics, peers, free_args, credits = [], [], [], [] - current_list = free_args - for a in args: - if a == '-Ya,lics': - current_list = lics - elif a == '-Ya,peers': - current_list = peers + current_list = free_args + for a in args: + if a == '-Ya,lics': + current_list = lics + elif a == '-Ya,peers': + current_list = peers elif a == '-Ya,credits': current_list = credits - elif a and a.startswith('-'): - current_list = free_args - current_list.append(a) - else: - current_list.append(a) - - parser = optparse.OptionParser() - parser.add_option('--build-root') - parser.add_option('--module-name') - parser.add_option('-o', '--output') + elif a and a.startswith('-'): + current_list = free_args + current_list.append(a) + else: + current_list.append(a) + + parser = optparse.OptionParser() + parser.add_option('--build-root') + parser.add_option('--module-name') + parser.add_option('-o', '--output') parser.add_option('-c', '--credits-output') - parser.add_option('-t', '--type') - opts, _ = parser.parse_args(free_args) + parser.add_option('-t', '--type') + opts, _ = parser.parse_args(free_args) return lics, peers, credits, opts, - - + + def generate_header(meta): return '-' * 20 + meta.get('path', 'Unknown module') + '-' * 20 -def generate_mf(): +def generate_mf(): lics, peers, credits, options = parse_args() - + meta = { 'module_name': options.module_name, 'path': os.path.dirname(options.output), @@ -63,16 +63,16 @@ def generate_mf(): 'dependencies': [], 'license_texts': '' } - - build_root = options.build_root - file_name = os.path.join(build_root, options.output) - + + build_root = options.build_root + file_name = os.path.join(build_root, options.output) + if options.type != 'LIBRARY': for rel_filename in peers: with open(os.path.join(build_root, rel_filename + '.mf')) as peer_file: peer_meta = json.load(peer_file) meta['dependencies'].append(peer_meta) - + if credits: union_texts = [] for texts_file in credits: @@ -101,11 +101,11 @@ def generate_mf(): data = data.decode('utf-8') f.write(data) - with open(file_name, 'w') as mf_file: - json.dump(meta, mf_file, indent=4) - - -if __name__ == '__main__': + with open(file_name, 'w') as mf_file: + json.dump(meta, mf_file, indent=4) + + +if __name__ == '__main__': try: generate_mf() except Exception as e: diff --git a/build/scripts/link_exe.py b/build/scripts/link_exe.py index f469e3b442..387f3153e7 100644 --- a/build/scripts/link_exe.py +++ b/build/scripts/link_exe.py @@ -1,9 +1,9 @@ -import sys -import subprocess +import sys +import subprocess import optparse - + from process_whole_archive_option import ProcessWholeArchiveOption - + def get_leaks_suppressions(cmd): supp, newcmd = [], [] @@ -57,7 +57,7 @@ def parse_args(): return parser.parse_args() -if __name__ == '__main__': +if __name__ == '__main__': opts, args = parse_args() cmd = fix_cmd(opts.musl, args) @@ -79,4 +79,4 @@ if __name__ == '__main__': stdout = sys.stdout rc = subprocess.call(cmd, shell=False, stderr=sys.stderr, stdout=stdout) - sys.exit(rc) + sys.exit(rc) diff --git a/build/scripts/llvm_opt_wrapper.py b/build/scripts/llvm_opt_wrapper.py index 38ca3004af..73f2e1adad 100644 --- a/build/scripts/llvm_opt_wrapper.py +++ b/build/scripts/llvm_opt_wrapper.py @@ -1,4 +1,4 @@ -import subprocess +import subprocess import sys @@ -14,5 +14,5 @@ if __name__ == '__main__': path = sys.argv[1] args = [fix(s) for s in [path] + sys.argv[2:]] - rc = subprocess.call(args, shell=False, stderr=sys.stderr, stdout=sys.stdout) - sys.exit(rc) + rc = subprocess.call(args, shell=False, stderr=sys.stderr, stdout=sys.stdout) + sys.exit(rc) diff --git a/build/scripts/tar_directory.py b/build/scripts/tar_directory.py index a91889fa22..51ff079f5a 100644 --- a/build/scripts/tar_directory.py +++ b/build/scripts/tar_directory.py @@ -9,35 +9,35 @@ def is_exe(fpath): def main(args): if len(args) < 2 or len(args) > 3: - raise Exception("Illegal usage: `tar_directory.py archive.tar directory [skip prefix]` or `tar_directory.py archive.tar output_directory --extract`") - tar, directory, prefix, extract = args[0], args[1], None, False + raise Exception("Illegal usage: `tar_directory.py archive.tar directory [skip prefix]` or `tar_directory.py archive.tar output_directory --extract`") + tar, directory, prefix, extract = args[0], args[1], None, False if len(args) == 3: - if args[2] == '--extract': - extract = True - else: - prefix = args[2] + if args[2] == '--extract': + extract = True + else: + prefix = args[2] for tar_exe in ('/usr/bin/tar', '/bin/tar'): - if not is_exe(tar_exe): - continue - if extract: - dest = os.path.abspath(directory) - if not os.path.exists(dest): - os.makedirs(dest) - os.execv(tar_exe, [tar_exe, '-xf', tar, '-C', dest]) - else: - source = os.path.relpath(directory, prefix) if prefix else directory + if not is_exe(tar_exe): + continue + if extract: + dest = os.path.abspath(directory) + if not os.path.exists(dest): + os.makedirs(dest) + os.execv(tar_exe, [tar_exe, '-xf', tar, '-C', dest]) + else: + source = os.path.relpath(directory, prefix) if prefix else directory os.execv(tar_exe, [tar_exe, '-cf', tar] + (['-C', prefix] if prefix else []) + [source]) - break + break else: - if extract: - dest = os.path.abspath(directory) - if not os.path.exists(dest): - os.makedirs(dest) - with tarfile.open(tar, 'r') as tar_file: - tar_file.extractall(dest) - else: + if extract: + dest = os.path.abspath(directory) + if not os.path.exists(dest): + os.makedirs(dest) + with tarfile.open(tar, 'r') as tar_file: + tar_file.extractall(dest) + else: source = directory - with tarfile.open(tar, 'w') as out: + with tarfile.open(tar, 'w') as out: out.add(os.path.abspath(source), arcname=os.path.relpath(source, prefix) if prefix else source) diff --git a/build/scripts/ya.make b/build/scripts/ya.make index 710165e40d..7454dc3e2a 100644 --- a/build/scripts/ya.make +++ b/build/scripts/ya.make @@ -1,4 +1,4 @@ -OWNER(g:ymake) +OWNER(g:ymake) PY2TEST() |