Lines Matching refs:current_dir
24 current_dir=`realpath \`dirname $0\``
25 valgrind_dir=$current_dir/main
28 valgrind_revision=`cat $current_dir/upstream.revs.txt | grep "val: " | sed "s/val: //"`
29 vex_revision=`cat $current_dir/upstream.revs.txt | grep "vex: " | sed "s/vex: //"`
49 echo "Merging valgrind... (in $valgrind_dir)" | tee $current_dir/merge.log
51 svn diff -r$valgrind_revision:$upstream_valgrind_revision $valgrind_svn_url | patch -Ep0 | tee -a $current_dir/merge.log
55 echo "Merging vex... (in $vex_dir)" | tee -a $current_dir/merge.log
57 svn diff -r$vex_revision:$upstream_vex_revision $vex_svn_url | patch -Ep0 | tee -a $current_dir/merge.log
60 echo "val: $upstream_valgrind_revision" > $current_dir/upstream.revs.txt
61 echo "vex: $upstream_vex_revision" >> $current_dir/upstream.revs.txt
64 echo " 1. Check $current_dir/merge.log for possible merge issues"
65 echo " 2. Test the build and make adjustments to $current_dir/main/Android.mk if neccessary"
