[PATCH] D23787: Add builder for clang extra tools Sphinx docs

[Alexander Kornienko via cfe-commits]

This revision was automatically updated to reflect the committed changes.
alexfh marked an inline comment as done.
Closed by commit rL279624: Add builder for clang extra tools Sphinx docs (authored by alexfh).

Changed prior to commit:
  https://reviews.llvm.org/D23787?vs=68967&id=69110#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D23787

Files:
  zorg/trunk/buildbot/osuosl/master/config/builders.py
  zorg/trunk/zorg/buildbot/builders/SphinxDocsBuilder.py

Index: zorg/trunk/zorg/buildbot/builders/SphinxDocsBuilder.py
===================================================================
--- zorg/trunk/zorg/buildbot/builders/SphinxDocsBuilder.py
+++ zorg/trunk/zorg/buildbot/builders/SphinxDocsBuilder.py
@@ -6,18 +6,20 @@
 from zorg.buildbot.commands.NinjaCommand import NinjaCommand
 
 def getSphinxDocsBuildFactory(
-        llvm_html   = False, # Build LLVM HTML documentation
-        llvm_man    = False, # Build LLVM man pages
-        clang_html  = False, # Build Clang HTML documentation
-        lld_html    = False, # Build LLD HTML documentation
-        libcxx_html = False  # Build Libc++ HTML documentation
+        llvm_html         = False, # Build LLVM HTML documentation
+        llvm_man          = False, # Build LLVM man pages
+        clang_html        = False, # Build Clang HTML documentation
+        clang_tools_html  = False, # Build Clang Extra Tools HTML documentation
+        lld_html          = False, # Build LLD HTML documentation
+        libcxx_html       = False  # Build Libc++ HTML documentation
         ):
 
     f = buildbot.process.factory.BuildFactory()
 
     llvm_srcdir = 'llvm/src'
     llvm_objdir = 'llvm/build'
     clang_srcdir = llvm_srcdir + '/tools/clang'
+    clang_tools_srcdir = llvm_srcdir + '/tools/clang/tools/extra'
     lld_srcdir = llvm_srcdir + '/tools/lld'
     libcxx_srcdir = llvm_srcdir + '/projects/libcxx'
     libcxxabi_srcdir = llvm_srcdir + '/projects/libcxxabi'
@@ -37,6 +39,13 @@
                       defaultBranch='trunk',
                       workdir=clang_srcdir))
 
+    if clang_tools_html:
+        f.addStep(SVN(name='svn-clang-tools',
+                      mode='update',
+                      baseURL='http://llvm.org/svn/llvm-project/clang-tools-extra/',
+                      defaultBranch='trunk',
+                      workdir=clang_tools_srcdir))
+
     if lld_html:
         f.addStep(SVN(name='svn-lld',
                       mode='update',
@@ -99,6 +108,14 @@
                                targets=['docs-clang-html']
                               ))
 
+    if clang_tools_html:
+        f.addStep(NinjaCommand(name="docs-clang-tools-html",
+                               haltOnFailure=True,
+                               description=["Build Clang Extra Tools Sphinx HTML documentation"],
+                               workdir=llvm_objdir,
+                               targets=['docs-clang-tools-html']
+                              ))
+
     if lld_html:
         f.addStep(NinjaCommand(name="docs-lld-html",
                                haltOnFailure=True,
Index: zorg/trunk/buildbot/osuosl/master/config/builders.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py
@@ -1140,6 +1140,13 @@
                'category' : 'clang'
              },
              {
+               'name':"clang-tools-sphinx-docs",
+               'slavenames':["gribozavr4"],
+               'builddir':"clang-tools-sphinx-docs",
+               'factory': SphinxDocsBuilder.getSphinxDocsBuildFactory(clang_tools_html=True),
+               'category' : 'clang'
+             },
+             {
                'name':"lld-sphinx-docs",
                'slavenames':["gribozavr4"],
                'builddir':"lld-sphinx-docs",


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D23787.69110.patch
Type: text/x-patch
Size: 3402 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20160824/364a83ce/attachment-0001.bin>