[ZORG] Add support for libc++ to SphinxDocBuilder.py

[delcypher]

The rest LGTM

buildbot/osuosl/master/config/builders.py

1166

Is there a reason you're using the slave ericwf-buildslave2 rather than gribozavr4 which is used by the other documentation builders?

1341

This spacing change doesn't really belong in this patch

zorg/buildbot/builders/SphinxDocsBuilder.py

13

Minor nit, the `#` should probably be horizontally aligned with the others

[EricWF]

Accepting so I can commit.

buildbot/osuosl/master/config/builders.py

1166

I have my own hardware that I might as well use. I wanted to keep gribozavr's hardware as free as possible in case other people need it.

1341

I know :-( but for some reason my editor refused to leave it out.

[EricWF]

r245912.

buildbot/osuosl/master/config/builders.py

                'factory': SphinxDocsBuilder.getSphinxDocsBuildFactory(lld_html=True),
                'category' : 'lld'
              },
+             {
+               'name':"libcxx-sphinx-docs",
+               'slavenames':["ericwf-buildslave2],
+               'builddir':"libcxx-sphinx-docs",
+               'factory': SphinxDocsBuilder.getSphinxDocsBuildFactory(libcxx_html=True),
+               'category' : 'libcxx'
+             }
            ]
 
 def get_builders():

zorg/buildbot/builders/SphinxDocsBuilder.py

 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
+        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
         ):
 
     f = buildbot.process.factory.BuildFactory()

     llvm_objdir = 'llvm/build'
     clang_srcdir = llvm_srcdir + '/tools/clang'
     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

                       defaultBranch='trunk',
                       workdir=lld_srcdir))
 
+    if libcxx_html:
+        f.addStep(SVN(name='svn-libcxx',
+                      mode='update',
+                      baseURL='http://llvm.org/svn/llvm-project/libcxx/',
+                      defaultBranch='trunk',
+                      workdir=libcxx_srcdir))
+        f.addStep(SVN(name='svn-libcxxabi',
+                      mode='update',
+                      baseURL='http://llvm.org/svn/llvm-project/libcxxabi/',
+                      defaultBranch='trunk',
+                      workdir=libcxxabi_srcdir))
+
     f.addStep(ShellCommand(name="create-build-dir",
                                command=["mkdir", "-p", llvm_objdir],
                                haltOnFailure=False, # We might of already created the directory in a previous build

                                targets=['docs-lld-html']
                               ))
 
+    if libcxx_html:
+        f.addStep(NinjaCommand(name="docs-libcxx-html",
+                               haltOnFailure=True,
+                               description=["Build Libc++ Sphinx HTML documentation"],
+                               workdir=llvm_objdir,
+                               targets=['docs-libcxx-html']
+                              ))
+
     return f