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

[Eric Fiselier via llvm-commits]

EricWF created this revision.
EricWF added reviewers: delcypher, silvas.
EricWF added subscribers: llvm-commits, cfe-commits.

http://reviews.llvm.org/D12265

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

Index: zorg/buildbot/builders/SphinxDocsBuilder.py
===================================================================
--- zorg/buildbot/builders/SphinxDocsBuilder.py
+++ zorg/buildbot/builders/SphinxDocsBuilder.py
@@ -6,10 +6,11 @@
 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 @@
     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 @@
                       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 @@
                                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
Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -1161,6 +1161,13 @@
                '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():
@@ -1331,7 +1338,7 @@
  'slavenames' :["lab-mini-03"],
  'builddir' :"clang-x86_64-darwin10-nt-O0-g",
  'factory' : LNTBuilder.getLNTFactory(triple='x86_64-apple-darwin10',
-                                      nt_flags=['--multisample=3', 
+                                      nt_flags=['--multisample=3',
                                                 '--optimize-option',
                                                 '-O0', '--cflag', '-g'],
                                       jobs=2,  use_pty_in_tests=True,


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D12265.32905.patch
Type: text/x-patch
Size: 3901 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150822/164eb46c/attachment.bin>