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

Side by Side Diff: build/gyp_helper.py

Issue 136663004: Fix chromium.gyp_env to see GYP_MSVS_VERSION. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 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 | 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 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 # This file helps gyp_chromium and landmines correctly set up the gyp 5 # This file helps gyp_chromium and landmines correctly set up the gyp
6 # environment from chromium.gyp_env on disk 6 # environment from chromium.gyp_env on disk
7 7
8 import os 8 import os
9 9
10 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__)) 10 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
(...skipping 16 matching lines...) Expand all
27 'CC_wrapper', 27 'CC_wrapper',
28 'CHROMIUM_GYP_FILE', 28 'CHROMIUM_GYP_FILE',
29 'CHROMIUM_GYP_SYNTAX_CHECK', 29 'CHROMIUM_GYP_SYNTAX_CHECK',
30 'CXX', 30 'CXX',
31 'CXX_wrapper', 31 'CXX_wrapper',
32 'GYP_DEFINES', 32 'GYP_DEFINES',
33 'GYP_GENERATOR_FLAGS', 33 'GYP_GENERATOR_FLAGS',
34 'GYP_CROSSCOMPILE', 34 'GYP_CROSSCOMPILE',
35 'GYP_GENERATOR_OUTPUT', 35 'GYP_GENERATOR_OUTPUT',
36 'GYP_GENERATORS', 36 'GYP_GENERATORS',
37 'GYP_MSVS_VERSION',
37 ) 38 )
38 for var in supported_vars: 39 for var in supported_vars:
39 file_val = file_data.get(var) 40 file_val = file_data.get(var)
40 if file_val: 41 if file_val:
41 if var in os.environ: 42 if var in os.environ:
42 print 'INFO: Environment value for "%s" overrides value in %s.' % ( 43 print 'INFO: Environment value for "%s" overrides value in %s.' % (
43 var, os.path.abspath(file_path) 44 var, os.path.abspath(file_path)
44 ) 45 )
45 else: 46 else:
46 os.environ[var] = file_val 47 os.environ[var] = file_val
47 48
48 49
49 def apply_chromium_gyp_env(): 50 def apply_chromium_gyp_env():
50 if 'SKIP_CHROMIUM_GYP_ENV' not in os.environ: 51 if 'SKIP_CHROMIUM_GYP_ENV' not in os.environ:
51 # Update the environment based on chromium.gyp_env 52 # Update the environment based on chromium.gyp_env
52 path = os.path.join(os.path.dirname(CHROME_SRC), 'chromium.gyp_env') 53 path = os.path.join(os.path.dirname(CHROME_SRC), 'chromium.gyp_env')
53 apply_gyp_environment_from_file(path) 54 apply_gyp_environment_from_file(path)
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