diff options
| author | bradnelson@google.com <bradnelson@google.com@78cadc50-ecff-11dd-a971-7dbc132099af> | 2012-01-15 04:48:37 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@78cadc50-ecff-11dd-a971-7dbc132099af> | 2012-01-15 04:48:37 +0000 |
| commit | 07356616e1c5d8782b6711baef1afa7c9829254b (patch) | |
| tree | ed04883070917492e643db903968303da214f88e /buildbot | |
| parent | dd4fa4f03a00f96917f91cd6caac42facbe03cd4 (diff) | |
| download | gyp-07356616e1c5d8782b6711baef1afa7c9829254b.tar.gz | |
Dropping ninja download + compile phase.
BUG=None
TEST=None
R=thakis@google.com
Review URL: http://codereview.chromium.org/9133022
git-svn-id: http://gyp.googlecode.com/svn/trunk@1162 78cadc50-ecff-11dd-a971-7dbc132099af
Diffstat (limited to 'buildbot')
| -rwxr-xr-x | buildbot/buildbot_run.py | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/buildbot/buildbot_run.py b/buildbot/buildbot_run.py index 4594afec..e0fda368 100755 --- a/buildbot/buildbot_run.py +++ b/buildbot/buildbot_run.py @@ -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.py', 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 (shutil.Error, IOError, OSError, CalledProcessError), 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 |