diff options
author | kikht <kikht@yandex-team.ru> | 2022-02-10 16:45:14 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:45:14 +0300 |
commit | 778e51ba091dc39e7b7fcab2b9cf4dbedfb6f2b5 (patch) | |
tree | be835aa92c6248212e705f25388ebafcf84bc7a1 /build/scripts | |
parent | 194cae0e8855b11be2005e1eff12c660c3ee9774 (diff) | |
download | ydb-778e51ba091dc39e7b7fcab2b9cf4dbedfb6f2b5.tar.gz |
Restoring authorship annotation for <kikht@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'build/scripts')
-rw-r--r-- | build/scripts/link_dyn_lib.py | 2 | ||||
-rw-r--r-- | build/scripts/run_msvc_wine.py | 44 |
2 files changed, 23 insertions, 23 deletions
diff --git a/build/scripts/link_dyn_lib.py b/build/scripts/link_dyn_lib.py index e1ebf5ede2..23487f5c1e 100644 --- a/build/scripts/link_dyn_lib.py +++ b/build/scripts/link_dyn_lib.py @@ -226,7 +226,7 @@ C++ geobase5::hardcoded_service """ filename = write_temp_file(export_file_content) args = ['-Wl,--version-script={}'.format(filename)] - assert fix_cmd('DARWIN', False, args) == [ + assert fix_cmd('DARWIN', False, args) == [ '-Wl,-exported_symbol,__ZN8geobase57details11lookup_impl*', '-Wl,-exported_symbol,__ZTIN8geobase57details11lookup_impl*', '-Wl,-exported_symbol,__ZTSN8geobase57details11lookup_impl*', diff --git a/build/scripts/run_msvc_wine.py b/build/scripts/run_msvc_wine.py index c4c2b002a3..439d1f8831 100644 --- a/build/scripts/run_msvc_wine.py +++ b/build/scripts/run_msvc_wine.py @@ -319,28 +319,28 @@ def colorize(out): def trim_path(path, winepath): - p1 = run_subprocess([winepath, '-w', path], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - p1_stdout, p1_stderr = p1.communicate() - win_path = p1_stdout.strip() - - if p1.returncode != 0 or not win_path: - # Fall back to only winepath -s - win_path = path - - p2 = run_subprocess([winepath, '-s', win_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - p2_stdout, p2_stderr = p2.communicate() - short_path = p2_stdout.strip() - - check_path = short_path - if check_path.startswith(('Z:', 'z:')): - 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)) - - return short_path - - + p1 = run_subprocess([winepath, '-w', path], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + p1_stdout, p1_stderr = p1.communicate() + win_path = p1_stdout.strip() + + if p1.returncode != 0 or not win_path: + # Fall back to only winepath -s + win_path = path + + p2 = run_subprocess([winepath, '-s', win_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + p2_stdout, p2_stderr = p2.communicate() + short_path = p2_stdout.strip() + + check_path = short_path + if check_path.startswith(('Z:', 'z:')): + 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)) + + return short_path + + def downsize_path(path, short_names): flag = '' if path.startswith('/Fo'): |