From owner-svn-src-user@FreeBSD.ORG Wed Dec 19 13:21:44 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3EDBBEE2; Wed, 19 Dec 2012 13:21:44 +0000 (UTC) (envelope-from des@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 257C58FC15; Wed, 19 Dec 2012 13:21:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJDLiJm003592; Wed, 19 Dec 2012 13:21:44 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJDLhvK003585; Wed, 19 Dec 2012 13:21:43 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201212191321.qBJDLhvK003585@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Wed, 19 Dec 2012 13:21:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r244434 - user/des/tinderbox X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Dec 2012 13:21:44 -0000 Author: des Date: Wed Dec 19 13:21:43 2012 New Revision: 244434 URL: http://svnweb.freebsd.org/changeset/base/244434 Log: Implement a new "version" target, which logs the state of the source tree after updating it but before building anything. Bump $VERSION. Modified: user/des/tinderbox/tbmaster.pl user/des/tinderbox/tinderbox.1 user/des/tinderbox/tinderbox.pl Modified: user/des/tinderbox/tbmaster.pl ============================================================================== --- user/des/tinderbox/tbmaster.pl Wed Dec 19 13:20:20 2012 (r244433) +++ user/des/tinderbox/tbmaster.pl Wed Dec 19 13:21:43 2012 (r244434) @@ -33,7 +33,7 @@ use Fcntl qw(:DEFAULT :flock); use POSIX; use Getopt::Long; -my $VERSION = "2.9"; +my $VERSION = "2.10"; my $COPYRIGHT = "Copyright (c) 2003-2012 Dag-Erling Smørgrav. " . "All rights reserved."; Modified: user/des/tinderbox/tinderbox.1 ============================================================================== --- user/des/tinderbox/tinderbox.1 Wed Dec 19 13:20:20 2012 (r244433) +++ user/des/tinderbox/tinderbox.1 Wed Dec 19 13:21:43 2012 (r244434) @@ -283,6 +283,9 @@ but at the end of each job. As .Cm precleanroot , but at the end of each job. +.It Cm version +After updating and patching the source tree but before doing anything +else, log information about the current state of the source tree. .El .Pp The commands are executed in the order in which they are listed above, Modified: user/des/tinderbox/tinderbox.pl ============================================================================== --- user/des/tinderbox/tinderbox.pl Wed Dec 19 13:20:20 2012 (r244433) +++ user/des/tinderbox/tinderbox.pl Wed Dec 19 13:21:43 2012 (r244434) @@ -33,7 +33,7 @@ use Fcntl qw(:DEFAULT :flock); use POSIX; use Getopt::Long; -my $VERSION = "2.9"; +my $VERSION = "2.10"; my $COPYRIGHT = "Copyright (c) 2003-2012 Dag-Erling Smørgrav. " . "All rights reserved."; @@ -71,6 +71,7 @@ my %cmds = ( 'kernels' => 0, 'install' => 0, 'release' => 0, + 'version' => 0, ); my %kernels; my %lint; @@ -613,10 +614,6 @@ MAIN:{ warning("sleeping $delay s and retrying..."); sleep($delay); } - my $svnversioncmd = [grep({ -x } @svnversioncmds)]->[0] - or error("unable to locate svnversion binary"); - my $svnversion = `$svnversioncmd $srcdir`; - message("At svn revision $svnversion"); } elsif (defined($cvsup)) { logstage("cvsupping the source tree"); open(my $fh, ">", "$sandbox/supfile") @@ -691,6 +688,24 @@ MAIN:{ } } + # Print source tree version information + if ($cmds{'version'}) { + if (defined($svnbase)) { + my $svncmd = [grep({ -x } @svncmds)]->[0] + or error("unable to locate svn binary"); + my $svnversioncmd = [grep({ -x } @svnversioncmds)]->[0] + or error("unable to locate svnversion binary"); + if ($verbose) { + spawn($svncmd, "stat", $srcdir) + or error("unable to stat source tree"); + } + my $svnversion = `$svnversioncmd $srcdir`; # XXX + message("At svn revision $svnversion"); + } else { + warning("the 'version' target is only supported for svn"); + } + } + # Prepare environment for make(1); %ENV = ( 'TZ' => "UTC",