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

Side by Side Diff: build/gyp_chromium

Issue 797373004: Early error out if the 'msvs' is specified in GYP_GENERATORS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « 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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 # list. 268 # list.
269 if sys.platform not in ('darwin',): 269 if sys.platform not in ('darwin',):
270 args.append('--no-circular-check') 270 args.append('--no-circular-check')
271 271
272 # We explicitly don't support the make gyp generator (crbug.com/348686). Be 272 # We explicitly don't support the make gyp generator (crbug.com/348686). Be
273 # nice and fail here, rather than choking in gyp. 273 # nice and fail here, rather than choking in gyp.
274 if re.search(r'(^|,|\s)make($|,|\s)', os.environ.get('GYP_GENERATORS', '')): 274 if re.search(r'(^|,|\s)make($|,|\s)', os.environ.get('GYP_GENERATORS', '')):
275 print 'Error: make gyp generator not supported (check GYP_GENERATORS).' 275 print 'Error: make gyp generator not supported (check GYP_GENERATORS).'
276 sys.exit(1) 276 sys.exit(1)
277 277
278 # We explicitly don't support the native msvs gyp generator. Be nice and
279 # fail here, rather than generating broken projects.
280 if re.search(r'(^|,|\s)msvs($|,|\s)', os.environ.get('GYP_GENERATORS', '')):
281 print 'Error: msvs gyp generator not supported (check GYP_GENERATORS).'
282 print 'Did you mean to use the `msvs-ninja` generator?'
283 sys.exit(1)
284
278 # If CHROMIUM_GYP_SYNTAX_CHECK is set to 1, it will invoke gyp with --check 285 # If CHROMIUM_GYP_SYNTAX_CHECK is set to 1, it will invoke gyp with --check
279 # to enfore syntax checking. 286 # to enfore syntax checking.
280 syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK') 287 syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK')
281 if syntax_check and int(syntax_check): 288 if syntax_check and int(syntax_check):
282 args.append('--check') 289 args.append('--check')
283 290
284 supplemental_includes = GetSupplementalFiles() 291 supplemental_includes = GetSupplementalFiles()
285 gyp_vars_dict = GetGypVars(supplemental_includes) 292 gyp_vars_dict = GetGypVars(supplemental_includes)
286 293
287 # TODO(dmikurube): Remove these checks and messages after a while. 294 # TODO(dmikurube): Remove these checks and messages after a while.
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 326
320 if not use_analyzer: 327 if not use_analyzer:
321 vs2013_runtime_dll_dirs = vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs() 328 vs2013_runtime_dll_dirs = vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs()
322 if vs2013_runtime_dll_dirs: 329 if vs2013_runtime_dll_dirs:
323 x64_runtime, x86_runtime = vs2013_runtime_dll_dirs 330 x64_runtime, x86_runtime = vs2013_runtime_dll_dirs
324 vs_toolchain.CopyVsRuntimeDlls( 331 vs_toolchain.CopyVsRuntimeDlls(
325 os.path.join(chrome_src, GetOutputDirectory()), 332 os.path.join(chrome_src, GetOutputDirectory()),
326 (x86_runtime, x64_runtime)) 333 (x86_runtime, x64_runtime))
327 334
328 sys.exit(gyp_rc) 335 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