Teach update.sh how to optionally install clang-tools-extra.

tools/clang/scripts/update.sh

Index: tools/clang/scripts/update.sh
diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh
index 2700001d62173ac12c61335b2d88d6051e6ac353..372e10ee56f0219cdca8a014b85e7cd70d2c808b 100755
--- a/tools/clang/scripts/update.sh
+++ b/tools/clang/scripts/update.sh
@@ -15,6 +15,7 @@ LLVM_DIR="${THIS_DIR}/../../../third_party/llvm"
 LLVM_BUILD_DIR="${LLVM_DIR}/../llvm-build"
 LLVM_BOOTSTRAP_DIR="${LLVM_DIR}/../llvm-bootstrap"
 CLANG_DIR="${LLVM_DIR}/tools/clang"
+CLANG_TOOLS_EXTRA_DIR="${CLANG_DIR}/tools/extra"
 COMPILER_RT_DIR="${LLVM_DIR}/projects/compiler-rt"
 ANDROID_NDK_DIR="${LLVM_DIR}/../android_tools/ndk"
 STAMP_FILE="${LLVM_BUILD_DIR}/cr_build_revision"
@@ -33,6 +34,7 @@ mac_only=
 run_tests=
 bootstrap=
 with_android=yes
+with_tools_extra=
 if [[ "${OS}" = "Darwin" ]]; then
   with_android=
 fi
@@ -54,6 +56,9 @@ while [[ $# > 0 ]]; do
     --without-android)
       with_android=
       ;;
+    --with-tools-extra)
+      with_tools_extra=yes
+      ;;
     --help)
       echo "usage: $0 [--force-local-build] [--mac-only] [--run-tests] "
       echo "--bootstrap: First build clang with CC, then with itself."
@@ -61,6 +66,7 @@ while [[ $# > 0 ]]; do
       echo "--mac-only: Do initial download only on Mac systems."
       echo "--run-tests: Run tests after building. Only for local builds."
       echo "--without-android: Don't build ASan Android runtime library."
+      echo "--with-extras: Also checkout the clang-tools-extra repository."
       exit 1
       ;;
   esac
@@ -236,6 +242,13 @@ echo Getting compiler-rt r"${CLANG_REVISION}" in "${COMPILER_RT_DIR}"
 svn co --force "${LLVM_REPO_URL}/compiler-rt/trunk@${CLANG_REVISION}" \
                "${COMPILER_RT_DIR}"
 
+if [[ -n "${with_tools_extra}" ]]; then
+  echo Getting clang-tools-extra r"${CLANG_REVISION}" in \
+       "${CLANG_TOOLS_EXTRA_DIR}"
+  svn co --force "${LLVM_REPO_URL}/clang-tools-extra/trunk@${CLANG_REVISION}" \
+                 "${CLANG_TOOLS_EXTRA_DIR}"
+fi

[Nico, 2013/02/12 00:28:08]

What should happen if you build with --with-tools-extra once and then don't pass
it the next time round? As is, you'll end up with an inconsistent checkout. This
should either rm -rf the tools/extra dir again or update tools/extra if it
exists.

[dcheng, 2013/02/12 02:00:41]

Good point. I've updated this to rm -rf if --with-tools-extra is not passed
again. I also fixed a stale comment in the --help.

+
 # Echo all commands.
 set -x