merge_akpm: add removing files logic

[next-scripts] / merge_old_version

diff --git a/merge_old_version b/merge_old_version
index 9cabd8b1c6b294fd3cb0c0bced4cdf0fabee30b8..b20a8eff6685cb04108cdcade1f998b575bcc27a 100755 (executable)
--- a/merge_old_version
+++ b/merge_old_version
@@ -1,13 +1,5 @@
 #!/bin/bash
 
-LOG_FILE="../merge.log"
-SHA1_FILE="../SHA1s"
-build_host="ka2"
-build_dir="/scratch/sfr/next"
-build_cmd="bin/build_next"
-[ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
-[ "$NEXT_BUILD_DIR" ] && build_dir="$NEXT_BUILD_DIR"
-
 no_build=false
 [ "$1" = "-n" ] && {
        shift
@@ -15,25 +7,21 @@ no_build=false
 }
 
 tree=$1
-ver=$2
+shift
+if [ "$1" ]; then
+       ver="next-${1#next-}"
+       shift
+else
+       ver=$(git tag -l next-\* | sort | tail -n 1)
+fi
 
-rev=$(git show next-${ver}:Next/SHA1s | sed -n "s/^$tree\t\t*//p")
+rev=$(git show ${ver}:Next/SHA1s | sed -n "s/^$tree\t\t*//p")
 [ "$rev" ] || {
        echo "No such tree/date" 1>&2
        exit 1
 }
 
-[ -n "$3" ] && {
-       build_host="$3"
-       shift
-}
-[ -n "$3" ] && {
-       build_dir="$3"
-       shift
-}
-
-export NEXT_BUILD_HOST="$build_host"
-export NEXT_BUILD_DIR="$build_dir"
+. "$(dirname $0)/common.sh"
 
 log()
 {
@@ -94,8 +82,7 @@ git push -f "$build_host":"$build_dir" master:refs/heads/next || {
        bash -i || exit
 }
 
-echo "Building using $build_cmd on $build_host"
-ssh "$build_host" "$build_cmd" || {
+"$bin_dir/do_build" || {
        echo Build failed 1>&2
        bash -i || exit
 }