Add builder for clang extra tools Sphinx docs

[alexfh]

Summary

Cargo-culted from clang docs builder. Should work, but I haven't tried.

[gribozavr]

Just one comment about the workdir.

zorg/buildbot/builders/SphinxDocsBuilder.py

46 ↗

(On Diff #68936)

I think workdir should be clang_tools_srcdir, which should be set appropriately in the code above.

[alexfh]

• Set proper working directory and build step name for clang extra tools SVN checkout.

[alexfh]

zorg/buildbot/builders/SphinxDocsBuilder.py

46 ↗

(On Diff #68936)

Oops, I knew something was wrong. Fixed this and the build step name.

[gribozavr]

Thanks, LGTM!

[alexfh]

Do you know whether build slaves should pick this configuration change up automatically?

[gribozavr]

We need to ask Galina Kistanova to reload the configuration.

[gribozavr]

Here's the new builder: http://lab.llvm.org:8011/builders/clang-tools-sphinx-docs

Fails with ninja: error: unknown target 'docs-clang-tools-html'.

[alexfh]

In D23787#527369, @gribozavr wrote:

Here's the new builder: http://lab.llvm.org:8011/builders/clang-tools-sphinx-docs

Fails with ninja: error: unknown target 'docs-clang-tools-html'.

I hope, D24024 should fix the issue.

zorg/trunk/buildbot/osuosl/master/config/builders.py

return [
              {
                'name':"clang-sphinx-docs",
                'slavenames':["gribozavr4"],
                'builddir':"clang-sphinx-docs",
                'factory': SphinxDocsBuilder.getSphinxDocsBuildFactory(clang_html=True),
                '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",
                'factory': SphinxDocsBuilder.getSphinxDocsBuildFactory(lld_html=True),
                'category' : 'lld'
              },
              {
                'name':"libcxx-sphinx-docs",

zorg/trunk/zorg/buildbot/builders/SphinxDocsBuilder.py

 import os
 import buildbot.process.factory
 from buildbot.steps.source import SVN
 from buildbot.steps.shell import ShellCommand
 from buildbot.process.properties import WithProperties
 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'
 
     # Get LLVM. This is essential for all builds
     # because we build all subprojects in tree
     f.addStep(SVN(name='svn-llvm',
                   mode='update',
                   baseURL='http://llvm.org/svn/llvm-project/llvm/',
                   defaultBranch='trunk',
                   workdir=llvm_srcdir))
 
     if clang_html:
         f.addStep(SVN(name='svn-clang',
                       mode='update',
                       baseURL='http://llvm.org/svn/llvm-project/cfe/',
                       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',
                       baseURL='http://llvm.org/svn/llvm-project/lld/',
                       defaultBranch='trunk',
                       workdir=lld_srcdir))
 
     if libcxx_html:
def getSphinxDocsBuildFactory(
     if clang_html:
         f.addStep(NinjaCommand(name="docs-clang-html",
                                haltOnFailure=True,
                                description=["Build Clang Sphinx HTML documentation"],
                                workdir=llvm_objdir,
                                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,
                                description=["Build LLD Sphinx HTML documentation"],
                                workdir=llvm_objdir,
                                targets=['docs-lld-html']
                               ))