gyp: update to r1214

1 files changed, 1 insertions, 42 deletions

diff --git a/tools/gyp/buildbot/buildbot_run.py b/tools/gyp/buildbot/buildbot_run.py
index a8531258b2..e0fda368ae 100755
--- a/tools/gyp/buildbot/buildbot_run.py
+++ b/tools/gyp/buildbot/buildbot_run.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2011 Google Inc. All rights reserved.
+# 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.
 
@@ -23,32 +23,6 @@ BUILDBOT_DIR = os.path.dirname(os.path.abspath(__file__))
 TRUNK_DIR = os.path.dirname(BUILDBOT_DIR)
 ROOT_DIR = os.path.dirname(TRUNK_DIR)
 OUT_DIR = os.path.join(TRUNK_DIR, 'out')
-NINJA_PATH = os.path.join(TRUNK_DIR, 'ninja' + EXE_SUFFIX)
-NINJA_WORK_DIR = os.path.join(ROOT_DIR, 'ninja_work')
-
-
-def InstallNinja():
-  """Install + build ninja.
-
-  Returns:
-    0 for success, 1 for failure.
-  """
-  print '@@@BUILD_STEP install ninja@@@'
-  # Delete old version if any.
-  try:
-    shutil.rmtree(NINJA_WORK_DIR, ignore_errors=True)
-  except:
-    pass
-  # Sync new copy from git.
-  subprocess.check_call(
-      'git clone https://github.com/martine/ninja.git ' + NINJA_WORK_DIR,
-      shell=True)
-  # Bootstrap.
-  subprocess.check_call('./bootstrap.sh', cwd=NINJA_WORK_DIR, shell=True)
-  # Copy out ninja.
-  shutil.copyfile(os.path.join(NINJA_WORK_DIR, 'ninja' + EXE_SUFFIX),
-                  NINJA_PATH)
-  os.chmod(NINJA_PATH, 0777)
 
 
 def GypTestFormat(title, format=None, msvs_version=None):
@@ -64,17 +38,6 @@ def GypTestFormat(title, format=None, msvs_version=None):
   if not format:
     format = title
 
-  # Install ninja if needed.
-  # NOTE: as ninja gets installed each time, regressions to ninja can come
-  # either from changes to ninja itself, or changes to gyp.
-  if format == 'ninja':
-    try:
-      InstallNinja()
-    except Exception, e:
-      print '@@@STEP_FAILURE@@@'
-      print str(e)
-      return 1
-
   print '@@@BUILD_STEP ' + title + '@@@'
   sys.stdout.flush()
   env = os.environ.copy()
@@ -104,10 +67,6 @@ def GypBuild():
   print '@@@BUILD_STEP cleanup@@@'
   print 'Removing %s...' % OUT_DIR
   shutil.rmtree(OUT_DIR, ignore_errors=True)
-  print 'Removing %s...' % NINJA_WORK_DIR
-  shutil.rmtree(NINJA_WORK_DIR, ignore_errors=True)
-  print 'Removing %s...' % NINJA_PATH
-  shutil.rmtree(NINJA_PATH, ignore_errors=True)
   print 'Done.'
 
   retcode = 0