Scripts for building Memcheck for OS X Snow Leopard after the merge of...

scripts/common.sh

 #!/bin/sh
 
 # Copyright (c) 2009-2010 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 contains some functions useful to build
 # Valgrind and ThreadSanitizer for use with chromium
 
 THISDIR=$(dirname "${0}")
 THISDIR=$(cd "${THISDIR}" && /bin/pwd)
 
 system_is_snow_leopard() {
   uname -r | grep 10\.[0-9]\.[0-9] >/dev/null
 }
 
 checkout_and_patch_valgrind() {
   # $1 = Valgrind revision
   # $2 = VEX revision
   # $3 = source dir
   # Checkout Valgrind, apply our patches to Valgrind.
   # The source will be put in $THISDIR/valgrind-source
   cd $THISDIR
   VG_REV="$1"
   VEX_REV="$2"
   SOURCE_DIR="$3"
-
-  if system_is_snow_leopard
-  then
-    SVN_URI="svn://svn.valgrind.org/valgrind/branches/MACOSX106"
-  else
-    SVN_URI="svn://svn.valgrind.org/valgrind/trunk"
-  fi
+  SVN_URI="svn://svn.valgrind.org/valgrind/trunk"
 
   test -d "$SOURCE_DIR" && rm -rf "$SOURCE_DIR"
   mkdir "$SOURCE_DIR"
 
   # Check out latest version that following patches known to apply against
   svn co -r "$VG_REV" "$SVN_URI" "$SOURCE_DIR"
 
   cd "$SOURCE_DIR"
   # Make sure svn gets the right version of the external VEX repo, too
   svn up -r "$VEX_REV" VEX/
@@ skipping 187 matching lines @@
 # Check that the binaries directory exists.
 BINARIES_DIR="$THISDIR/../binaries"
 if ! [ -a $BINARIES_DIR ]
 then
   echo "Error: $BINARIES_DIR doesn't exist!" >&2
   exit 1
 fi
 
 set -e
 set -x