[zorg] r204532 - libiomp5 builder script: use a named source directory so that svn checkout

Dmitri Gribenko gribozavr at gmail.com
Fri Mar 21 16:53:22 PDT 2014


Author: gribozavr
Date: Fri Mar 21 18:53:22 2014
New Revision: 204532

URL: http://llvm.org/viewvc/llvm-project?rev=204532&view=rev
Log:
libiomp5 builder script: use a named source directory so that svn checkout
succeeds

Modified:
    zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py

Modified: zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py?rev=204532&r1=204531&r2=204532&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py Fri Mar 21 18:53:22 2014
@@ -14,6 +14,8 @@ def getLibiomp5BuildFactory(clean=True,
         'TERM' : 'dumb' # Make sure Clang doesn't use color escape sequences.
                  }
 
+    openmp_srcdir = "openmp.src"
+
     f = buildbot.process.factory.BuildFactory()
 
     # Determine the build directory.
@@ -29,7 +31,7 @@ def getLibiomp5BuildFactory(clean=True,
                   mode='update',
                   baseURL='http://llvm.org/svn/llvm-project/openmp',
                   defaultBranch='trunk',
-                  workdir='.'))
+                  workdir=openmp_srcdir))
 
     # Clean directory, if requested.
     if clean:
@@ -37,7 +39,7 @@ def getLibiomp5BuildFactory(clean=True,
                                command=["make", "clean"],
                                haltOnFailure=True,
                                description=["make clean"],
-                               workdir="runtime",
+                               workdir='%s/runtime' % openmp_srcdir,
                                env=merged_env))
 
     makeCommand = [
@@ -50,6 +52,6 @@ def getLibiomp5BuildFactory(clean=True,
                            description=["make build"],
                            haltOnFailure=True,
                            command=WithProperties(" ".join(makeCommand)),
-                           workdir='runtime',
+                           workdir='%s/runtime' % openmp_srcdir,
                            env=merged_env))
     return f





More information about the llvm-commits mailing list