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

[Daniel Dunbar]

Author: ddunbar
Date: Sun Mar 28 17:25:31 2010
New Revision: 99784

URL: http://llvm.org/viewvc/llvm-project?rev=99784&view=rev
Log:
ClangBuilder: Add always_install parameter, for forcing stage1 install.

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=99784&r1=99783&r2=99784&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Sun Mar 28 17:25:31 2010
@@ -16,7 +16,7 @@
 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,
-                         make='make', jobs="%(jobs)s",
+                         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.
@@ -24,7 +24,10 @@
     if inDir:
         llvm_srcdir = "llvm"
         llvm_1_objdir = "llvm"
-        llvm_1_installdir = None
+        if always_install:
+            llvm_1_installdir = "llvm.install"
+        else:
+            llvm_1_installdir = None
     else:
         llvm_srcdir = "llvm.src"
         llvm_1_objdir = "llvm.obj"
@@ -126,12 +129,17 @@
 
     # Install llvm and clang.
     if llvm_1_installdir:
-        f.addStep(WarningCountingShellCommand(name="install.llvm.1",
-                                              command=['nice', '-n', '10',
-                                                       make, WithProperties("-j%s" % jobs),
-                                                       'install'],
+        f.addStep(ShellCommand(name="rm-install.clang.stage1",
+                               command=["rm", "-rf", llvm_1_installdir],
+                               haltOnFailure=True,
+                               description=["rm install dir", "clang"],
+                               workdir="."))
+        f.addStep(WarningCountingShellCommand(name="install.clang.stage1",
+                                              command = ['nice', '-n', '10',
+                                                         make, 'install-clang'],
                                               haltOnFailure=True,
-                                              description=["install", "llvm & clang"],
+                                              description=["install", "clang",
+                                                           stage1_config],
                                               workdir=llvm_1_objdir))
 
     if not useTwoStage:
@@ -181,6 +189,11 @@
                                    workdir='%s/tools/clang' % llvm_2_objdir))
 
     # Install clang (stage 2).
+    f.addStep(ShellCommand(name="rm-install.clang.stage2",
+                           command=["rm", "-rf", llvm_2_installdir],
+                           haltOnFailure=True,
+                           description=["rm install dir", "clang"],
+                           workdir="."))
     f.addStep(WarningCountingShellCommand(name="install.clang.stage2",
                                           command = ['nice', '-n', '10',
                                                      make, 'install-clang'],