commit cff3b8c93cf312956e629b4caab8f5e48d1e10dd Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 19 11:47:59 2012 -0400
Make ./configure -q really silent
Our updateVersions script was being verbose, which might have made sense back when I wrote it, but doesn't any more.
Final fix for bug 6599 --- contrib/updateVersions.pl | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/contrib/updateVersions.pl b/contrib/updateVersions.pl index 710d7d9..9dae1ff 100755 --- a/contrib/updateVersions.pl +++ b/contrib/updateVersions.pl @@ -4,6 +4,8 @@ $CONFIGURE_IN = './configure.ac'; $ORCONFIG_H = './src/win32/orconfig.h'; $TOR_NSI = './contrib/tor-mingw.nsi.in';
+$quiet = 1; + sub demand { my $fn = shift; die "Missing file $fn" unless (-f $fn); @@ -24,7 +26,7 @@ while (<F>) { } } die "No version found" unless $version; -print "Tor version is $version\n"; +print "Tor version is $version\n" unless $quiet; close F;
sub correctversion { @@ -36,7 +38,7 @@ sub correctversion { if ($s =~ /^$defchar(?:)define\s+VERSION\s+"([^"]+)"/m) { $oldver = $1; if ($oldver ne $version) { - print "Version mismatch in $fn: It thinks that the version is $oldver. Fixing.\n"; + print "Version mismatch in $fn: It thinks that the version is $oldver. I think it's $version. Fixing.\n"; $line = $defchar . "define VERSION "$version""; open(F, ">$fn.bak"); print F $s; @@ -44,9 +46,9 @@ sub correctversion { $s =~ s/^$defchar(?:)define\s+VERSION.*?$/$line/m; open(F, ">$fn"); print F $s; - close F; + close F; } else { - print "$fn has the correct version. Good.\n"; + print "$fn has the correct version. Good.\n" unless $quiet; } } else { print "Didn't find a version line in $fn -- uh oh.\n";