#!/bin/bash # FIXME: do we need a license (or whatever else) header here? # This script merges libsanitizer sources from upstream. get_upstream() { rm -rf upstream #cp -rf orig upstream svn co http://llvm.org/svn/llvm-project/compiler-rt/trunk upstream } get_current_rev() { cd upstream svn info | grep Revision | grep -o '[0-9]*' } list_files() { (cd $1; ls *.{cc,h,inc} 2> /dev/null) } change_comment_headers() { for f in $(list_files $1); do changed=$(awk 'NR != 2 && NR != 3' < $1/$f) echo "$changed" > $1/$f done } # ARGUMENTS: upstream_path local_path # This function merges changes from the directory upstream_path to # the directory local_path. merge() { upstream_path=upstream/$1 local_path=$2 change_comment_headers $upstream_path echo MERGE: $upstream_path all=$( (list_files $upstream_path; list_files $local_path) | sort | uniq) #echo $all for f in $all; do if [ -f $upstream_path/$f -a -f $local_path/$f ]; then echo "FOUND IN BOTH :" $f # diff -u $local_path/$f $upstream_path/$f cp -v $upstream_path/$f $local_path elif [ -f $upstream_path/$f ]; then echo "FOUND IN UPSTREAM :" $f cp -v $upstream_path/$f $local_path svn add $local_path/$f elif [ -f $local_path/$f ]; then echo "FOUND IN LOCAL :" $f svn remove $local_path/$f fi done } fatal() { echo "$1" exit 1; } pwd | grep 'libsanitizer$' || \ fatal "Run this script from libsanitizer dir" get_upstream CUR_REV=$(get_current_rev) echo Current upstream revision: $CUR_REV merge include/sanitizer include/sanitizer merge lib/asan asan merge lib/tsan/rtl tsan merge lib/sanitizer_common sanitizer_common merge lib/interception interception rm -rf upstream # Update the MERGE file. cat << EOF > MERGE $CUR_REV The first line of this file holds the svn revision number of the last merge done from the master library sources. EOF