[zorg] r209931 - buildbot: Remove C++11 config options and builder

[Justin Bogner]

Author: bogner
Date: Fri May 30 18:25:46 2014
New Revision: 209931

URL: http://llvm.org/viewvc/llvm-project?rev=209931&view=rev
Log:
buildbot: Remove C++11 config options and builder

Building with C++11 has been the default for some time now, and the
--enable-cxx11 flag doesn't even exist anymore. This removes the
support for it and the redundant builder that was using this.

Modified:
    zorg/trunk/buildbot/llvmlab/master/config/builderconstruction.py
    zorg/trunk/buildbot/llvmlab/master/config/phase_config.py
    zorg/trunk/zorg/buildbot/builders/ClangBuilder.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=209931&r1=209930&r2=209931&view=diff
==============================================================================
--- zorg/trunk/buildbot/llvmlab/master/config/builderconstruction.py (original)
+++ zorg/trunk/buildbot/llvmlab/master/config/builderconstruction.py Fri May 30 18:25:46 2014
@@ -33,8 +33,6 @@ def construct(name):
             kind += '-lto'
         elif 'incremental' in name:
             kind += '-incremental'
-        if 'cxx11' in name:
-            kind += '-cxx11'
     else:
         if '_' not in name:
             raise ValueError, "invalid builder name: %r" % name
@@ -69,9 +67,8 @@ def construct(name):
     return builder
 
 def construct_compiler_builder_from_name(name, use_lto=False,
-                                         incremental=False,
-                                         use_cxx11=False):
-    
+                                         incremental=False):
+
     # Compiler builds are named following:
     #   <compiler>-<host arch>-<host os>-[<build cc>-]<build style>.
     # if <build cc> is unspecified, then the most recent validated build 
@@ -118,15 +115,15 @@ def construct_compiler_builder_from_name
     config_options = ['--build=%s' % target_triple,
                       '--host=%s' % target_triple]
 
-    if build_style in ['DA', 'DAlto', 'DAincremental', 'DAincrementalcxx11']:
+    if build_style in ['DA', 'DAlto', 'DAincremental']:
         build_config = "Debug+Asserts"
         config_options.extend(['--disable-optimized'])
         config_options.extend(['--enable-assertions'])
-    elif build_style in ['RA', 'RAlto', 'RAincremental', 'RAincrementalcxx11']:
+    elif build_style in ['RA', 'RAlto', 'RAincremental']:
         build_config = "Release+Asserts"
         config_options.extend(['--enable-optimized'])
         config_options.extend(['--enable-assertions'])
-    elif build_style in ['R', 'Rlto', 'Rincremental', 'Rincrementalcxx11']:
+    elif build_style in ['R', 'Rlto', 'Rincremental']:
         build_config = "Release"
         config_options.extend(['--enable-optimized'])
         config_options.extend(['--disable-assertions'])
@@ -144,8 +141,7 @@ def construct_compiler_builder_from_name
         return { 'factory' : ClangBuilder.phasedClang(config_options,
                                          is_bootstrap=(build_cc is None),
                                          use_lto=use_lto,
-                                         incremental=incremental,
-                                         use_cxx11=use_cxx11) }
+                                         incremental=incremental) }
     elif compiler == 'llvm-gcc':
         # Currently, llvm-gcc builders do their own two-stage build,
         # they don't use any prebuilt artifacts.
@@ -243,10 +239,6 @@ def construct_lto_compiler_builder_from_
 def construct_incremental_compiler_build_from_name(name):
     return construct_compiler_builder_from_name(name, incremental=True)    
 
-def construct_incremental_cxx11_compiler_build_from_name(name):
-    return construct_compiler_builder_from_name(name, incremental=True,
-                                                use_cxx11=True)
-
 def construct_libcxx_builder_from_name(name):
     # libcxx builds are named following:
     #   libcxx_<compiler under test>
@@ -260,8 +252,6 @@ builder_kinds = {
                   'compile-lto' : construct_lto_compiler_builder_from_name,
                   'compile-incremental' :
                       construct_incremental_compiler_build_from_name,
-                  'compile-incremental-cxx11' :
-                      construct_incremental_cxx11_compiler_build_from_name,
                   'lnt' : construct_lnt_builder_from_name,
                   'lldb' : construct_lldb_builder_from_name,
                   'libcxx' : construct_libcxx_builder_from_name }

Modified: zorg/trunk/buildbot/llvmlab/master/config/phase_config.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/llvmlab/master/config/phase_config.py?rev=209931&r1=209930&r2=209931&view=diff
==============================================================================
--- zorg/trunk/buildbot/llvmlab/master/config/phase_config.py (original)
+++ zorg/trunk/buildbot/llvmlab/master/config/phase_config.py Fri May 30 18:25:46 2014
@@ -130,7 +130,6 @@ phase4_builders = []
 
 #phase4_builders.append(experimental('lldb_clang-x86_64-darwin12-RA', ['lab-mini-02']))
 phase4_builders.append(test('libcxx_clang-x86_64-darwin11-RA', phase4_slaves))
-phase4_builders.append(build('clang-x86_64-darwin11-RAincrementalcxx11', phase4_slaves))
 #phase4_builders.append(test('libcxx_clang-x86_64-darwin12-RA', ['lab-mini-02']))
 
 phases.append(

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=209931&r1=209930&r2=209931&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Fri May 30 18:25:46 2014
@@ -651,7 +651,7 @@ from zorg.buildbot.builders.Util import
 from buildbot.steps.source.svn import SVN as HostSVN
 
 def phasedClang(config_options, is_bootstrap=True, use_lto=False,
-                incremental=False, use_cxx11=False):
+                incremental=False):
     # Create an instance of the Builder.
     f = buildbot.process.factory.BuildFactory()
     # Determine the build directory.
@@ -820,9 +820,6 @@ def phasedClang(config_options, is_boots
         configure_args.append(
           '--with-extra-options=-flto -gline-tables-only')
     
-    if use_cxx11:
-        configure_args.extend(['--enable-cxx11', '--enable-libcpp'])
-
     # Configure the LLVM build.
     if incremental:
         # *NOTE* This is a temporary work around. I am eventually going to just