Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: pylib/gyp/generator/ninja.py

Issue 10448103: ninja windows: include gyp dir in rc build include dirs (Closed) Base URL: https://gyp.googlecode.com/svn/trunk
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | pylib/gyp/msvs_emulation.py » ('j') | test/win/rc-build/hello.gyp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 Google Inc. All rights reserved. 1 # Copyright (c) 2012 Google Inc. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import copy 5 import copy
6 import gyp 6 import gyp
7 import gyp.common 7 import gyp.common
8 import gyp.msvs_emulation 8 import gyp.msvs_emulation
9 import gyp.MSVSVersion 9 import gyp.MSVSVersion
10 import gyp.system_test 10 import gyp.system_test
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
678 cflags_c = config.get('cflags_c', []) 678 cflags_c = config.get('cflags_c', [])
679 cflags_cc = config.get('cflags_cc', []) 679 cflags_cc = config.get('cflags_cc', [])
680 680
681 defines = config.get('defines', []) + extra_defines 681 defines = config.get('defines', []) + extra_defines
682 self.WriteVariableList('defines', 682 self.WriteVariableList('defines',
683 [QuoteShellArgument(ninja_syntax.escape('-D' + d), self.flavor) 683 [QuoteShellArgument(ninja_syntax.escape('-D' + d), self.flavor)
684 for d in defines]) 684 for d in defines])
685 if self.flavor == 'win': 685 if self.flavor == 'win':
686 self.WriteVariableList('rcflags', 686 self.WriteVariableList('rcflags',
687 [QuoteShellArgument(self.ExpandSpecial(f), self.flavor) 687 [QuoteShellArgument(self.ExpandSpecial(f), self.flavor)
688 for f in self.msvs_settings.GetRcflags(config_name)]) 688 for f in self.msvs_settings.GetRcflags(config_name,
689 self.GypPathToNinja)])
689 690
690 include_dirs = config.get('include_dirs', []) 691 include_dirs = config.get('include_dirs', [])
691 if self.flavor == 'win': 692 if self.flavor == 'win':
692 include_dirs = self.msvs_settings.AdjustIncludeDirs(include_dirs, 693 include_dirs = self.msvs_settings.AdjustIncludeDirs(include_dirs,
693 config_name) 694 config_name)
694 self.WriteVariableList('includes', 695 self.WriteVariableList('includes',
695 [QuoteShellArgument('-I' + self.GypPathToNinja(i), self.flavor) 696 [QuoteShellArgument('-I' + self.GypPathToNinja(i), self.flavor)
696 for i in include_dirs]) 697 for i in include_dirs])
697 698
698 pch_commands = precompiled_header.GetGchBuildCommands() 699 pch_commands = precompiled_header.GetGchBuildCommands()
(...skipping 790 matching lines...) Expand 10 before | Expand all | Expand 10 after
1489 1490
1490 user_config = params.get('generator_flags', {}).get('config', None) 1491 user_config = params.get('generator_flags', {}).get('config', None)
1491 if user_config: 1492 if user_config:
1492 GenerateOutputForConfig(target_list, target_dicts, data, params, 1493 GenerateOutputForConfig(target_list, target_dicts, data, params,
1493 user_config) 1494 user_config)
1494 else: 1495 else:
1495 config_names = target_dicts[target_list[0]]['configurations'].keys() 1496 config_names = target_dicts[target_list[0]]['configurations'].keys()
1496 for config_name in config_names: 1497 for config_name in config_names:
1497 GenerateOutputForConfig(target_list, target_dicts, data, params, 1498 GenerateOutputForConfig(target_list, target_dicts, data, params,
1498 config_name) 1499 config_name)
OLDNEW
« no previous file with comments | « no previous file | pylib/gyp/msvs_emulation.py » ('j') | test/win/rc-build/hello.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698