Add Windows ninja to buildbot

test/lib/TestGyp.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 TestGyp.py:  a testing framework for GYP integration tests.
 """
 
 import os
 import re
@@ skipping 392 matching lines @@
       result.append('obj.target')
     elif type == self.SHARED_LIB and sys.platform != 'darwin':
       result.append('lib.target')
     subdir = kw.get('subdir')
     if subdir:
       result.append(subdir)
     result.append(self.built_file_basename(name, type, **kw))
     return self.workpath(*result)
 
 
+def FindVisualStudioInstallation():
+  """Returns appropriate values for .build_tool and .uses_msbuild fields
+  of TestGypBase for Visual Studio.
+
+  We use the value specified by GYP_MSVS_VERSION.  If not specified, we
+  search %PATH% and %PATHEXT% for a devenv.{exe,bat,...} executable.
+  Failing that, we search for likely deployment paths.
+  """
+  possible_roots = ['C:\\Program Files (x86)', 'C:\\Program Files',
+                    'E:\\Program Files (x86)', 'E:\\Program Files']
+  possible_paths = {
+      '2010': r'Microsoft Visual Studio 10.0\Common7\IDE\devenv.com',
+      '2008': r'Microsoft Visual Studio 9.0\Common7\IDE\devenv.com',
+      '2005': r'Microsoft Visual Studio 8\Common7\IDE\devenv.com'}
+  msvs_version = os.environ.get('GYP_MSVS_VERSION', 'auto')
+  build_tool = None
+  if msvs_version in possible_paths:
+    # Check that the path to the specified GYP_MSVS_VERSION exists.
+    path = possible_paths[msvs_version]
+    for r in possible_roots:
+      bt = os.path.join(r, path)
+      if os.path.exists(bt):
+        build_tool = bt
+        uses_msbuild = msvs_version >= '2010'
+        return build_tool, uses_msbuild
+    else:
+      print ('Warning: Environment variable GYP_MSVS_VERSION specifies "%s" '
+              'but corresponding "%s" was not found.' % (msvs_version, path))
+  if build_tool:
+    # We found 'devenv' on the path, use that and try to guess the version.
+    for version, path in possible_paths.iteritems():
+      if build_tool.find(path) >= 0:
+        uses_msbuild = version >= '2010'
+        return build_tool, uses_msbuild
+    else:
+      # If not, assume not MSBuild.
+      uses_msbuild = False
+    return build_tool, uses_msbuild
+  # Neither GYP_MSVS_VERSION nor the path help us out.  Iterate through
+  # the choices looking for a match.
+  for version, path in possible_paths.iteritems():
+    for r in possible_roots:
+      bt = os.path.join(r, path)
+      if os.path.exists(bt):
+        build_tool = bt
+        uses_msbuild = msvs_version >= '2010'
+        return build_tool, uses_msbuild
+  print 'Error: could not find devenv'
+  sys.exit(1)
+
+
 class TestGypNinja(TestGypBase):
   """
   Subclass for testing the GYP Ninja generator.
   """
   format = 'ninja'
   build_tool_list = ['ninja']
   ALL = 'all'
   DEFAULT = 'all'
 
+  def initialize_build_tool(self):
+    super(TestGypNinja, self).initialize_build_tool()
+    if sys.platform == 'win32':
+      # Compiler and linker aren't in the path by default on Windows, so we
+      # make our "build tool" be set up + run ninja.
+      devenv_path, _ = FindVisualStudioInstallation()
+      devenv_dir = os.path.split(devenv_path)[0]
+      vsvars_path = os.path.join(devenv_path, '../../Tools/vsvars32.bat')

[Nico, 2012/02/22 17:45:22]

For my education: Why not vcvarsall.bat?

+      vsvars_path = os.path.normpath(vsvars_path)
+      self.build_tool = os.environ.get('COMSPEC', 'cmd.exe')
+      self.helper_args = ['/c', vsvars_path, '&&', 'ninja']
+
   def run_gyp(self, gyp_file, *args, **kw):
     TestGypBase.run_gyp(self, gyp_file, *args, **kw)
 
   def build(self, gyp_file, target=None, **kw):
     arguments = kw.get('arguments', [])[:]
 
     # Add a -C output/path to the command line.
     arguments.append('-C')
     arguments.append(os.path.join('out', self.configuration_dirname()))
 
     if target is None:
       target = 'all'
     arguments.append(target)
 
+    if sys.platform == 'win32':
+      arguments = self.helper_args + arguments

[Nico, 2012/02/22 17:45:22]

I guess '/c' means that cmd.exe will spawn a subshell which it sets the vcvars
in, which is why this is needed for every test?

+
     kw['arguments'] = arguments
     return self.run(program=self.build_tool, **kw)
 
   def run_built_executable(self, name, *args, **kw):
     # Enclosing the name in a list avoids prepending the original dir.
     program = [self.built_file_path(name, type=self.EXECUTABLE, **kw)]
     if sys.platform == 'darwin':
       libdir = os.path.join('out', 'Default')
       if self.configuration:
         libdir = os.path.join('out', self.configuration)
@@ skipping 39 matching lines @@
   up_to_date_re = re.compile(u, re.M)
 
   # Initial None element will indicate to our .initialize_build_tool()
   # method below that 'devenv' was not found on %PATH%.
   #
   # Note:  we must use devenv.com to be able to capture build output.
   # Directly executing devenv.exe only sends output to BuildLog.htm.
   build_tool_list = [None, 'devenv.com']
 
   def initialize_build_tool(self):
-    """ Initializes the Visual Studio .build_tool and .uses_msbuild parameters.
-
-    We use the value specified by GYP_MSVS_VERSION.  If not specified, we
-    search %PATH% and %PATHEXT% for a devenv.{exe,bat,...} executable.
-    Failing that, we search for likely deployment paths.
-    """
     super(TestGypMSVS, self).initialize_build_tool()
-    possible_roots = ['C:\\Program Files (x86)', 'C:\\Program Files',
-                      'E:\\Program Files (x86)', 'E:\\Program Files']
-    possible_paths = {
-        '2010': r'Microsoft Visual Studio 10.0\Common7\IDE\devenv.com',
-        '2008': r'Microsoft Visual Studio 9.0\Common7\IDE\devenv.com',
-        '2005': r'Microsoft Visual Studio 8\Common7\IDE\devenv.com'}
-    msvs_version = os.environ.get('GYP_MSVS_VERSION', 'auto')
-    if msvs_version in possible_paths:
-      # Check that the path to the specified GYP_MSVS_VERSION exists.
-      path = possible_paths[msvs_version]
-      for r in possible_roots:
-        bt = os.path.join(r, path)
-        if os.path.exists(bt):
-          self.build_tool = bt
-          self.uses_msbuild = msvs_version >= '2010'
-          return
-      else:
-        print ('Warning: Environment variable GYP_MSVS_VERSION specifies "%s" '
-               'but corresponding "%s" was not found.' % (msvs_version, path))
-    if self.build_tool:
-      # We found 'devenv' on the path, use that and try to guess the version.
-      for version, path in possible_paths.iteritems():
-        if self.build_tool.find(path) >= 0:
-          self.uses_msbuild = version >= '2010'
-          return
-      else:
-        # If not, assume not MSBuild.
-        self.uses_msbuild = False
-      return
-    # Neither GYP_MSVS_VERSION nor the path help us out.  Iterate through
-    # the choices looking for a match.
-    for version, path in possible_paths.iteritems():
-      for r in possible_roots:
-        bt = os.path.join(r, path)
-        if os.path.exists(bt):
-          self.build_tool = bt
-          self.uses_msbuild = msvs_version >= '2010'
-          return
-    print 'Error: could not find devenv'
-    sys.exit(1)
+    self.build_tool, self.uses_msbuild = FindVisualStudioInstallation()
   def build(self, gyp_file, target=None, rebuild=False, **kw):
     """
     Runs a Visual Studio build using the configuration generated
     from the specified gyp_file.
     """
     configuration = self.configuration_buildname()
     if rebuild:
       build = '/Rebuild'
     else:
       build = '/Build'
@@ skipping 247 matching lines @@
   """
   format = kw.get('format')
   if format:
     del kw['format']
   else:
     format = os.environ.get('TESTGYP_FORMAT')
   for format_class in format_class_list:
     if format == format_class.format:
       return format_class(*args, **kw)
   raise Exception, "unknown format %r" % format