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

Side by Side Diff: build/gyp_chromium

Issue 314933004: Always process landmines, even if GYP_CHROMIUM_NO_ACTION is set (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | 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 #!/usr/bin/env python 1 #!/usr/bin/env python
2 2
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # This script is wrapper for Chromium that adds some support for how GYP 7 # This script is wrapper for Chromium that adds some support for how GYP
8 # is invoked by Chromium beyond what can be done in the gclient hooks. 8 # is invoked by Chromium beyond what can be done in the gclient hooks.
9 9
10 import glob 10 import glob
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 for supplement in supplemental_files: 183 for supplement in supplemental_files:
184 AddInclude(supplement) 184 AddInclude(supplement)
185 185
186 return result 186 return result
187 187
188 188
189 if __name__ == '__main__': 189 if __name__ == '__main__':
190 args = sys.argv[1:] 190 args = sys.argv[1:]
191 191
192 if int(os.environ.get('GYP_CHROMIUM_NO_ACTION', 0)): 192 if int(os.environ.get('GYP_CHROMIUM_NO_ACTION', 0)):
193 # Check for landmines (reasons to clobber the build) in any case.
194 print 'Running build/landmines.py...'
195 subprocess.check_call(
196 [sys.executable, os.path.join(script_dir, 'landmines.py')])
193 print 'Skipping gyp_chromium due to GYP_CHROMIUM_NO_ACTION env var.' 197 print 'Skipping gyp_chromium due to GYP_CHROMIUM_NO_ACTION env var.'
194 sys.exit(0) 198 sys.exit(0)
195 199
196 # Use the Psyco JIT if available. 200 # Use the Psyco JIT if available.
197 if psyco: 201 if psyco:
198 psyco.profile() 202 psyco.profile()
199 print "Enabled Psyco JIT." 203 print "Enabled Psyco JIT."
200 204
201 # Fall back on hermetic python if we happen to get run under cygwin. 205 # Fall back on hermetic python if we happen to get run under cygwin.
202 # TODO(bradnelson): take this out once this issue is fixed: 206 # TODO(bradnelson): take this out once this issue is fixed:
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 subprocess.check_call( 320 subprocess.check_call(
317 [sys.executable, os.path.join(script_dir, 'landmines.py')]) 321 [sys.executable, os.path.join(script_dir, 'landmines.py')])
318 322
319 if vs2013_runtime_dll_dirs: 323 if vs2013_runtime_dll_dirs:
320 x64_runtime, x86_runtime = vs2013_runtime_dll_dirs 324 x64_runtime, x86_runtime = vs2013_runtime_dll_dirs
321 vs_toolchain.CopyVsRuntimeDlls( 325 vs_toolchain.CopyVsRuntimeDlls(
322 os.path.join(chrome_src, GetOutputDirectory()), 326 os.path.join(chrome_src, GetOutputDirectory()),
323 (x86_runtime, x64_runtime)) 327 (x86_runtime, x64_runtime))
324 328
325 sys.exit(gyp_rc) 329 sys.exit(gyp_rc)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698