[zorg] r245912 - Add libc++ documentation builder.

[Eric Fiselier via llvm-commits]

Author: ericwf
Date: Mon Aug 24 19:35:45 2015
New Revision: 245912

URL: http://llvm.org/viewvc/llvm-project?rev=245912&view=rev
Log:
Add libc++ documentation builder.

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

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=245912&r1=245911&r2=245912&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Aug 24 19:35:45 2015
@@ -1161,6 +1161,13 @@ def _get_documentation_builders():
                '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():

Modified: zorg/trunk/zorg/buildbot/builders/SphinxDocsBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/SphinxDocsBuilder.py?rev=245912&r1=245911&r2=245912&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/SphinxDocsBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/SphinxDocsBuilder.py Mon Aug 24 19:35:45 2015
@@ -6,10 +6,11 @@ from buildbot.process.properties import
 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()
@@ -18,6 +19,8 @@ def getSphinxDocsBuildFactory(
     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
@@ -41,6 +44,18 @@ def getSphinxDocsBuildFactory(
                       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
@@ -92,4 +107,12 @@ def getSphinxDocsBuildFactory(
                                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