Side by Side Diff: msvs_gyp_wrapper.py
Issue 29555620:
Issue 5698 - Update V8 to 6.1.534.41 (Closed)
Base URL: https://github.com/adblockplus/libadblockplus.git
Patch Set: fix and rebase
Created Sept. 28, 2017, 7:21 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« make_gyp_wrapper.py ('K')
|
« make_gyp_wrapper.py ('k')
|
no next file »
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # coding: utf-8 | 2 # coding: utf-8 |
| 3 | 3 |
| 4 import os | 4 import os |
| 5 import sys | 5 import sys |
| 6 | 6 |
| 7 base_dir = os.path.abspath(os.path.dirname(__file__)) | 7 base_dir = os.path.abspath(os.path.dirname(__file__)) |
| 8 sys.path.append(os.path.join(base_dir, 'third_party', 'gyp', 'pylib')) | 8 sys.path.append(os.path.join(base_dir, 'third_party', 'gyp', 'pylib')) |
| 9 import gyp | 9 import gyp |
| 10 import gyp.generator.msvs | 10 import gyp.generator.msvs |
| 11 | 11 |
| 12 orig_fix_path = gyp.generator.msvs._FixPath | 12 orig_fix_path = gyp.generator.msvs._FixPath |
| 13 | 13 |
| 14 # gyp is trying to expand parameters as paths and the fix prevents gyp from | 14 # gyp is trying to expand parameters as paths and the fix prevents gyp from |
| 15 # doing it for particular parameters for particular tools. | 15 # doing it for particular parameters for particular tools. |
| 16 # Don't touch following js2c and build-v8 parameters | 16 # Don't touch following js2c and build-v8 parameters |
| 17 dont_expand = [ | 17 dont_expand = [ |
| 18 # js2c | 18 # js2c |
| 19 'CORE', 'EXPERIMENTAL', 'off', 'EXTRAS', 'EXPERIMENTAL_EXTRAS', | 19 'CORE', 'EXTRAS', 'EXPERIMENTAL_EXTRAS', |
| 20 # build-v8 | 20 # build-v8 |
| 21 'ia32', 'x64' | 21 'ia32', 'x64' |
| 22 ] | 22 ] |
| 23 | 23 |
| 24 def _FixPath(path): | 24 def _FixPath(path): |
| 25 if path in dont_expand: | 25 if path in dont_expand: |
| 26 return path | 26 return path |
| 27 return orig_fix_path(path) | 27 return orig_fix_path(path) |
| 28 gyp.generator.msvs._FixPath = _FixPath | 28 gyp.generator.msvs._FixPath = _FixPath |
| 29 | 29 |
| 30 if __name__ == '__main__': | 30 if __name__ == '__main__': |
| 31 gyp.main(sys.argv[1:]) | 31 gyp.main(sys.argv[1:]) |
| OLD | NEW |
« make_gyp_wrapper.py ('K')
|
« make_gyp_wrapper.py ('k')
|
no next file »
|
no next file with comments »
