Remove GYP build from bots and 'gclient runhooks'

buildbot/buildbot_lib.py

 #!/usr/bin/python
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import optparse
 import os.path
 import shutil
 import subprocess
 import stat
 import sys
 import time
 import traceback
 
 
 ARCH_MAP = {
     '32': {
-        'gyp_arch': 'ia32',
+        'gn_arch': 'x86',
         'scons_platform': 'x86-32',
         },
     '64': {
-        'gyp_arch': 'x64',
+        'gn_arch': 'x64',
         'scons_platform': 'x86-64',
         },
     'arm': {
-        'gyp_arch': 'arm',
+        'gn_arch': 'arm',
         'scons_platform': 'arm',
         },
     'mips32': {
-        'gyp_arch': 'mips32',
+        'gn_arch': 'mipsel',
         'scons_platform': 'mips32',
         },
     }
 
 
+def GNArch(arch):
+  return ARCH_MAP[arch]['gn_arch']
+
+
 def RunningOnBuildbot():
   return os.environ.get('BUILDBOT_SLAVE_TYPE') is not None
 
 
 def GetHostPlatform():
   sys_platform = sys.platform.lower()
   if sys_platform.startswith('linux'):
     return 'linux'
   elif sys_platform in ('win', 'win32', 'windows', 'cygwin'):
     return 'win'
@@ skipping 67 matching lines @@
   # The end slash is needed because the batch files expect it.
   context.SetEnv(comntools_var, comntools + '\\')
 
   # This environment variable will SCons to print debug info while it searches
   # for MSVC.
   context.SetEnv('SCONS_MSCOMMON_DEBUG', '-')
 
   # Needed for finding devenv.
   context['msvc'] = msvc
 
-  SetupGyp(context, [])
-
-
-def SetupGyp(context, extra_vars=[]):
-  if RunningOnBuildbot():
-    goma_opts = [
-        'use_goma=1',
-        'gomadir=/b/build/goma',
-    ]
-  else:
-    goma_opts = []
-  context.SetEnv('GYP_DEFINES', ' '.join(
-      context['gyp_vars'] + goma_opts + extra_vars))
-
 
 def SetupLinuxEnvironment(context):
   if context['arch'] == 'mips32':
     # Ensure the trusted mips toolchain is installed.
     cmd = ['build/package_version/package_version.py', '--packages',
            'linux_x86/mips_trusted', 'sync', '-x']
     Command(context, cmd)
 
-  SetupGyp(context, ['target_arch='+context['gyp_arch']])
-
-
-def SetupMacEnvironment(context):
-  SetupGyp(context, ['target_arch='+context['gyp_arch']])
-
-
-def SetupAndroidEnvironment(context):
-  SetupGyp(context, ['OS=android', 'target_arch='+context['gyp_arch']])
-  context.SetEnv('GYP_CROSSCOMPILE', '1')
-
 
 def ParseStandardCommandLine(context):
   """
   The standard buildbot scripts require 3 arguments to run.  The first
   argument (dbg/opt) controls if the build is a debug or a release build.  The
   second argument (32/64) controls the machine architecture being targeted.
   The third argument (newlib/glibc) controls which c library we're using for
   the nexes.  Different buildbots may have different sets of arguments.
   """
 
@@ skipping 12 matching lines @@
                     help='Build and test for code coverage.')
   parser.add_option('--validator', dest='validator', default=False,
                     action='store_true',
                     help='Only run validator regression test')
   parser.add_option('--asan', dest='asan', default=False,
                     action='store_true', help='Build trusted code with ASan.')
   parser.add_option('--scons-args', dest='scons_args', default =[],
                     action='append', help='Extra scons arguments.')
   parser.add_option('--step-suffix', metavar='SUFFIX', default='',
                     help='Append SUFFIX to buildbot step names.')
-  parser.add_option('--no-gyp', dest='no_gyp', default=False,
-                    action='store_true', help='Do not run the gyp build')
+  parser.add_option('--no-gn', dest='no_gn', default=False,
+                    action='store_true', help='Do not run the GN build')
   parser.add_option('--no-goma', dest='no_goma', default=False,
                     action='store_true', help='Do not run with goma')
   parser.add_option('--use-breakpad-tools', dest='use_breakpad_tools',
                     default=False, action='store_true',
                     help='Use breakpad tools for testing')
   parser.add_option('--skip-build', dest='skip_build', default=False,
                     action='store_true',
                     help='Skip building steps in buildbot_pnacl')
   parser.add_option('--skip-run', dest='skip_run', default=False,
                     action='store_true',
@@ skipping 20 matching lines @@
 
   context['platform'] = platform
   context['mode'] = mode
   context['arch'] = arch
   context['android'] = options.android
   # ASan is Clang, so set the flag to simplify other checks.
   context['clang'] = options.clang or options.asan
   context['validator'] = options.validator
   context['asan'] = options.asan
   # TODO(ncbray) turn derived values into methods.
-  context['gyp_mode'] = {
-      'opt': 'Release',
-      'dbg': 'Debug',
-      'coverage': 'Debug'}[mode]
   context['gn_is_debug'] = {
       'opt': 'false',
       'dbg': 'true',
       'coverage': 'true'}[mode]
-  context['gyp_arch'] = ARCH_MAP[arch]['gyp_arch']
-  context['gyp_vars'] = []
-  if context['clang']:
-    context['gyp_vars'].append('clang=1')
-  if context['asan']:
-    context['gyp_vars'].append('asan=1')
+  context['gn_arch'] = GNArch(arch)
   context['default_scons_platform'] = ARCH_MAP[arch]['scons_platform']
   context['default_scons_mode'] = ['nacl']
   # Only Linux can build trusted code on ARM.
   # TODO(mcgrathr): clean this up somehow
   if arch != 'arm' or platform == 'linux':
     context['default_scons_mode'] += [mode + '-host']
   context['use_glibc'] = toolchain == 'glibc'
   context['pnacl'] = toolchain == 'pnacl'
   context['nacl_clang'] = toolchain == 'nacl_clang'
   context['max_jobs'] = 8
   context['dry_run'] = options.dry_run
   context['inside_toolchain'] = options.inside_toolchain
   context['step_suffix'] = options.step_suffix
-  context['no_gyp'] = options.no_gyp
+  context['no_gn'] = options.no_gn
   context['no_goma'] = options.no_goma
   context['coverage'] = options.coverage
   context['use_breakpad_tools'] = options.use_breakpad_tools
   context['scons_args'] = options.scons_args
   context['skip_build'] = options.skip_build
   context['skip_run'] = options.skip_run
-  # Don't run gyp on coverage builds.
-  if context['coverage']:
-    context['no_gyp'] = True
 
   for key, value in sorted(context.config.items()):
     print '%s=%s' % (key, value)
 
 
 def EnsureDirectoryExists(path):
   """
   Create a directory if it does not already exist.
   Does not mask failures, but there really shouldn't be any.
   """
@@ skipping 406 matching lines @@
   #   Otherwise these go back to the preamble.
   with Step('summary', status):
     if status.ever_failed:
       print 'There were failed stages.'
     else:
       print 'Success.'
     # Display a summary of the build.
     status.DisplayBuildStatus()
 
   sys.exit(status.ReturnValue())