From owner-svn-src-vendor@FreeBSD.ORG Sun May 19 16:45:17 2013 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B3855DFE; Sun, 19 May 2013 16:45:17 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 94B0EFE3; Sun, 19 May 2013 16:45:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4JGjHQS046230; Sun, 19 May 2013 16:45:17 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4JGjHMv046229; Sun, 19 May 2013 16:45:17 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201305191645.r4JGjHMv046229@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sun, 19 May 2013 16:45:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r250811 - vendor/NetBSD/bmake X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 May 2013 16:45:17 -0000 Author: sjg Date: Sun May 19 16:45:17 2013 New Revision: 250811 URL: http://svnweb.freebsd.org/changeset/base/250811 Log: Automate import dance Modified: vendor/NetBSD/bmake/do-update.sh Modified: vendor/NetBSD/bmake/do-update.sh ============================================================================== --- vendor/NetBSD/bmake/do-update.sh Sun May 19 16:25:09 2013 (r250810) +++ vendor/NetBSD/bmake/do-update.sh Sun May 19 16:45:17 2013 (r250811) @@ -8,7 +8,6 @@ ECHO= SVN=${SVN:-/usr/local/bin/svn} SITE=${SITE:-ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg} - # For consistency... Error() { echo ERROR: ${1+"$@"} >&2 @@ -56,51 +55,31 @@ option_parsing() { return $(($_shift - $#)) } -# Call this function after all argument parsing has been done. -sanity_checks() { - # Do we have a working Subversion client? - ${SVN} --version -q >/dev/null || \ - Error "Cannot find a working subversion client." - - # Verify that a PR number and reviewer(s) were specified on the - # command line. - [ "$VERSION" ] || Error "We will a version \"number\" (can be a string). Use VERSION=." - # Need one (and only one) of ${url} or ${TARBALL} set. - [ "${url:-$TARBALL}" -a "${url:-$TARBALL}" != "${TARBALL:-$url}" ] && Error "Please set either \"url\" or \"TARBALL\" (not both) in your import script." - [ -d dist ] || Error "The directory dist/ does not exist." -} - ### option_parsing "$@" shift $? -sanity_checks -fetch $SITE/bmake-${VERSION}.tar.gz.sha1 -fetch $SITE/bmake-${VERSION}.tar.gz +Cd `dirname $0` +test -s ${TARBALL:-/dev/null} || Error need TARBALL +rm -rf bmake +TF=/tmp/.$USER.$$ -HAVE=`sha1 bmake-${VERSION}.tar.gz` -WANT=`cat bmake-${VERSION}.tar.gz.sha1` -if [ x"$HAVE" != x"$WANT" ]; then - Error "Fetched distfile does not have the expected SHA1 hash." -fi - -tar xf bmake-${VERSION}.tar.gz +tar zxf $TARBALL +MAKE_VERSION=`grep '^MAKE_VERSION' bmake/Makefile | sed 's,.*=[[:space:]]*,,'` rm -rf bmake/missing - -svn-vendorimport.sh bmake dist -${SVN} stat dist - -rm -f bmake-${VERSION}.tar.gz bmake-${VERSION}.tar.gz.sha1 - -echo "Import the ${VERSION} release of the \"Portable\" BSD make tool (from NetBSD). - -Submitted by: Simon Gerraty " > /tmp/commit-log - -${ECHO} ${SVN} ci -F /tmp/commit-log dist - -SVNURL=$(${SVN} info | grep URL: | awk '{print $2}') - -${ECHO} ${SVN} copy \ - -m "\"Tag\" the ${VERSION} Portable BSD make import." \ - ${SVNURL}/dist ${SVNURL}/${VERSION} +('cd' dist && $SVN list -R) | grep -v '/$' | sort > $TF.old +('cd' bmake && 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' 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