[zorg] r235760 - zorg: update repository layout for libunwind

[Saleem Abdulrasool]

Author: compnerd
Date: Fri Apr 24 14:43:14 2015
New Revision: 235760

URL: http://llvm.org/viewvc/llvm-project?rev=235760&view=rev
Log:
zorg: update repository layout for libunwind

This updates the buildbot steps for the new libunwind project separation.
Thanks to Jonathan Roelofs for this patch!

Modified:
    zorg/trunk/buildbot/osuosl/master/master.cfg
    zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py
    zorg/trunk/zorg/buildbot/builders/SanitizerBuilderII.py
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh

Modified: zorg/trunk/buildbot/osuosl/master/master.cfg
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/master.cfg?rev=235760&r1=235759&r2=235760&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/master.cfg (original)
+++ zorg/trunk/buildbot/osuosl/master/master.cfg Fri Apr 24 14:43:14 2015
@@ -45,6 +45,7 @@ c['change_source'].append(LLVMPoller(pro
     "compiler-rt",
     "libcxx",
     "libcxxabi",
+    "libunwind",
     "lld",
     "lldb",
     "llgo",
@@ -158,6 +159,7 @@ c['schedulers'].append(SingleBranchSched
                                 "compiler-rt",
                                 "libcxx",
                                 "libcxxabi",
+                                "libunwind",
                                 "lld"])))
 
 c['schedulers'].append(SingleBranchScheduler(name="openmp_scheduler",
@@ -171,7 +173,8 @@ c['schedulers'].append(SingleBranchSched
                             builderNames=get_all_for("libcxx"),
                             change_filter=depends_on([
                                 "libcxx",
-                                "libcxxabi"])))
+                                "libcxxabi",
+                                "libunwind"])))
 
 c['schedulers'].append(SingleBranchScheduler(name="llgo_scheduler",
                             treeStableTimer=2*60,

Modified: zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py?rev=235760&r1=235759&r2=235760&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py Fri Apr 24 14:43:14 2015
@@ -24,6 +24,8 @@ def getLibcxxWholeTree(f, src_root):
         '%(builddir)s/llvm/projects/libcxx')
     libcxxabi_path = properties.WithProperties(
         '%(builddir)s/llvm/projects/libcxxabi')
+    libunwind_path = properties.WithProperties(
+        '%(builddir)s/llvm/projects/libunwind')
 
     f = phased_builder_utils.SVNCleanupStep(f, llvm_path)
     f.addStep(SVN(name='svn-llvm',
@@ -41,6 +43,12 @@ def getLibcxxWholeTree(f, src_root):
                   baseURL='http://llvm.org/svn/llvm-project/libcxxabi/',
                   defaultBranch='trunk',
                   workdir=libcxxabi_path))
+    f.addStep(SVN(name='svn-libunwind',
+                  mode='full',
+                  baseURL='http://llvm.org/svn/llvm-project/libunwind/',
+                  defaultBranch='trunk',
+                  workdir=libunwind_path))
+
     return f
 
 

Modified: zorg/trunk/zorg/buildbot/builders/SanitizerBuilderII.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/SanitizerBuilderII.py?rev=235760&r1=235759&r2=235760&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/SanitizerBuilderII.py (original)
+++ zorg/trunk/zorg/buildbot/builders/SanitizerBuilderII.py Fri Apr 24 14:43:14 2015
@@ -65,7 +65,7 @@ def getSanitizerBuildFactoryII(
                                workdir=".",
                                env=merged_env))
 
-    # Get llvm, clang, ompiler-rt, libcxx, libcxxabi
+    # Get llvm, clang, ompiler-rt, libcxx, libcxxabi, libunwind
     f.addStep(SVN(name='svn-llvm',
                   mode='update',
                   description='svn-llvm',
@@ -106,6 +106,14 @@ def getSanitizerBuildFactoryII(
                   defaultBranch='trunk',
                   workdir='%s/projects/libcxxabi' % llvm_srcdir))
 
+    f.addStep(SVN(name='svn-libunwind',
+                  mode='update',
+                  description='svn-libunwind',
+                  descriptionDone='svn-libunwind',
+                  baseURL='http://llvm.org/svn/llvm-project/libunwind/',
+                  defaultBranch='trunk',
+                  workdir='%s/projects/libunwind' % llvm_srcdir))
+
 
     lint_script = os.path.join("..", llvm_srcdir, "projects", "compiler-rt",
                                     "lib", "sanitizer_common", "scripts",

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh?rev=235760&r1=235759&r2=235760&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh Fri Apr 24 14:43:14 2015
@@ -35,6 +35,7 @@ function buildbot_update {
     update_or_checkout "$rev_arg" http://llvm.org/svn/llvm-project/compiler-rt/trunk llvm/projects/compiler-rt
     update_or_checkout "$rev_arg" http://llvm.org/svn/llvm-project/libcxx/trunk llvm/projects/libcxx
     update_or_checkout "$rev_arg" http://llvm.org/svn/llvm-project/libcxxabi/trunk llvm/projects/libcxxabi
+    update_or_checkout "$rev_arg" http://llvm.org/svn/llvm-project/libunwind/trunk llvm/projects/libunwind
     update_or_checkout "$rev_arg" http://llvm.org/svn/llvm-project/lld/trunk llvm/tools/lld
 }