Improvements to tools/gn.py

tools/build.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. 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
 import re
@@ skipping 59 matching lines @@
       metavar=HOST_CPUS,
       default=str(HOST_CPUS))
   (vs_directory, vs_executable) = utils.GuessVisualStudioPath()
   result.add_option("--devenv",
       help='Path containing devenv.com on Windows',
       default=vs_directory)
   result.add_option("--executable",
       help='Name of the devenv.com/msbuild executable on Windows (varies for '
            'different versions of Visual Studio)',
       default=vs_executable)
+  result.add_option("--gn",
+      help='Build with GN/Ninja',
+      default=False,
+      action='store_true')
   return result
 
 
 def ProcessOsOption(os_name):
   if os_name == 'host':
     return HOST_OS
   return os_name
 
 
 def ProcessOptions(options, args):
@@ skipping 292 matching lines @@
       "$n.showballoontip(%d, '%s', '%s', "
       "[system.windows.forms.tooltipicon]::%s);\"") % (
         5000, # Notification stays on for this many milliseconds
         message, title, icon)
 
   if command:
     # Ignore return code, if this command fails, it doesn't matter.
     os.system(command)
 
 
+def BuildNinjaCommand(options, target, target_os, mode, arch):
+  out_dir = utils.GetBuildRoot(HOST_OS, mode, arch, target_os)
+  command = ['ninja', '-C', out_dir]
+  if options.verbose:
+    command += ['-v']
+  command += [target]
+  return command
+
+
 filter_xcodebuild_output = False
 def BuildOneConfig(options, target, target_os, mode, arch, override_tools):
   global filter_xcodebuild_output
   start_time = time.time()
-  os.environ['DART_BUILD_MODE'] = mode
+  args = []
   build_config = utils.GetBuildConf(mode, arch, target_os)
-  if HOST_OS == 'macos':
-    filter_xcodebuild_output = True
-    project_file = 'dart.xcodeproj'
-    if os.path.exists('dart-%s.gyp' % CurrentDirectoryBaseName()):
-      project_file = 'dart-%s.xcodeproj' % CurrentDirectoryBaseName()
-    args = ['xcodebuild',
-            '-project',
-            project_file,
-            '-target',
-            target,
-            '-configuration',
-            build_config,
-            'SYMROOT=%s' % os.path.abspath('xcodebuild')
-            ]
-  elif HOST_OS == 'win32':
-    project_file = 'dart.sln'
-    if os.path.exists('dart-%s.gyp' % CurrentDirectoryBaseName()):
-      project_file = 'dart-%s.sln' % CurrentDirectoryBaseName()
-    # Select a platform suffix to pass to devenv.
-    if arch == 'ia32':
-      platform_suffix = 'Win32'
-    elif arch == 'x64':
-      platform_suffix = 'x64'
+  if options.gn:
+    args = BuildNinjaCommand(options, target, target_os, mode, arch)
+  else:
+    os.environ['DART_BUILD_MODE'] = mode
+    if HOST_OS == 'macos':
+      filter_xcodebuild_output = True
+      project_file = 'dart.xcodeproj'
+      if os.path.exists('dart-%s.gyp' % CurrentDirectoryBaseName()):
+        project_file = 'dart-%s.xcodeproj' % CurrentDirectoryBaseName()
+      args = ['xcodebuild',
+              '-project',
+              project_file,
+              '-target',
+              target,
+              '-configuration',
+              build_config,
+              'SYMROOT=%s' % os.path.abspath('xcodebuild')
+              ]
+    elif HOST_OS == 'win32':
+      project_file = 'dart.sln'
+      if os.path.exists('dart-%s.gyp' % CurrentDirectoryBaseName()):
+        project_file = 'dart-%s.sln' % CurrentDirectoryBaseName()
+      # Select a platform suffix to pass to devenv.
+      if arch == 'ia32':
+        platform_suffix = 'Win32'
+      elif arch == 'x64':
+        platform_suffix = 'x64'
+      else:
+        print 'Unsupported arch for MSVC build: %s' % arch
+        return 1
+      config_name = '%s|%s' % (build_config, platform_suffix)
+      if target == 'all':
+        args = [options.devenv + os.sep + options.executable,
+                '/build',
+                config_name,
+                project_file
+               ]
+      else:
+        args = [options.devenv + os.sep + options.executable,
+                '/build',
+                config_name,
+                '/project',
+                target,
+                project_file
+               ]
     else:
-      print 'Unsupported arch for MSVC build: %s' % arch
-      return 1
-    config_name = '%s|%s' % (build_config, platform_suffix)
-    if target == 'all':
-      args = [options.devenv + os.sep + options.executable,
-              '/build',
-              config_name,
-              project_file
-             ]
-    else:
-      args = [options.devenv + os.sep + options.executable,
-              '/build',
-              config_name,
-              '/project',
-              target,
-              project_file
-             ]
-  else:
-    make = 'make'
-    if HOST_OS == 'freebsd':
-      make = 'gmake'
-      # work around lack of flock
-      os.environ['LINK'] = '$(CXX)'
-    args = [make,
-            '-j',
-            options.j,
-            'BUILDTYPE=' + build_config,
-            ]
-    if target_os != HOST_OS:
-      args += ['builddir_name=' + utils.GetBuildDir(HOST_OS)]
-    if options.verbose:
-      args += ['V=1']
+      make = 'make'
+      if HOST_OS == 'freebsd':
+        make = 'gmake'
+        # work around lack of flock
+        os.environ['LINK'] = '$(CXX)'
+      args = [make,
+              '-j',
+              options.j,
+              'BUILDTYPE=' + build_config,
+              ]
+      if target_os != HOST_OS:
+        args += ['builddir_name=' + utils.GetBuildDir(HOST_OS)]
+      if options.verbose:
+        args += ['V=1']
 
-    args += [target]
+      args += [target]
 
   toolsOverride = None
   if override_tools:
     toolsOverride = SetTools(arch, target_os, options)
   if toolsOverride:
     for k, v in toolsOverride.iteritems():
       args.append(  k + "=" + v)
       if options.verbose:
         print k + " = " + v
     if not os.path.isfile(toolsOverride['CC.target']):
@@ skipping 28 matching lines @@
 def BuildCrossSdk(options, target_os, mode, arch):
   # First build 'create_sdk' for the host. Do not override the host toolchain.
   if BuildOneConfig(options, 'create_sdk', HOST_OS,
                     mode, HOST_ARCH, False) != 0:
     return 1
 
   # Then, build the runtime for the target arch.
   if BuildOneConfig(options, 'runtime', target_os, mode, arch, True) != 0:
     return 1
 
-  # TODO(zra): verify that no platform specific details leak into the snapshots
-  # created for pub, dart2js, etc.
-
   # Copy dart-sdk from the host build products dir to the target build
   # products dir, and copy the dart binary for target to the sdk bin/ dir.
   src = os.path.join(
       utils.GetBuildRoot(HOST_OS, mode, HOST_ARCH, HOST_OS), 'dart-sdk')
   dst = os.path.join(
       utils.GetBuildRoot(HOST_OS, mode, arch, target_os), 'dart-sdk')
   shutil.rmtree(dst, ignore_errors=True)
   shutil.copytree(src, dst)
 
   dart = os.path.join(
@@ skipping 41 matching lines @@
           else:
             if BuildOneConfig(options, target, target_os,
                               mode, arch, cross_build) != 0:
               return 1
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(Main())