diff options
author | arcadia-devtools <[email protected]> | 2022-06-22 15:26:41 +0300 |
---|---|---|
committer | arcadia-devtools <[email protected]> | 2022-06-22 15:26:41 +0300 |
commit | 03ae68528a1fca061195bac52f0484f6f54b2582 (patch) | |
tree | 4093239f0b89511e8ff2b29fabc76300f5ecd10a /build/scripts/run_msvc_wine.py | |
parent | 250d29abfdc9a2526cac1e0b4b36c5b6e1d58e0c (diff) |
intermediate changes
ref:e5b94b91d513ee8cc2d1610107a4e0b462b9c9db
Diffstat (limited to 'build/scripts/run_msvc_wine.py')
-rw-r--r-- | build/scripts/run_msvc_wine.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/build/scripts/run_msvc_wine.py b/build/scripts/run_msvc_wine.py index cb94c19c5bd..9305db97ee4 100644 --- a/build/scripts/run_msvc_wine.py +++ b/build/scripts/run_msvc_wine.py @@ -226,7 +226,7 @@ def is_good_file(p): if os.path.getsize(p) < 300: return False - asm_pattern = re.compile('asm(\.\w+)?\.obj$') + asm_pattern = re.compile(r'asm(\.\w+)?\.obj$') if asm_pattern.search(p): pass elif p.endswith('.obj'): @@ -358,7 +358,10 @@ def trim_path(path, winepath): check_path = check_path[2:] if not check_path[1:].startswith((path[1:4], path[1:4].upper())): - raise Exception('Cannot trim path {}; 1st winepath exit code: {}, stdout:\n{}\n stderr:\n{}\n 2nd winepath exit code: {}, stdout:\n{}\n stderr:\n{}'.format(path, p1.returncode, p1_stdout, p1_stderr, p2.returncode, p2_stdout, p2_stderr)) + raise Exception( + 'Cannot trim path {}; 1st winepath exit code: {}, stdout:\n{}\n stderr:\n{}\n 2nd winepath exit code: {}, stdout:\n{}\n stderr:\n{}'.format( + path, p1.returncode, p1_stdout, p1_stderr, p2.returncode, p2_stdout, p2_stderr + )) return short_path @@ -381,6 +384,7 @@ def make_full_path_arg(arg, bld_root, short_root): return os.path.join(short_root, arg) return arg + def fix_path(p): topdirs = ['/%s/' % d for d in os.listdir('/')] def abs_path_start(path, pos): @@ -399,6 +403,7 @@ def fix_path(p): return '/Fo' + p[3:].replace('/', '\\') return p + def process_free_args(args, wine, bld_root, mode): whole_archive_prefix = '/WHOLEARCHIVE:' short_names = {} @@ -430,6 +435,7 @@ def process_free_args(args, wine, bld_root, mode): result.append(process_arg(arg)) return pwa.ProcessWholeArchiveOption('WINDOWS', wa_peers, wa_libs).construct_cmd(result) + def run_main(): parser = argparse.ArgumentParser() parser.add_argument('wine', action='store') |