From owner-svn-src-all@freebsd.org Wed Mar 16 23:34:05 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 594BEAD32A3; Wed, 16 Mar 2016 23:34:05 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1A2FFD9C; Wed, 16 Mar 2016 23:34:05 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2GNY4BL064479; Wed, 16 Mar 2016 23:34:04 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2GNY4XR064478; Wed, 16 Mar 2016 23:34:04 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201603162334.u2GNY4XR064478@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Wed, 16 Mar 2016 23:34:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r296964 - 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-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Mar 2016 23:34:05 -0000 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 # (a)rchive' - echo " "$0 '-b # tar(b)all' echo " "$0 '-h # print usage' echo " "$0 '-n # do not import, check only.' echo " "$0 '-P # Use PR' echo " "$0 '-r # (r)eviewed by' - echo " "$0 '-v # (v)ersion#' echo " "$0 'PR=' echo " "$0 'REVIEWER=' - echo " "$0 'VERSION=' 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 +