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

Side by Side Diff: site_scons/site_tools/chromium_builders.py

Issue 17327: Back out r7826, which broke the Linux build (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 years, 11 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
« no previous file with comments | « site_scons/site_tools/_Node_MSVS.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2006-2008 The Chromium Authors. 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 """ 5 """
6 Tool module for adding, to a construction environment, Chromium-specific 6 Tool module for adding, to a construction environment, Chromium-specific
7 wrappers around Hammer builders. This gives us a central place for any 7 wrappers around Hammer builders. This gives us a central place for any
8 customization we need to make to the different things we build. 8 customization we need to make to the different things we build.
9 """ 9 """
10 10
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 except ValueError: 46 except ValueError:
47 pass 47 pass
48 else: 48 else:
49 top[i] = new 49 top[i] = new
50 50
51 import __builtin__ 51 import __builtin__
52 __builtin__.ChromeFileList = ChromeFileList 52 __builtin__.ChromeFileList = ChromeFileList
53 53
54 def compilable_files(sources): 54 def compilable_files(sources):
55 if not hasattr(sources, 'entries'): 55 if not hasattr(sources, 'entries'):
56 return [x for x in sources if not str(x).endswith('.h') 56 return [x for x in sources if not str(x).endswith('.h')]
57 and not str(x).endswith('.dat')]
58 result = [] 57 result = []
59 for top, folders, nonfolders in MSVS.FileListWalk(sources): 58 for top, folders, nonfolders in MSVS.FileListWalk(sources):
60 result.extend([x for x in nonfolders if not str(x).endswith('.h') 59 result.extend([x for x in nonfolders if not str(x).endswith('.h')])
61 and not str(x).endswith('.dat')])
62 return result 60 return result
63 61
64 def ChromeProgram(env, target, source, *args, **kw): 62 def ChromeProgram(env, target, source, *args, **kw):
65 source = compilable_files(source) 63 source = compilable_files(source)
66 result = env.ComponentProgram(target, source, *args, **kw) 64 result = env.ComponentProgram(target, source, *args, **kw)
67 if env.get('INCREMENTAL'): 65 if env.get('INCREMENTAL'):
68 env.Precious(result) 66 env.Precious(result)
69 return result 67 return result
70 68
71 def ChromeTestProgram(env, target, source, *args, **kw): 69 def ChromeTestProgram(env, target, source, *args, **kw):
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 env.AddMethod(ChromeLibrary) 114 env.AddMethod(ChromeLibrary)
117 env.AddMethod(ChromeStaticLibrary) 115 env.AddMethod(ChromeStaticLibrary)
118 env.AddMethod(ChromeSharedLibrary) 116 env.AddMethod(ChromeSharedLibrary)
119 env.AddMethod(ChromeObject) 117 env.AddMethod(ChromeObject)
120 env.AddMethod(ChromeMSVSFolder) 118 env.AddMethod(ChromeMSVSFolder)
121 env.AddMethod(ChromeMSVSProject) 119 env.AddMethod(ChromeMSVSProject)
122 env.AddMethod(ChromeMSVSSolution) 120 env.AddMethod(ChromeMSVSSolution)
123 121
124 def exists(env): 122 def exists(env):
125 return True 123 return True
OLDNEW
« no previous file with comments | « site_scons/site_tools/_Node_MSVS.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698