Revert of Roll Clang 223108:228129

tools/clang/scripts/package.sh

 #!/bin/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, and then package the results up
 # to a tgz file.
 
 gcc_toolchain=
 
@@ skipping 34 matching lines @@
 done
 
 
 THIS_DIR="$(dirname "${0}")"
 LLVM_DIR="${THIS_DIR}/../../../third_party/llvm"
 LLVM_BOOTSTRAP_DIR="${THIS_DIR}/../../../third_party/llvm-bootstrap"
 LLVM_BOOTSTRAP_INSTALL_DIR="${LLVM_DIR}/../llvm-bootstrap-install"
 LLVM_BUILD_DIR="${THIS_DIR}/../../../third_party/llvm-build"
 LLVM_BIN_DIR="${LLVM_BUILD_DIR}/Release+Asserts/bin"
 LLVM_LIB_DIR="${LLVM_BUILD_DIR}/Release+Asserts/lib"
-STAMP_FILE="${LLVM_DIR}/../llvm-build/cr_build_revision"
 
 echo "Diff in llvm:" | tee buildlog.txt
 svn stat "${LLVM_DIR}" 2>&1 | tee -a buildlog.txt
 svn diff "${LLVM_DIR}" 2>&1 | tee -a buildlog.txt
 echo "Diff in llvm/tools/clang:" | tee -a buildlog.txt
 svn stat "${LLVM_DIR}/tools/clang" 2>&1 | tee -a buildlog.txt
 svn diff "${LLVM_DIR}/tools/clang" 2>&1 | tee -a buildlog.txt
 echo "Diff in llvm/compiler-rt:" | tee -a buildlog.txt
 svn stat "${LLVM_DIR}/compiler-rt" 2>&1 | tee -a buildlog.txt
 svn diff "${LLVM_DIR}/compiler-rt" 2>&1 | tee -a buildlog.txt
@@ skipping 14 matching lines @@
 rm -rf "${LLVM_BOOTSTRAP_DIR}"
 rm -rf "${LLVM_BOOTSTRAP_INSTALL_DIR}"
 rm -rf "${LLVM_BUILD_DIR}"
 extra_flags=
 if [[ -n "${gcc_toolchain}" ]]; then
   extra_flags="--gcc-toolchain ${gcc_toolchain}"
 fi
 "${THIS_DIR}"/update.sh --bootstrap --force-local-build --run-tests \
     ${extra_flags} 2>&1 | tee -a buildlog.txt
 
-R=$(cat "${STAMP_FILE}")
+R=$("${LLVM_BIN_DIR}/clang" --version | \
+     sed -ne 's/clang version .*(trunk \([0-9]*\))/\1/p')
 
 PDIR=clang-$R
 rm -rf $PDIR
 mkdir $PDIR
 mkdir $PDIR/bin
 mkdir $PDIR/lib
 
 if [ "$(uname -s)" = "Darwin" ]; then
   SO_EXT="dylib"
 else
@@ skipping 14 matching lines @@
 
 # Copy libc++ headers.
 if [ "$(uname -s)" = "Darwin" ]; then
   mkdir $PDIR/include
   cp -R "${LLVM_BOOTSTRAP_INSTALL_DIR}/include/c++" $PDIR/include
 fi
 
 # Copy plugins. Some of the dylibs are pretty big, so copy only the ones we
 # care about.
 cp "${LLVM_LIB_DIR}/libFindBadConstructs.${SO_EXT}" $PDIR/lib
-cp "${LLVM_LIB_DIR}/libBlinkGCPlugin.${SO_EXT}" $PDIR/lib
+
+BLINKGCPLUGIN_LIBNAME=\
+$(grep 'set(LIBRARYNAME' "$THIS_DIR"/../blink_gc_plugin/CMakeLists.txt \
+    | cut -d ' ' -f 2 | tr -d ')')
+cp "${LLVM_LIB_DIR}/lib${BLINKGCPLUGIN_LIBNAME}.${SO_EXT}" $PDIR/lib
 
 if [[ -n "${gcc_toolchain}" ]]; then
   # Copy the stdlibc++.so.6 we linked Clang against so it can run.
   cp "${LLVM_LIB_DIR}/libstdc++.so.6" $PDIR/lib
 fi
 
 # Copy built-in headers (lib/clang/3.x.y/include).
 # compiler-rt builds all kinds of libraries, but we want only some.
 if [ "$(uname -s)" = "Darwin" ]; then
   # Keep only the OSX (ASan and profile) and iossim (ASan) runtime libraries:
@@ skipping 35 matching lines @@
 
 if [ "$(uname -s)" = "Darwin" ]; then
   PLATFORM=Mac
 else
   PLATFORM=Linux_x64
 fi
 
 echo To upload, run:
 echo gsutil cp -a public-read $PDIR.tgz \
      gs://chromium-browser-clang/$PLATFORM/$PDIR.tgz
-
-# FIXME: Warn if the file already exists on the server.