diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2018-06-08 09:17:54 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2018-06-15 07:02:58 +0000 |
| commit | 8cc9828a5ef78925f48d62a93d3e466435cb9cd6 (patch) | |
| tree | abe0c989609f9e7bc960305ea0e6b0f21589923d | |
| parent | b42eb6152276a3db22a2671e80b645f6a1575ad6 (diff) | |
Workaround long path issue on Windows
When doing a shadow build on Windows, python module name_style_converter
cannot be imported due to long relative path.
As a workaround, relocate the name_style_converter.py to make it
accessible with shorter relative paths.
Task-number: QTBUG-68464
Change-Id: If733a447f9cb3985a09e28410fa284240ee5e553
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | chromium/third_party/WebKit/Source/bindings/scripts/name_style_converter.py (renamed from chromium/third_party/blink/tools/blinkpy/common/name_style_converter.py) | 0 | ||||
| -rw-r--r-- | chromium/third_party/WebKit/Source/bindings/scripts/scripts.gni | 2 | ||||
| -rw-r--r-- | chromium/third_party/WebKit/Source/bindings/scripts/utilities.py | 4 | ||||
| -rw-r--r-- | chromium/third_party/WebKit/Source/build/scripts/json5_generator.py | 5 |
4 files changed, 4 insertions, 7 deletions
diff --git a/chromium/third_party/blink/tools/blinkpy/common/name_style_converter.py b/chromium/third_party/WebKit/Source/bindings/scripts/name_style_converter.py index a79b9903286..a79b9903286 100644 --- a/chromium/third_party/blink/tools/blinkpy/common/name_style_converter.py +++ b/chromium/third_party/WebKit/Source/bindings/scripts/name_style_converter.py diff --git a/chromium/third_party/WebKit/Source/bindings/scripts/scripts.gni b/chromium/third_party/WebKit/Source/bindings/scripts/scripts.gni index 1b91fdbc07c..e1047ec73e2 100644 --- a/chromium/third_party/WebKit/Source/bindings/scripts/scripts.gni +++ b/chromium/third_party/WebKit/Source/bindings/scripts/scripts.gni @@ -54,7 +54,7 @@ idl_compiler_files = "v8_types.py", "v8_union.py", "v8_utilities.py", - "//third_party/blink/tools/blinkpy/common/name_style_converter.py", + "name_style_converter.py", ], "abspath") diff --git a/chromium/third_party/WebKit/Source/bindings/scripts/utilities.py b/chromium/third_party/WebKit/Source/bindings/scripts/utilities.py index 830cc9b09b8..5b0e809619f 100644 --- a/chromium/third_party/WebKit/Source/bindings/scripts/utilities.py +++ b/chromium/third_party/WebKit/Source/bindings/scripts/utilities.py @@ -15,9 +15,7 @@ import string import subprocess import sys -sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', '..', '..', '..', - 'third_party', 'blink', 'tools')) -from blinkpy.common.name_style_converter import NameStyleConverter +from name_style_converter import NameStyleConverter KNOWN_COMPONENTS = frozenset(['core', 'modules']) diff --git a/chromium/third_party/WebKit/Source/build/scripts/json5_generator.py b/chromium/third_party/WebKit/Source/build/scripts/json5_generator.py index 638a1e7a477..f4cbbb6aa99 100644 --- a/chromium/third_party/WebKit/Source/build/scripts/json5_generator.py +++ b/chromium/third_party/WebKit/Source/build/scripts/json5_generator.py @@ -60,9 +60,8 @@ import os.path import re import sys -sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', '..', '..', '..', - 'third_party', 'blink', 'tools')) -from blinkpy.common.name_style_converter import NameStyleConverter +sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'bindings', 'scripts')) +from name_style_converter import NameStyleConverter def _json5_load(lines): |