Mercurial > hg > CbC > CbC_llvm
diff utils/release/merge.sh @ 120:1172e4bd9c6f
update 4.0.0
author | mir3636 |
---|---|
date | Fri, 25 Nov 2016 19:14:25 +0900 |
parents | 7d135dc70f03 |
children | c2174574ed3a |
line wrap: on
line diff
--- a/utils/release/merge.sh Tue Jan 26 22:56:36 2016 +0900 +++ b/utils/release/merge.sh Fri Nov 25 19:14:25 2016 +0900 @@ -17,12 +17,14 @@ rev="" proj="" revert="no" +srcdir="" usage() { echo "usage: `basename $0` [OPTIONS]" echo " -proj PROJECT The project to merge the result into" echo " -rev NUM The revision to merge into the project" echo " -revert Revert rather than merge the commit" + echo " -srcdir The root of the project checkout" } while [ $# -gt 0 ]; do @@ -35,6 +37,10 @@ shift proj=$1 ;; + --srcdir | -srcdir | -s) + shift + srcdir=$1 + ;; -h | -help | --help ) usage ;; @@ -51,6 +57,10 @@ shift done +if [ -z "$srcdir" ]; then + srcdir="$proj.src" +fi + if [ "x$rev" = "x" -o "x$proj" = "x" ]; then echo "error: need to specify project and revision" echo @@ -72,7 +82,7 @@ fi svn log -c $rev http://llvm.org/svn/llvm-project/$proj/trunk >> $tempfile 2>&1 -cd $proj.src +cd "$srcdir" echo "# Updating tree" svn up @@ -85,7 +95,7 @@ fi echo -echo "# To commit, run the following in $proj.src/:" +echo "# To commit, run the following in $srcdir/:" echo svn commit -F $tempfile exit 0