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

Side by Side Diff: scripts/slave/recipe_modules/ios/api.py

Issue 1145733003: ios: Allow bot configs to set extra env variables (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | scripts/slave/recipes/ios/unified_builder_tester.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 import copy 5 import copy
6 6
7 from slave import recipe_api 7 from slave import recipe_api
8 8
9 9
10 class iOSApi(recipe_api.RecipeApi): 10 class iOSApi(recipe_api.RecipeApi):
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 # Add the default GYP_DEFINES. 217 # Add the default GYP_DEFINES.
218 gyp_defines = [ 218 gyp_defines = [
219 '%s=%s' % (k, v) for k, v in self.__config['GYP_DEFINES'].iteritems() 219 '%s=%s' % (k, v) for k, v in self.__config['GYP_DEFINES'].iteritems()
220 ] 220 ]
221 221
222 env = { 222 env = {
223 'GYP_DEFINES': ' '.join(gyp_defines), 223 'GYP_DEFINES': ' '.join(gyp_defines),
224 'LANDMINES_VERBOSE': '1', 224 'LANDMINES_VERBOSE': '1',
225 } 225 }
226 226
227 # Add extra env variables.
228 env.update(self.__config.get('env', {}))
smut 2015/05/19 19:52:08 In read_build_config, please add self.__config['en
hans 2015/05/19 20:11:45 Done.
229
227 if self.compiler == 'xcodebuild': 230 if self.compiler == 'xcodebuild':
228 env['GYP_GENERATORS'] = 'xcode' 231 env['GYP_GENERATORS'] = 'xcode'
229 env['GYP_GENERATOR_FLAGS'] = 'xcode_project_version=3.2' 232 env['GYP_GENERATOR_FLAGS'] = 'xcode_project_version=3.2'
230 cwd = self.m.path['checkout'].join('xcodebuild') 233 cwd = self.m.path['checkout'].join('xcodebuild')
231 cmd = [ 234 cmd = [
232 'xcodebuild', 235 'xcodebuild',
233 '-configuration', self.configuration, 236 '-configuration', self.configuration,
234 '-project', self.m.path['checkout'].join( 237 '-project', self.m.path['checkout'].join(
235 'build', 238 'build',
236 'all.xcodeproj', 239 'all.xcodeproj',
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 self.configuration, 429 self.configuration,
427 'iossim', 430 'iossim',
428 ), 431 ),
429 'ninja': self.m.path.join( 432 'ninja': self.m.path.join(
430 'src', 433 'src',
431 build_dir, 434 build_dir,
432 '%s-%s' % (self.configuration, platform), 435 '%s-%s' % (self.configuration, platform),
433 'iossim', 436 'iossim',
434 ), 437 ),
435 }[self.compiler] 438 }[self.compiler]
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipes/ios/unified_builder_tester.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698