[llvm-branch-commits] [llvm] f0b442c - [release] Use a supported way of building libc++ when building the documentation

[Louis Dionne via llvm-branch-commits]

Author: Louis Dionne
Date: 2022-02-14T18:06:42-05:00
New Revision: f0b442c8ac58bbd40489defd2f3d65ff0b02b09c

URL: https://github.com/llvm/llvm-project/commit/f0b442c8ac58bbd40489defd2f3d65ff0b02b09c
DIFF: https://github.com/llvm/llvm-project/commit/f0b442c8ac58bbd40489defd2f3d65ff0b02b09c.diff

LOG: [release] Use a supported way of building libc++ when building the documentation

Instead of using the deprecated LLVM_ENABLE_PROJECTS build, use the
default runtimes build. This is just as fast, but it's supported.

Differential Revision: https://reviews.llvm.org/D119275

(cherry picked from commit f34f7dfe3a3d8a6ec2c582f5672c3ca37d9aed7c)

Added: 
    

Modified: 
    llvm/utils/release/build-docs.sh

Removed: 
    


################################################################################
diff  --git a/llvm/utils/release/build-docs.sh b/llvm/utils/release/build-docs.sh
index 8b12a4526e13..6d416e4830e6 100755
--- a/llvm/utils/release/build-docs.sh
+++ b/llvm/utils/release/build-docs.sh
@@ -90,7 +90,7 @@ if [ -n "$release" ]; then
 fi
 
 cmake -G Ninja $srcdir -B $builddir \
-               -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld;libcxx;polly;flang" \
+               -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld;polly;flang" \
                -DCMAKE_BUILD_TYPE=Release \
                -DLLVM_ENABLE_DOXYGEN=ON \
                -DLLVM_ENABLE_SPHINX=ON \
@@ -102,7 +102,6 @@ ninja -C $builddir \
                docs-clang-html \
                docs-clang-tools-html \
                docs-flang-html \
-               docs-libcxx-html \
                docs-lld-html \
                docs-llvm-html \
                docs-polly-html \
@@ -113,6 +112,13 @@ ninja -C $builddir \
                doxygen-mlir \
                doxygen-polly
 
+cmake -G Ninja $srcdir/../runtimes -B $builddir/runtimes-doc \
+               -DLLVM_ENABLE_RUNTIMES="libcxx" \
+               -DLLVM_ENABLE_SPHINX=ON \
+               -DSPHINX_WARNINGS_AS_ERRORS=OFF
+
+ninja -C $builddir/runtimes-doc \
+               docs-libcxx-html \
 
 package_doxygen llvm .
 package_doxygen clang tools/clang
@@ -121,7 +127,13 @@ package_doxygen flang tools/flang
 
 html_dir=$builddir/html-export/
 
-for d in docs/ tools/clang/docs/ tools/lld/docs/ tools/clang/tools/extra/docs/ projects/libcxx/docs/ tools/polly/docs/ tools/flang/docs/; do
+for d in docs/ tools/clang/docs/ tools/lld/docs/ tools/clang/tools/extra/docs/ tools/polly/docs/ tools/flang/docs/; do
   mkdir -p $html_dir/$d
   mv $builddir/$d/html/* $html_dir/$d/
 done
+
+# Keep the documentation for the runtimes under /projects/ to avoid breaking existing links.
+for d in libcxx/docs/; do
+  mkdir -p $html_dir/projects/$d
+  mv $builddir/runtimes-doc/$d/html/* $html_dir/projects/$d/
+done