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

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

Issue 10378042: Correct the order in which OutputDirectory and IntermediateDirectory are defined. (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: Created 8 years, 7 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
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 # Notes: 5 # Notes:
6 # 6 #
7 # This is all roughly based on the Makefile system used by the Linux 7 # This is all roughly based on the Makefile system used by the Linux
8 # kernel, but is a non-recursive make -- we put the entire dependency 8 # kernel, but is a non-recursive make -- we put the entire dependency
9 # graph in front of make and let it figure it out. 9 # graph in front of make and let it figure it out.
10 # 10 #
(...skipping 1778 matching lines...) Expand 10 before | Expand all | Expand 10 after
1789 # TODO(thakis): It would be nice to have some general mechanism instead. 1789 # TODO(thakis): It would be nice to have some general mechanism instead.
1790 strip_save_file = self.xcode_settings.GetPerTargetSetting( 1790 strip_save_file = self.xcode_settings.GetPerTargetSetting(
1791 'CHROMIUM_STRIP_SAVE_FILE', '') 1791 'CHROMIUM_STRIP_SAVE_FILE', '')
1792 # Even if strip_save_file is empty, explicitly write it. Else a postbuild 1792 # Even if strip_save_file is empty, explicitly write it. Else a postbuild
1793 # might pick up an export from an earlier target. 1793 # might pick up an export from an earlier target.
1794 return self.GetXcodeEnv( 1794 return self.GetXcodeEnv(
1795 additional_settings={'CHROMIUM_STRIP_SAVE_FILE': strip_save_file}) 1795 additional_settings={'CHROMIUM_STRIP_SAVE_FILE': strip_save_file})
1796 1796
1797 1797
1798 def WriteXcodeEnv(self, target, env): 1798 def WriteXcodeEnv(self, target, env):
1799 for k in gyp.xcode_emulation.TopologicallySortedEnvVarKeys(env): 1799 for k in reversed(gyp.xcode_emulation.TopologicallySortedEnvVarKeys(env)):
Nico 2012/05/11 14:53:44 When refactoring a function (gyp.xcode_emu.TopSort
bradn 2012/05/11 18:57:23 So I had been "correcting" what I had perceived as
1800 # For 1800 # For
1801 # foo := a\ b 1801 # foo := a\ b
1802 # the escaped space does the right thing. For 1802 # the escaped space does the right thing. For
1803 # export foo := a\ b 1803 # export foo := a\ b
1804 # it does not -- the backslash is written to the env as literal character. 1804 # it does not -- the backslash is written to the env as literal character.
1805 # So don't escape spaces in |env[k]|. 1805 # So don't escape spaces in |env[k]|.
1806 self.WriteLn('%s: export %s := %s' % (QuoteSpaces(target), k, env[k])) 1806 self.WriteLn('%s: export %s := %s' % (QuoteSpaces(target), k, env[k]))
1807 1807
1808 1808
1809 def Objectify(self, path): 1809 def Objectify(self, path):
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
2128 root_makefile.write(" include " + include_file + "\n") 2128 root_makefile.write(" include " + include_file + "\n")
2129 root_makefile.write("endif\n") 2129 root_makefile.write("endif\n")
2130 root_makefile.write('\n') 2130 root_makefile.write('\n')
2131 2131
2132 if generator_flags.get('auto_regeneration', True): 2132 if generator_flags.get('auto_regeneration', True):
2133 WriteAutoRegenerationRule(params, root_makefile, makefile_name, build_files) 2133 WriteAutoRegenerationRule(params, root_makefile, makefile_name, build_files)
2134 2134
2135 root_makefile.write(SHARED_FOOTER) 2135 root_makefile.write(SHARED_FOOTER)
2136 2136
2137 root_makefile.close() 2137 root_makefile.close()
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698