From owner-svn-src-projects@FreeBSD.ORG Fri Oct 9 02:00:33 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11FE1106566B; Fri, 9 Oct 2009 02:00:33 +0000 (UTC) (envelope-from jb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0120D8FC24; Fri, 9 Oct 2009 02:00:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9920Wrw039815; Fri, 9 Oct 2009 02:00:32 GMT (envelope-from jb@svn.freebsd.org) Received: (from jb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9920Wmu039813; Fri, 9 Oct 2009 02:00:32 GMT (envelope-from jb@svn.freebsd.org) Message-Id: <200910090200.n9920Wmu039813@svn.freebsd.org> From: John Birrell Date: Fri, 9 Oct 2009 02:00:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197890 - projects/jbuild/usr.bin/jdirdep X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Oct 2009 02:00:33 -0000 Author: jb Date: Fri Oct 9 02:00:32 2009 New Revision: 197890 URL: http://svn.freebsd.org/changeset/base/197890 Log: Always use --depth files on second+ passes Modified: projects/jbuild/usr.bin/jdirdep/jgetsrc Modified: projects/jbuild/usr.bin/jdirdep/jgetsrc ============================================================================== --- projects/jbuild/usr.bin/jdirdep/jgetsrc Thu Oct 8 23:01:12 2009 (r197889) +++ projects/jbuild/usr.bin/jdirdep/jgetsrc Fri Oct 9 02:00:32 2009 (r197890) @@ -27,10 +27,14 @@ ## /usr/mytree/obj/stage ## /usr/mytree/src ## -## then use -B /usr/mytree -## +## then use -B /usr/mytree +## +## -S +## This is a second level process to get additional dirs in SRCDIRDEP. ## +GET_EXTRA=0 + ShowHelp() { grep ^## $0 | sed -e 's/^##//' | ${PAGER} @@ -72,10 +76,11 @@ PAGER=${PAGER:-more} unset DISPLAY # parse flags -while getopts "B:h" my_opt +while getopts "B:Sh" my_opt do case $my_opt in B) BACKING_TREE=$OPTARG ;; + S) GET_EXTRA=1 ;; h) ShowHelp ;; [?]) echo "Bad Option"; ShowHelp ;; esac @@ -155,11 +160,11 @@ do i=`expr $i + 1` xx=`pwd` echo "Z $xx" >> $SVNLOG - if [ $i -eq $num ]; then - echo "Checking out: $report" + if [ $i -eq $num -a ${GET_EXTRA} -eq 0 ]; then + echo "Checking out: $report (this dir and all below)" svn co $svnd --depth infinity >> $SVNLOG elif [ ! -d $x ]; then - echo "Checking out: $report" + echo "Checking out: $report (just this dir)" svn co $svnd --depth files >> $SVNLOG fi cd $x @@ -219,5 +224,5 @@ rm -f $MORELOG if [ "x$moredirs" != x ] then echo "Need to check out additional directories due to source dependencies..." - exec $0 -B "${BACKING_TREE}" $moredirs + exec $0 -S -B "${BACKING_TREE}" $moredirs fi