diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2015-06-29 11:51:02 +0200 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-06-30 13:38:26 +0200 |
commit | 99cbbc0a13fdd554bfc74e29de66fbefc00cfd2a (patch) | |
tree | ab6c63a8e697f90c691153da0f5d54336a04ee94 /tools/gyp/pylib/gyp/generator/dump_dependency_json.py | |
parent | 05a73c0f259fd903622445b07bf9ce3f0d7a73a3 (diff) | |
download | android-node-v8-99cbbc0a13fdd554bfc74e29de66fbefc00cfd2a.tar.gz android-node-v8-99cbbc0a13fdd554bfc74e29de66fbefc00cfd2a.tar.bz2 android-node-v8-99cbbc0a13fdd554bfc74e29de66fbefc00cfd2a.zip |
tools: update gyp to 25ed9ac
Includes improved support for VS 2015[0] and makes it possible to build
with ninja again[1].
[0] https://codereview.chromium.org/1112753003
[1] https://codereview.chromium.org/1209553002
Fixes: https://github.com/nodejs/io.js/pull/2065
PR-URL: https://github.com/nodejs/io.js/pull/2074
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Diffstat (limited to 'tools/gyp/pylib/gyp/generator/dump_dependency_json.py')
-rw-r--r-- | tools/gyp/pylib/gyp/generator/dump_dependency_json.py | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/tools/gyp/pylib/gyp/generator/dump_dependency_json.py b/tools/gyp/pylib/gyp/generator/dump_dependency_json.py index 927ba6ebad..160eafe2ef 100644 --- a/tools/gyp/pylib/gyp/generator/dump_dependency_json.py +++ b/tools/gyp/pylib/gyp/generator/dump_dependency_json.py @@ -14,6 +14,9 @@ generator_supports_multiple_toolsets = True generator_wants_static_library_dependencies_adjusted = False +generator_filelist_paths = { +} + generator_default_variables = { } for dirname in ['INTERMEDIATE_DIR', 'SHARED_INTERMEDIATE_DIR', 'PRODUCT_DIR', @@ -56,6 +59,17 @@ def CalculateGeneratorInputInfo(params): global generator_wants_static_library_dependencies_adjusted generator_wants_static_library_dependencies_adjusted = True + toplevel = params['options'].toplevel_dir + generator_dir = os.path.relpath(params['options'].generator_output or '.') + # output_dir: relative path from generator_dir to the build directory. + output_dir = generator_flags.get('output_dir', 'out') + qualified_out_dir = os.path.normpath(os.path.join( + toplevel, generator_dir, output_dir, 'gypfiles')) + global generator_filelist_paths + generator_filelist_paths = { + 'toplevel': toplevel, + 'qualified_out_dir': qualified_out_dir, + } def GenerateOutput(target_list, target_dicts, data, params): # Map of target -> list of targets it depends on. @@ -74,7 +88,11 @@ def GenerateOutput(target_list, target_dicts, data, params): edges[target].append(dep) targets_to_visit.append(dep) - filename = 'dump.json' + try: + filepath = params['generator_flags']['output_dir'] + except KeyError: + filepath = '.' + filename = os.path.join(filepath, 'dump.json') f = open(filename, 'w') json.dump(edges, f) f.close() |