[llvm-commits] [zorg] r135386 - /zorg/trunk/zorg/buildbot/builders/PollyBuilder.py

[Tobias Grosser]

Author: grosser
Date: Mon Jul 18 05:55:11 2011
New Revision: 135386

URL: http://llvm.org/viewvc/llvm-project?rev=135386&view=rev
Log:
Some tweaks for new Polly Builder

- Always check out the latest version of isl and CLooG (Otherwise we
  try to check out the svn revision numbers)
- Take advantage of possible concurrency by using -j%jobs
- Do not fail, if the builddir already exists.

Modified:
    zorg/trunk/zorg/buildbot/builders/PollyBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/PollyBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/PollyBuilder.py?rev=135386&r1=135385&r2=135386&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/PollyBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/PollyBuilder.py Mon Jul 18 05:55:11 2011
@@ -17,11 +17,13 @@
     # Get Cloog
     f.addStep(Git(repourl='git://repo.or.cz/cloog.git',
                   mode='update',
-                  workdir=cloog_srcdir))
+                  workdir=cloog_srcdir,
+		  alwaysUseLatest=True))
     # Get isl
     f.addStep(Git(repourl='git://repo.or.cz/isl.git',
                   mode='update',
-                  workdir=isl_srcdir))
+                  workdir=isl_srcdir,
+		  alwaysUseLatest=True))
     # Build isl
     f.addStep(ShellCommand(name="autogen-isl",
                                command=["./autogen.sh"],
@@ -38,7 +40,7 @@
                         workdir=isl_srcdir,
                         description=['isl-configure']))
     f.addStep(ShellCommand(name="build-isl",
-                               command=["make"],
+                               command=["make", WithProperties("-j%s" % jobs)],
                                haltOnFailure=True,
                                description=["build isl"],
                                workdir=isl_srcdir))
@@ -66,7 +68,7 @@
                         workdir=cloog_srcdir,
                         description=['cloog-configure']))
     f.addStep(ShellCommand(name="build-cloog",
-                               command=["make"],
+                               command=["make", WithProperties("-j%s" % jobs)],
                                haltOnFailure=True,
                                description=["build cloog"],
                                workdir=cloog_srcdir))
@@ -103,7 +105,7 @@
                   workdir='%s/tools/polly' % llvm_srcdir))
     # Create configuration files with cmake
     f.addStep(ShellCommand(name="create-build-dir",
-                               command=["mkdir", llvm_objdir],
+                               command=["mkdir", "-p", llvm_objdir],
                                haltOnFailure=False,
                                description=["create build dir"],
                                workdir="."))
@@ -116,7 +118,7 @@
                                workdir=llvm_objdir))
     # Build Polly
     f.addStep(ShellCommand(name="build_polly",
-                               command=["make"],
+                               command=["make", WithProperties("-j%s" % jobs)],
                                haltOnFailure=True,
                                description=["build polly"],
                                workdir=llvm_objdir))