Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Jan 2009 09:30:52 -0700 (MST)
From:      "M. Warner Losh" <imp@bsdimp.com>
To:        obrien@FreeBSD.org, arch@FreeBSD.org
Subject:   Re: svn commit: r187132 - head/usr.bin/make
Message-ID:  <20090130.093052.-2022808221.imp@bsdimp.com>
In-Reply-To: <20090130.085130.-4349483.imp@bsdimp.com>
References:  <200901130653.n0D6rrNX092719@svn.freebsd.org> <20090130015518.GA20404@hades.panopticon> <20090130.085130.-4349483.imp@bsdimp.com>

next in thread | previous in thread | raw e-mail | index | archive | help
OMG!  There's too much make output now, and the recent changes broke
useful make features.  All but one were eventually fixed.  I just
fixed the -s breakage.

I'm planning on committing the following, if it passes code review and
item #3 below.

First, there was absolutely no reason to introduce -Q.  -v is
otherwise unused and matches the 'opt-in' debugging that's present in
the rest of make and the build system and other utilities like cp and
mv which will tell you what they are doing only if asked.

Second, the extra always on debug introduces a performance penalty.
Usually, one has to have good justification for doing this.

Third, I'd like to collect votes on this.  Do you like the new
debugging, or would you rather see it just when asked.  I'll let the
majority rule as to whether to commit this patch.  Please let me know
privately.  I'll tally the results and commit based on it.

Finally, if there's any real, persuasive argument that should override
the vote, I'd like to hear it.

Thank you for your time.

Warner


Index: job.c
===================================================================
--- job.c	(revision 187843)
+++ job.c	(working copy)
@@ -2362,7 +2362,7 @@
 	makeErrors = 0;
 
 	lastNode = NULL;
-	if ((maxJobs == 1 && fifoFd < 0) || is_posix || beQuiet) {
+	if ((maxJobs == 1 && fifoFd < 0) || is_posix || !beVerbose) {
 		/*
 		 * If only one job can run at a time, there's no need for a
 		 * banner, no is there?
Index: main.c
===================================================================
--- main.c	(revision 187921)
+++ main.c	(working copy)
@@ -126,7 +126,6 @@
 Boolean		mfAutoDeps;	/* .MAKEFILEDEPS target seen */
 Boolean		beSilent;	/* -s flag */
 Boolean		beVerbose;	/* -v flag */
-Boolean		beQuiet;	/* -Q flag */
 Boolean		compatMake;	/* -B argument */
 int		debug;		/* -d flag */
 Boolean		ignoreErrors;	/* -i flag */
@@ -517,11 +516,6 @@
 			printGraphOnly = TRUE;
 			debug |= DEBUG_GRAPH1;
 			break;
-		case 'Q':
-			beQuiet = TRUE;
-			beVerbose = FALSE;
-			MFLAGS_append("-Q", NULL);
-			break;
 		case 'q':
 			queryFlag = TRUE;
 			/* Kind of nonsensical, wot? */
@@ -532,7 +526,7 @@
 			MFLAGS_append("-r", NULL);
 			break;
 		case 's':
-			beQuiet = TRUE;
+			beVerbose = FALSE;
 			beSilent = TRUE;
 			MFLAGS_append("-s", NULL);
 			break;
@@ -542,7 +536,6 @@
 			break;
 		case 'v':
 			beVerbose = TRUE;
-			beQuiet = FALSE;
 			MFLAGS_append("-v", NULL);
 			break;
 		case 'x':
Index: globals.h
===================================================================
--- globals.h	(revision 187843)
+++ globals.h	(working copy)
@@ -76,7 +76,6 @@
 extern Boolean	ignoreErrors;	/* True if should ignore all errors */
 extern Boolean	beSilent;	/* True if should print no commands */
 extern Boolean	beVerbose;	/* True if should print extra cruft */
-extern Boolean	beQuiet;	/* True if want quiet headers with -j */
 extern Boolean	noExecute;	/* True if should execute nothing */
 extern Boolean	allPrecious;	/* True if every target is precious */
 extern Boolean	is_posix;	/* .POSIX target seen */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090130.093052.-2022808221.imp>