svn commit: r296964 - vendor/NetBSD/bmake

[Simon J. Gerraty]

Author: sjg
Date: Wed Mar 16 23:34:04 2016
New Revision: 296964
URL: https://svnweb.freebsd.org/changeset/base/296964

Log:
  Make this easier to re-use (for libxo)

Added:
  vendor/NetBSD/bmake/import.sh
     - copied, changed from r296636, vendor/NetBSD/bmake/do-update.sh
Deleted:
  vendor/NetBSD/bmake/do-update.sh

Copied and modified: vendor/NetBSD/bmake/import.sh (from r296636, vendor/NetBSD/bmake/do-update.sh)
==============================================================================
--- vendor/NetBSD/bmake/do-update.sh	Fri Mar 11 00:38:08 2016	(r296636, copy source)
+++ vendor/NetBSD/bmake/import.sh	Wed Mar 16 23:34:04 2016	(r296964)
@@ -6,7 +6,6 @@ ECHO=
 # Set SVN variables
 #  select the local subversion site
 SVN=${SVN:-/usr/local/bin/svn}
-SITE=${SITE:-ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg}
 
 # For consistency...
 Error() {
@@ -29,29 +28,23 @@ option_parsing() {
 		*=*) eval "$1"; shift;;
 		--) shift; break;;
 		-a) TARBALL=$2; shift 2;;
-		-b) TARBALL=$2; shift 2;;
 		-n) ECHO=echo; shift;;
 		-P) PR=$2; shift 2;;
 		-r) REVIEWER=$2; shift 2;;
 		-u) url=$2; shift 2;;
-		-v) VERSION=$2; shift 2;;
 		-h) echo "Usage:";
-     echo "  "$0 '[-abhnPrv] [ARCHIVE=] [TARBALL=] [PR=] [REVIEWER=] [VERSION=]'
+     echo "  "$0 '[-ahnPr] [TARBALL=] [PR=] [REVIEWER=]'
 			echo "  "$0 '-a <filename>	  # (a)rchive'
-			echo "  "$0 '-b <filename>	  # tar(b)all'
 			echo "  "$0 '-h			  # print usage'
 			echo "  "$0 '-n			  # do not import, check only.'
 			echo "  "$0 '-P <PR Number>	  # Use PR'
 			echo "  "$0 '-r <reviewer(s) list>  # (r)eviewed by'
-			echo "  "$0 '-v <version "number">  # (v)ersion#'
 			echo "  "$0 'PR=<PR Number>'
 			echo "  "$0 'REVIEWER=<reviewer(s) list>'
-			echo "  "$0 'VERSION=<version "number">'
 			exit 1;;
 		*) break;;
 		esac
 	done
-	TARBALL=${ARCHIVE:-${TARBALL}}
 	return $(($_shift - $#))
 }
 
@@ -60,26 +53,34 @@ option_parsing() {
 option_parsing "$@"
 shift $?
 
+TF=/tmp/.$USER.$$
 Cd `dirname $0`
 test -s ${TARBALL:-/dev/null} || Error need TARBALL
-rm -rf bmake
-TF=/tmp/.$USER.$$
+here=`pwd`
+# thing should match what the TARBALL contains
+thing=`basename $here`
 
+rm -rf $thing
 tar zxf $TARBALL
-MAKE_VERSION=`grep '^MAKE_VERSION' bmake/Makefile | sed 's,.*=[[:space:]]*,,'`
+
+# steps unique to bmake
+VERSION=`grep '^MAKE_VERSION' bmake/Makefile | sed 's,.*=[[:space:]]*,,'`
 rm -rf bmake/missing
+
+# the rest should be common
 ('cd' dist && $SVN list -R) | grep -v '/$' | sort > $TF.old
-('cd' bmake && find . -type f ) | cut -c 3- | sort > $TF.new
+('cd' $thing && find . -type f ) | cut -c 3- | sort > $TF.new
 comm -23 $TF.old $TF.new > $TF.rmlist
 comm -13 $TF.old $TF.new > $TF.addlist
 [ -s $TF.rmlist ] && { echo rm:; cat $TF.rmlist; }
 [ -s $TF.addlist ] && { echo add:; cat $TF.addlist; }
-('cd' bmake && tar cf - . | tar xf - -C ../dist)
+('cd' $thing && tar cf - . | tar xf - -C ../dist)
 ('cd' dist
 test -s $TF.rmlist && xargs $SVN rm < $TF.rmlist
 test -s $TF.addlist && xargs $SVN --parents add < $TF.addlist
 )
 
 url=`$SVN info | sed -n '/^URL:/s,URL: ,,p'`
-echo After committing dist...
-echo $SVN cp $url/dist $url/$MAKE_VERSION
+echo After committing dist... run tag.sh
+echo "$SVN cp $url/dist $url/$VERSION" > tag.sh
+