[llvm-commits] [zorg] r100795 - /zorg/trunk/zorg/buildbot/builders/ClangBuilder.py

[Daniel Dunbar]

Author: ddunbar
Date: Thu Apr  8 13:29:38 2010
New Revision: 100795

URL: http://llvm.org/viewvc/llvm-project?rev=100795&view=rev
Log:
buildbot: Add a completely_clean argument to the Clang builder, and allow cmake
path to be overridden for Win32 Clang builder.


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

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=100795&r1=100794&r2=100795&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Thu Apr  8 13:29:38 2010
@@ -16,7 +16,8 @@
 def getClangBuildFactory(triple=None, clean=True, test=True, package_dst=None,
                          run_cxx_tests=False, examples=False, valgrind=False,
                          valgrindLeakCheck=False, outOfDir=False, useTwoStage=False,
-                         always_install=False, make='make', jobs="%(jobs)s",
+                         completely_clean=False, always_install=False,
+                         make='make', jobs="%(jobs)s",
                          stage1_config='Debug', stage2_config='Release',
                          extra_configure_args=[]):
     # Don't use in-dir builds with a two stage build process.
@@ -44,6 +45,14 @@
                                                description="set build dir",
                                                workdir="."))
 
+    # Blow away completely, if requested.
+    if completely_clean:
+        f.addStep(ShellCommand(name="rm-llvm.src",
+                               command=["rm", "-rf", llvm_srcdir],
+                               haltOnFailure=True,
+                               description=["rm src dir", "llvm"],
+                               workdir="."))
+
     # Checkout sources.
     f.addStep(SVN(name='svn-llvm',
                   mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm/',
@@ -225,7 +234,8 @@
 
     return f
 
-def getClangMSVCBuildFactory(update=True, clean=True, vcDrive='c', jobs=1):
+def getClangMSVCBuildFactory(update=True, clean=True, vcDrive='c', jobs=1,
+                             cmake=r"c:\Program Files\CMake 2.6\bin\cmake"):
     f = buildbot.process.factory.BuildFactory()
 
     if update:
@@ -260,7 +270,7 @@
     # Use batch files instead of ShellCommand directly, Windows quoting is
     # borked. FIXME: See buildbot ticket #595 and buildbot ticket #377.
     f.addStep(BatchFileDownload(name='cmakegen',
-                                command=[r"c:\Program Files\CMake 2.6\bin\cmake",
+                                command=[cmake,
                                          "-DLLVM_TARGETS_TO_BUILD:=X86",
                                          "-G",
                                          "Visual Studio 9 2008",