[llvm-commits] [zorg] r103628 - /zorg/trunk/buildbot/osuosl/master/config/builders.py

[Galina Kistanova]

Author: gkistanova
Date: Wed May 12 13:01:59 2010
New Revision: 103628

URL: http://llvm.org/viewvc/llvm-project?rev=103628&view=rev
Log:
Added new buildbot builder for native build (x86_64-apple-darwin10) of cross llvm-gcc (for i686-pc-mingw32); updated llvm-gcc-x86_64-darwin10-cross-mingw32 build to use build-4-mingw32 script

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.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=103628&r1=103627&r2=103628&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed May 12 13:01:59 2010
@@ -253,6 +253,39 @@
                                                          extra_configure_args=['--disable-multilib']),
          'category' : 'llvm-gcc.exp' },
 
+        {'name'      : "llvm-gcc-x86_64-darwin10-self-mingw32",
+         'slavenames': [ "kistanova1" ],
+         'builddir'  : "llvm-gcc-x86_64-darwin10-self-mingw32",
+         '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-llvm-gcc',
+                                           mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm-gcc-4.2/',
+                                           defaultBranch='trunk',
+                                           workdir="llvm-gcc.src"),],
+                       launcher     = 'llvm-gcc.src/extras/buildbot-launcher',
+                       build_script = 'llvm-gcc.src/extras/build-4-mingw32',
+                       extra_args   = [],
+                       build_steps  = [{'name'          : 'configure_llvm',
+                                        'description'   : 'Configure LLVM',
+                                        'haltOnFailure' : True },
+                                       {'name'          : 'make_llvm',
+                                        'description'   : 'Make LLVM',
+                                        'extra_args'    : ['-j8'],  # Extra step-specific properties
+                                        'haltOnFailure' : True },
+                                       {'name'          : 'configure_llvmgcc',
+                                        'description'   : 'Configure LLVM-GCC',
+                                        'haltOnFailure' : True },
+                                       {'name'          : 'make_llvmgcc',
+                                        'description'   : 'Make LLVM-GCC',
+                                        'haltOnFailure' : True },
+                                       {'name'          : 'install_llvmgcc',
+                                        'description'   : 'Install LLVM-GCC',
+                                        'haltOnFailure' : True },]),
+         'category'  : 'llvm-gcc' },
+
         {'name'      : "llvm-gcc-x86_64-darwin10-cross-mingw32",
          'slavenames': [ "kistanova1" ],
          'builddir'  : "llvm-gcc-x86_64-darwin10-cross-mingw32",
@@ -266,7 +299,7 @@
                                            defaultBranch='trunk',
                                            workdir="llvm-gcc.src"),],
                        launcher     = 'llvm-gcc.src/extras/buildbot-launcher',
-                       build_script = 'llvm-gcc.src/extras/build-4-mingw32',
+                       build_script = 'llvm-gcc.src/extras/build-x-4-mingw32',
                        extra_args   = [],
                        build_steps  = [{'name'          : 'configure_llvm',
                                         'description'   : 'Configure LLVM',
@@ -275,6 +308,12 @@
                                         'description'   : 'Make LLVM',
                                         'extra_args'    : ['-j8'],  # Extra step-specific properties
                                         'haltOnFailure' : True },
+                                       {'name'          : 'test_llvm',
+                                        'description'   : 'Test LLVM',
+                                        'haltOnFailure' : False },
+                                       {'name'          : 'cross_tools',
+                                        'description'   : 'Copy cross-tools',
+                                        'haltOnFailure' : True },
                                        {'name'          : 'configure_llvmgcc',
                                         'description'   : 'Configure LLVM-GCC',
                                         'haltOnFailure' : True },