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

tools/clang/scripts/update.sh

 #!/usr/bin/env bash
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script will check out llvm and clang into third_party/llvm and build it.
 
 # Do NOT CHANGE this if you don't know what you're doing -- see
 # https://code.google.com/p/chromium/wiki/UpdatingClang
 # Reverting problematic clang rolls is safe, though.
 CLANG_REVISION=170392
 
 THIS_DIR="$(dirname "${0}")"
 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"
 
 # ${A:-a} returns $A if it's set, a else.
 LLVM_REPO_URL=${LLVM_URL:-https://llvm.org/svn/llvm-project}
 
 # Die if any command dies.
 set -e
 
 OS="$(uname -s)"
 
 # Parse command line options.
 force_local_build=
 mac_only=
 run_tests=
 bootstrap=
 with_android=yes
+with_tools_extra=
 if [[ "${OS}" = "Darwin" ]]; then
   with_android=
 fi
 
 while [[ $# > 0 ]]; do
   case $1 in
     --bootstrap)
       bootstrap=yes
       ;;
     --force-local-build)
       force_local_build=yes
       ;;
     --mac-only)
       mac_only=yes
       ;;
     --run-tests)
       run_tests=yes
       ;;
     --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."
       echo "--force-local-build: Don't try to download prebuilt binaries."
       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
   shift
 done
 
 # --mac-only prevents the initial download on non-mac systems, but if clang has
 # already been downloaded in the past, this script keeps it up to date even if
 # --mac-only is passed in and the system isn't a mac. People who don't like this
 # can just delete their third_party/llvm-build directory.
@@ skipping 155 matching lines @@
   svn co --force "${LLVM_REPO_URL}/llvm/trunk@${CLANG_REVISION}" "${LLVM_DIR}"
 fi
 
 echo Getting clang r"${CLANG_REVISION}" in "${CLANG_DIR}"
 svn co --force "${LLVM_REPO_URL}/cfe/trunk@${CLANG_REVISION}" "${CLANG_DIR}"
 
 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
 
 NUM_JOBS=3
 if [[ "${OS}" = "Linux" ]]; then
   NUM_JOBS="$(grep -c "^processor" /proc/cpuinfo)"
 elif [ "${OS}" = "Darwin" ]; then
   NUM_JOBS="$(sysctl -n hw.ncpu)"
 fi
 
@@ skipping 80 matching lines @@
 if [[ -n "$run_tests" ]]; then
   # Run a few tests.
   "${PLUGIN_SRC_DIR}/tests/test.sh" "${LLVM_BUILD_DIR}/Release+Asserts"
   cd "${LLVM_BUILD_DIR}"
   make check-all
   cd -
 fi
 
 # After everything is done, log success for this revision.
 echo "${CLANG_REVISION}" > "${STAMP_FILE}"