[llvm-commits] [zorg] r149119 - in /zorg/trunk: buildbot/osuosl/master/config/builders.py zorg/buildbot/builders/DragonEggBuilder.py

[Duncan Sands]

Author: baldrick
Date: Thu Jan 26 22:14:11 2012
New Revision: 149119

URL: http://llvm.org/viewvc/llvm-project?rev=149119&view=rev
Log:
Move the 32 bit dragonegg buildbot over to the new builder.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=149119&r1=149118&r2=149119&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Jan 26 22:14:11 2012
@@ -347,25 +347,27 @@
     return [
         {'name' : 'dragonegg-i386-linux',
          'slavenames' : ['gcc16'],
-         'builddir' : 'dragonegg-i386-linux',
-         'factory'   : ScriptedBuilder.getScriptedBuildFactory(
-                       source_code  = [SVN(name='svn-llvm',
-                                           mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm/',
-                                           defaultBranch='trunk',
-                                           workdir="llvm.src"),
-                                       SVN(name='svn-dragonegg',
-                                           mode='update', baseURL='http://llvm.org/svn/llvm-project/dragonegg/',
-                                           defaultBranch='trunk',
-                                           workdir="dragonegg.src"),],
-                       launcher     = 'dragonegg.src/extras/buildbot_self_strap-32',
-                       timeout      = 60),
-         'category'  : 'dragonegg'},
+         'builddir'   : 'dragonegg-i386-linux',
+         'factory'    : DragonEggBuilder.getDragonEggBootstrapFactory(gcc_repository='http://gcc.gnu.org/svn/gcc/branches/gcc-4_5-branch@174467',
+                                                                      extra_languages=['fortran', 'objc', 'obj-c++'],
+                                                                      extra_gcc_configure_args=['--disable-bootstrap', '--disable-multilib', '--enable-checking',
+                                                                                                '--build=i686-pc-linux-gnu', '--enable-targets=all',
+                                                                                                '--with-mpfr=/home/baldrick/cfarm-32',
+                                                                                                '--with-gmp=/home/baldrick/cfarm-32',
+                                                                                                '--with-mpc=/home/baldrick/cfarm-32',
+                                                                                                '--with-libelf=/home/baldrick/cfarm-32'],
+                                                                      extra_llvm_configure_args=['--enable-optimized', '--enable-assertions',
+                                                                                                 '--build=i686-pc-linux-gnu'],
+                                                                      env={'CC' : 'gcc -m32', 'CXX' : 'g++ -m32',
+                                                                           'LD_LIBRARY_PATH' : '/home/baldrick/cfarm-32/lib',
+                                                                           'CPPFLAGS' : '-I/home/baldrick/cfarm-32/include'}
+                                                                      , clean=True),
+         'category'   : 'dragonegg'},
 
         {'name' : 'dragonegg-x86_64-linux',
          'slavenames' : ['gcc17'],
          'builddir'   : 'dragonegg-x86_64-linux',
-         'factory'    : DragonEggBuilder.getDragonEggBootstrapFactory(triple='x86_64-linux-gnu',
-                                                                      gcc_repository='http://gcc.gnu.org/svn/gcc/branches/gcc-4_5-branch@174467',
+         'factory'    : DragonEggBuilder.getDragonEggBootstrapFactory(gcc_repository='http://gcc.gnu.org/svn/gcc/branches/gcc-4_5-branch@174467',
                                                                       extra_languages=['fortran', 'objc', 'obj-c++'],
                                                                       extra_gcc_configure_args=['--disable-bootstrap', '--disable-multilib', '--enable-checking', '--with-mpfr=/opt/cfarm/mpfr-2.4.1', '--with-gmp=/opt/cfarm/gmp-4.2.4', '--with-mpc=/opt/cfarm/mpc-0.8', '--with-libelf=/opt/cfarm/libelf-0.8.12'],
                                                                       extra_llvm_configure_args=['--enable-optimized', '--enable-assertions'],

Modified: zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py?rev=149119&r1=149118&r2=149119&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py Thu Jan 26 22:14:11 2012
@@ -21,8 +21,7 @@
       mapping['gcc_' + vals[0]] = vals[1]
   return mapping
 
-def getDragonEggBootstrapFactory(triple, gcc_repository,
-                                 extra_languages=[],
+def getDragonEggBootstrapFactory(gcc_repository, extra_languages=[],
                                  extra_gcc_configure_args=[],
                                  extra_llvm_configure_args=[],
                                  clean=True, env={}, jobs='%(jobs)s'):