diff options
| author | mark@chromium.org <mark@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2014-06-23 18:18:44 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2014-06-23 18:18:44 +0000 |
| commit | 796b58cddb84928718b152698d045a96fd0c0ff1 (patch) | |
| tree | 9035ce5f3dcda434817af4c96cb6f992fc0f0491 | |
| parent | c5c01bbc72f44eecce85a2d135ade364e552d067 (diff) | |
| download | gyp-796b58cddb84928718b152698d045a96fd0c0ff1.tar.gz | |
Makes analyzer strip off a leading path separator
When running in chrome paths are absolute.
Also makes chrome build work with analyzer on windows. The specific define I
ran into was MSVS_OS_BITS, but I'm sure there are more.
BUG=chromium:383609
R=mark@chromium.org
Patch by Scott Violet <sky@chromium.org>
Review URL: https://codereview.chromium.org/347193005/
git-svn-id: http://gyp.googlecode.com/svn/trunk@1946 78cadc50-ecff-11dd-a971-7dbc132099af
| -rw-r--r-- | pylib/gyp/generator/analyzer.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pylib/gyp/generator/analyzer.py b/pylib/gyp/generator/analyzer.py index 007d17d1..77e46472 100644 --- a/pylib/gyp/generator/analyzer.py +++ b/pylib/gyp/generator/analyzer.py @@ -40,6 +40,8 @@ def __MakeRelativeTargetName(path): prune_path = os.getcwd() if path.startswith(prune_path): path = path[len(prune_path):] + if len(path) and path.startswith(os.sep): + path = path[len(os.sep):] # Gyp paths are always posix style. path = path.replace('\\', '/') if path.endswith('#target'): @@ -166,6 +168,15 @@ def CalculateVariables(default_variables, params): default_variables.setdefault('OS', 'mac') elif flavor == 'win': default_variables.setdefault('OS', 'win') + # Copy additional generator configuration data from VS, which is shared + # by the Windows Ninja generator. + import gyp.generator.msvs as msvs_generator + generator_additional_non_configuration_keys = getattr(msvs_generator, + 'generator_additional_non_configuration_keys', []) + generator_additional_path_sections = getattr(msvs_generator, + 'generator_additional_path_sections', []) + + gyp.msvs_emulation.CalculateCommonVariables(default_variables, params) else: operating_system = flavor if flavor == 'android': |