[zorg] r178431 - Renamed LibCXXBuilder.libcxx() => LibCXXBuilder.getLibCXXBuilder(). Also added the propery code to builderconstruction to handle the LibCXXBuilder.

[Michael Gottesman]

Author: mgottesman
Date: Sat Mar 30 17:10:41 2013
New Revision: 178431

URL: http://llvm.org/viewvc/llvm-project?rev=178431&view=rev
Log:
Renamed LibCXXBuilder.libcxx() => LibCXXBuilder.getLibCXXBuilder(). Also added the propery code to builderconstruction to handle the LibCXXBuilder.

Modified:
    zorg/trunk/buildbot/llvmlab/master/config/builderconstruction.py
    zorg/trunk/zorg/buildbot/builders/LibCXXBuilder.py

Modified: zorg/trunk/buildbot/llvmlab/master/config/builderconstruction.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/llvmlab/master/config/builderconstruction.py?rev=178431&r1=178430&r2=178431&view=diff
==============================================================================
--- zorg/trunk/buildbot/llvmlab/master/config/builderconstruction.py (original)
+++ zorg/trunk/buildbot/llvmlab/master/config/builderconstruction.py Sat Mar 30 17:10:41 2013
@@ -3,6 +3,7 @@ from zorg.buildbot.Artifacts import rsyn
 from zorg.buildbot.builders.ClangBuilder import getClangMSVCBuildFactory
 from zorg.buildbot.builders.ClangBuilder import phasedClang
 from zorg.buildbot.builders.LLDBBuilder import getLLDBxcodebuildFactory
+import zorg.buildbot.builders.LibCXXBuilder as LibCXXBuilder
 
 """
 Helper module to handle automatically constructing builder objects from a
@@ -229,11 +230,21 @@ def construct_lldb_builder_from_name(nam
 def construct_lto_compiler_builder_from_name(name):
     return construct_compiler_builder_from_name(name, use_lto=True)
 
+def construct_libcxx_builder_from_name(name):
+    # libcxx builds are named following:
+    #   libcxx_<compiler under test>
+    
+    cc_under_test = name
+    return { 'factory' : LibCXXBuilder.getLibCXXBuilder(),
+             'properties' : {'use_builder' : cc_under_test } }
+
+
 builder_kinds = {
                   'compile' : construct_compiler_builder_from_name,
                   'compile-lto' : construct_lto_compiler_builder_from_name,
                   'lnt' : construct_lnt_builder_from_name,
-                  'lldb' : construct_lldb_builder_from_name}
+                  'lldb' : construct_lldb_builder_from_name,
+                  'libcxx' : construct_libcxx_builder_from_name }
 
 # Testing.
 

Modified: zorg/trunk/zorg/buildbot/builders/LibCXXBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LibCXXBuilder.py?rev=178431&r1=178430&r2=178431&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LibCXXBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LibCXXBuilder.py Sat Mar 30 17:10:41 2013
@@ -9,8 +9,7 @@ import zorg.buildbot.commands.LitTestCom
 import zorg.buildbot.Artifacts
 import zorg.buildbot.PhasedBuilderUtils
 
-
-def libcxx():
+def getLibCXXBuilder():
     f = buildbot.process.factory.BuildFactory()
     
     # Grab the sources.