diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2017-03-20 12:10:23 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-03 16:02:00 +0200 |
| commit | 4d02f8498dd266fbdb541b193411c484f94b8b10 (patch) | |
| tree | 8c98b2e3bb59ee56bfc7b571a99009bdeb2afc70 | |
| parent | 1f7a8d6b008d3d83ae194bbdb1c339e0af625509 (diff) | |
| download | qtwebengine-chromium-4d02f8498dd266fbdb541b193411c484f94b8b10.tar.gz | |
Windows: Fix file path too long problems in grit.py
There have been issues with too long file paths in grit.py
when doing shadow builds on Windows.
Change-Id: Ia0ff5e214bcd079853db32432b58da046698e73e
Task-number: QTBUG-59544
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rwxr-xr-x | chromium/tools/grit/grit/util.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chromium/tools/grit/grit/util.py b/chromium/tools/grit/grit/util.py index 93dce261007..95f3a390f28 100755 --- a/chromium/tools/grit/grit/util.py +++ b/chromium/tools/grit/grit/util.py @@ -29,6 +29,8 @@ BINARY, RAW_TEXT = range(2) # Unique constants representing data pack encodings. _, UTF8, UTF16 = range(3) +def abs(filename): + return os.path.normpath(os.path.join(os.getcwd(), filename)) def Encode(message, encoding): '''Returns a byte stream that represents |message| in the given |encoding|.''' @@ -204,7 +206,7 @@ def ReadFile(filename, encoding): conversion but without decoding to Unicode. ''' mode = 'rb' if encoding == BINARY else 'rU' - with open(filename, mode) as f: + with open(abs(filename), mode) as f: data = f.read() if encoding not in (BINARY, RAW_TEXT): data = data.decode(encoding) |