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

Side by Side Diff: build/scripts/slave/compile.py

Issue 217833006: compile.py: Don't set OFFICIAL_BUILD for --mode=official builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/
Patch Set: Created 6 years, 8 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 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 """A tool to build chrome, executed by buildbot. 6 """A tool to build chrome, executed by buildbot.
7 7
8 When this is run, the current directory (cwd) should be the outer build 8 When this is run, the current directory (cwd) should be the outer build
9 directory (e.g., chrome-release/build/). 9 directory (e.g., chrome-release/build/).
10 10
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 self.PushLine(XcodebuildFilter.LineType.Raw, last_bits) 451 self.PushLine(XcodebuildFilter.LineType.Raw, last_bits)
452 return self.AssembleOutput() 452 return self.AssembleOutput()
453 453
454 454
455 def maybe_set_official_build_envvars(options, env): 455 def maybe_set_official_build_envvars(options, env):
456 if options.mode == 'google_chrome' or options.mode == 'official': 456 if options.mode == 'google_chrome' or options.mode == 'official':
457 env['CHROMIUM_BUILD'] = '_google_chrome' 457 env['CHROMIUM_BUILD'] = '_google_chrome'
458 458
459 if options.mode == 'official': 459 if options.mode == 'official':
460 # Official builds are always Google Chrome. 460 # Official builds are always Google Chrome.
461 env['OFFICIAL_BUILD'] = '1'
462 env['CHROME_BUILD_TYPE'] = '_official' 461 env['CHROME_BUILD_TYPE'] = '_official'
463 462
464 463
465 def main_xcode(options, args): 464 def main_xcode(options, args):
466 """Interprets options, clobbers object files, and calls xcodebuild. 465 """Interprets options, clobbers object files, and calls xcodebuild.
467 """ 466 """
468 467
469 env = EchoDict(os.environ) 468 env = EchoDict(os.environ)
470 goma_ready = goma_setup(options, env) 469 goma_ready = goma_setup(options, env)
471 if not goma_ready: 470 if not goma_ready:
(...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after
1250 options.target_output_dir = get_target_build_dir(options.build_tool, 1249 options.target_output_dir = get_target_build_dir(options.build_tool,
1251 options.src_dir, options.target, 'iphoneos' in args) 1250 options.src_dir, options.target, 'iphoneos' in args)
1252 options.clobber = (options.clobber or 1251 options.clobber = (options.clobber or
1253 landmines_triggered(options.target_output_dir)) 1252 landmines_triggered(options.target_output_dir))
1254 1253
1255 return main(options, args) 1254 return main(options, args)
1256 1255
1257 1256
1258 if '__main__' == __name__: 1257 if '__main__' == __name__:
1259 sys.exit(real_main()) 1258 sys.exit(real_main())
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