compile.py: Simplify --build-tool logic. It's always ninja now.

scripts/slave/compile.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A tool to build chrome, executed by buildbot.
 
   When this is run, the current directory (cwd) should be the outer build
   directory (e.g., chrome-release/build/).
 
@@ skipping 436 matching lines @@
     if options.gsutil_py_path:
       override_gsutil = [sys.executable, options.gsutil_py_path]
 
     goma_utils.UploadNinjaLog(
         options.target_output_dir, options.compiler, command, exit_status,
         override_gsutil=override_gsutil)
 
 
 def get_target_build_dir(args, options):
   """Keep this function in sync with src/build/landmines.py"""
-  assert options.build_tool == 'ninja'
   if chromium_utils.IsLinux() and options.cros_board:
     # When building ChromeOS's Simple Chrome workflow, the output directory
     # has a CROS board name suffix.
     outdir = 'out_%s' % (options.cros_board,)
   elif options.out_dir:
     outdir = options.out_dir
   else:
     outdir = 'out'
   return os.path.abspath(os.path.join(options.src_dir, outdir, options.target))
 
 
 def real_main():
   option_parser = optparse.OptionParser()
   option_parser.add_option('--clobber', action='store_true', default=False,
                            help='delete the output directory before compiling')
   option_parser.add_option('--target', default='Release',
                            help='build target (Debug or Release)')
   option_parser.add_option('--src-dir', default=None,
                            help='path to the root of the source tree')
   option_parser.add_option('--mode', default='dev',
                            help='build mode (dev or official) controlling '
                                 'environment variables set during build')
+  # TODO(thakis): Remove this once bots no longer pass it in.
   option_parser.add_option('--build-tool', default=None, help='ignored')
   option_parser.add_option('--build-args', action='append', default=[],
                            help='arguments to pass to the build tool')
   option_parser.add_option('--build-data-dir', action='store',
                            help='specify a build data directory.')
   option_parser.add_option('--compiler', default=None,
                            help='specify alternative compiler (e.g. clang)')
   if chromium_utils.IsLinux():
     option_parser.add_option('--cros-board', action='store',
                              help='If building for the ChromeOS Simple Chrome '
@@ skipping 33 matching lines @@
                            help='Checks the output of the ninja builder to '
                                 'confirm that a second compile immediately '
                                 'the first is a no-op.')
 
   options, args = option_parser.parse_args()
 
   if not options.src_dir:
     options.src_dir = 'src'
   options.src_dir = os.path.abspath(options.src_dir)
 
-  options.build_dir = os.path.abspath(build_directory.GetBuildOutputDirectory(
-        os.path.basename(options.src_dir)))
-
-  if options.build_tool is None:
-    if chromium_utils.IsWindows():
-      main = main_ninja
-      options.build_tool = 'ninja'
-      # TODO(thakis): Merge this with the branch below and simplify.
-    elif chromium_utils.IsLinux() or chromium_utils.IsMac():
-      main = main_ninja
-      options.build_tool = 'ninja'
-    else:
-      print 'Please specify --build-tool.'
-      return 1
-  else:
-    build_tool_map = { 'ninja' : main_ninja }
-    main = build_tool_map.get(options.build_tool)
-    if not main:
-      sys.stderr.write('Unknown build tool %s.\n' % repr(options.build_tool))
-      return 2
-
   options.target_output_dir = get_target_build_dir(args, options)
 
-  return main(options, args)
+  assert options.build_tool in (None, 'ninja')
+  return main_ninja(options, args)
 
 
 if '__main__' == __name__:
   sys.exit(real_main())