Daily bump.
[official-gcc.git] / libsanitizer / merge.sh
blob9c29b319829f5ef34e3c1b321a809187534a92f7
1 #!/bin/bash
3 # FIXME: do we need a license (or whatever else) header here?
5 # This script merges libsanitizer sources from upstream.
7 get_upstream() {
8 rm -rf upstream
9 #cp -rf orig upstream
10 svn co http://llvm.org/svn/llvm-project/compiler-rt/trunk upstream
13 get_current_rev() {
14 cd upstream
15 svn info | grep Revision | grep -o '[0-9]*'
18 list_files() {
19 (cd $1; ls *.{cc,h,inc} 2> /dev/null)
23 change_comment_headers() {
24 for f in $(list_files $1); do
25 changed=$(awk 'NR != 2 && NR != 3' < $1/$f)
26 echo "$changed" > $1/$f
27 done
30 # ARGUMENTS: upstream_path local_path
31 # This function merges changes from the directory upstream_path to
32 # the directory local_path.
33 merge() {
34 upstream_path=upstream/$1
35 local_path=$2
36 change_comment_headers $upstream_path
37 echo MERGE: $upstream_path
38 all=$( (list_files $upstream_path; list_files $local_path) | sort | uniq)
39 #echo $all
40 for f in $all; do
41 if [ -f $upstream_path/$f -a -f $local_path/$f ]; then
42 echo "FOUND IN BOTH :" $f
43 # diff -u $local_path/$f $upstream_path/$f
44 cp -v $upstream_path/$f $local_path
45 elif [ -f $upstream_path/$f ]; then
46 echo "FOUND IN UPSTREAM :" $f
47 cp -v $upstream_path/$f $local_path
48 svn add $local_path/$f
49 elif [ -f $local_path/$f ]; then
50 echo "FOUND IN LOCAL :" $f
51 svn remove $local_path/$f
53 done
57 fatal() {
58 echo "$1"
59 exit 1;
62 pwd | grep 'libsanitizer$' || \
63 fatal "Run this script from libsanitizer dir"
64 get_upstream
65 CUR_REV=$(get_current_rev)
66 echo Current upstream revision: $CUR_REV
67 merge include/sanitizer include/sanitizer
68 merge lib/asan asan
69 merge lib/tsan/rtl tsan
70 merge lib/sanitizer_common sanitizer_common
71 merge lib/interception interception
73 rm -rf upstream
75 # Update the MERGE file.
76 cat << EOF > MERGE
77 $CUR_REV
79 The first line of this file holds the svn revision number of the
80 last merge done from the master library sources.
81 EOF