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

Side by Side Diff: build/gyp_chromium

Issue 10382126: Revert r136547 "Enforce VS2010 on trunk." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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
« 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) 2011 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2011 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 return result 100 return result
101 101
102 if __name__ == '__main__': 102 if __name__ == '__main__':
103 args = sys.argv[1:] 103 args = sys.argv[1:]
104 104
105 # Use the Psyco JIT if available. 105 # Use the Psyco JIT if available.
106 if psyco: 106 if psyco:
107 psyco.profile() 107 psyco.profile()
108 print "Enabled Psyco JIT." 108 print "Enabled Psyco JIT."
109 109
110 os.environ['GYP_MSVS_VERSION'] = '2010'
111
112 # Fall back on hermetic python if we happen to get run under cygwin. 110 # Fall back on hermetic python if we happen to get run under cygwin.
113 # TODO(bradnelson): take this out once this issue is fixed: 111 # TODO(bradnelson): take this out once this issue is fixed:
114 # http://code.google.com/p/gyp/issues/detail?id=177 112 # http://code.google.com/p/gyp/issues/detail?id=177
115 if sys.platform == 'cygwin': 113 if sys.platform == 'cygwin':
116 python_dir = os.path.join(chrome_src, 'third_party', 'python_26') 114 python_dir = os.path.join(chrome_src, 'third_party', 'python_26')
117 env = os.environ.copy() 115 env = os.environ.copy()
118 env['PATH'] = python_dir + os.pathsep + env.get('PATH', '') 116 env['PATH'] = python_dir + os.pathsep + env.get('PATH', '')
119 p = subprocess.Popen( 117 p = subprocess.Popen(
120 [os.path.join(python_dir, 'python.exe')] + sys.argv, 118 [os.path.join(python_dir, 'python.exe')] + sys.argv,
121 env=env, shell=False) 119 env=env, shell=False)
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 # to enfore syntax checking. 162 # to enfore syntax checking.
165 syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK') 163 syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK')
166 if syntax_check and int(syntax_check): 164 if syntax_check and int(syntax_check):
167 args.append('--check') 165 args.append('--check')
168 166
169 print 'Updating projects from gyp files...' 167 print 'Updating projects from gyp files...'
170 sys.stdout.flush() 168 sys.stdout.flush()
171 169
172 # Off we go... 170 # Off we go...
173 sys.exit(gyp.main(args)) 171 sys.exit(gyp.main(args))
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