Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Implement build -N noisy, which sets MAKEVERBOSE to noisy an...



details:   https://anonhg.NetBSD.org/src/rev/4c0a258eea48
branches:  trunk
changeset: 554068:4c0a258eea48
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sat Oct 25 03:46:09 2003 +0000

description:
Implement build -N noisy, which sets MAKEVERBOSE to noisy and adds
`-s' to MAKEFLAGS for noisy < 2.

diffstat:

 BUILDING          |  24 +++++++++++++++++++++++-
 build.sh          |  38 +++++++++++++++++++++++++++++---------
 doc/BUILDING.mdoc |  37 +++++++++++++++++++++++++++++++++++--
 3 files changed, 87 insertions(+), 12 deletions(-)

diffs (208 lines):

diff -r d470bf4d56b1 -r 4c0a258eea48 BUILDING
--- a/BUILDING  Sat Oct 25 03:45:03 2003 +0000
+++ b/BUILDING  Sat Oct 25 03:46:09 2003 +0000
@@ -141,6 +141,18 @@
 
                  Default: ``/etc/mk.conf''
 
+     MAKEVERBOSE
+                 Level of verbosity of status messages.  Supported values:
+
+                 0    No descriptive messages are shown.
+
+                 1    Descriptive messages are shown.
+
+                 2    Descriptive messages (prefixed with a `#') and command
+                      output is not suppressed.
+
+                 Default: 2
+
      MKCATPAGES  Can be set to ``yes'' or ``no''.  Indicates whether prefor-
                  matted plaintext manual pages will be created during a build.
 
@@ -565,6 +577,16 @@
                      sbmips-eb     sbmips     mipseb
                      sbmips-el     sbmips     mipsel
 
+     -N noiselevel
+               Set the ``noisyness'' level of the build Supported values of
+               noiselevel are:
+
+               0    Quiet build.
+
+               1    Operations are described, command lines are suppressed.
+
+               2    Noisy build.  This is the default.
+
      -n        Show the commands that would be executed by build.sh, but do
                not make any changes.  This is similar in concept to ``make
                -n''.
@@ -663,4 +685,4 @@
 BUGS
      A few platforms are not yet using this build system.
 
-NetBSD                          August 7, 2003                          NetBSD
+NetBSD                         October 25, 2003                         NetBSD
diff -r d470bf4d56b1 -r 4c0a258eea48 build.sh
--- a/build.sh  Sat Oct 25 03:45:03 2003 +0000
+++ b/build.sh  Sat Oct 25 03:46:09 2003 +0000
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#      $NetBSD: build.sh,v 1.118 2003/10/19 03:37:36 matt Exp $
+#      $NetBSD: build.sh,v 1.119 2003/10/25 03:46:09 lukem Exp $
 #
 # Copyright (c) 2001-2003 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -345,9 +345,9 @@
        fi
        cat <<_usage_
 
-Usage: ${progname} [-EnorUu] [-a arch] [-B buildid] [-D dest] [-j njob] [-M obj]
-                [-m mach] [-O obj] [-R release] [-T tools] [-V var=[value]]
-                [-w wrapper] [-Z var]   operation [...]
+Usage: ${progname} [-EnorUu] [-a arch] [-B buildid] [-D dest] [-j njob]
+               [-M obj] [-m mach] [-N noisy] [-O obj] [-R release] [-T tools]
+               [-V var=[value]] [-w wrapper] [-Z var]   operation [...]
 
  Build operations (all imply "obj" and "tools"):
     build               Run "make build"
@@ -371,18 +371,23 @@
  Options:
     -a arch     Set MACHINE_ARCH to arch (otherwise deduced from MACHINE)
     -B buildId  Set BUILDID to buildId
-    -D dest     Set DESTDIR to dest.  (Default: destdir.MACHINE)
+    -D dest     Set DESTDIR to dest.  [Default: destdir.MACHINE]
     -E          Set "expert" mode; disables various safety checks.
                 Should not be used without expert knowledge of the build system
     -j njob     Run up to njob jobs in parallel; see make(1)
     -M obj      Set obj root directory to obj (sets MAKEOBJDIRPREFIX)
                 Unsets MAKEOBJDIR.
     -m mach     Set MACHINE to mach (not required if NetBSD native)
+    -N noisy   Set the noisyness level of the build:
+                   0   Quiet
+                   1   Operations are described, commands are suppressed
+                   2   Full output
+               [Default: 2]
     -n          Show commands that would be executed, but do not execute them
     -O obj      Set obj root directory to obj (sets a MAKEOBJDIR pattern).
                 Unsets MAKEOBJDIRPREFIX.
     -o          Set MKOBJDIRS=no (do not create objdirs at start of build)
-    -R release  Set RELEASEDIR to release.  (Default: releasedir)
+    -R release  Set RELEASEDIR to release.  [Default: releasedir]
     -r          Remove contents of TOOLDIR and DESTDIR before building
     -T tools    Set TOOLDIR to tools.  If unset, and TOOLDIR is not set in
                 the environment, ${toolprefix}make will be (re)built unconditionally
@@ -392,7 +397,7 @@
                Without this, everything is rebuilt, including the tools.
     -V v=[val]  Set variable \`v' to \`val'
     -w wrapper  Create ${toolprefix}make script as wrapper
-                (Default: \${TOOLDIR}/bin/${toolprefix}make-\${MACHINE})
+                [Default: \${TOOLDIR}/bin/${toolprefix}make-\${MACHINE}]
     -Z v        Unset ("zap") variable \`v'
 
 _usage_
@@ -401,7 +406,7 @@
 
 parseoptions()
 {
-       opts='a:B:bD:dEhi:j:k:M:m:nO:oR:rT:tUuV:w:Z:'
+       opts='a:B:bD:dEhi:j:k:M:m:N:nO:oR:rT:tUuV:w:Z:'
        opt_a=no
 
        if type getopts >/dev/null 2>&1; then
@@ -485,6 +490,21 @@
                        [ "${opt_a}" != "yes" ] && getarch
                        ;;
 
+               -N)
+                       eval ${optargcmd}
+                       case "${OPTARG}" in
+                       0|1)
+                               MAKEFLAGS="${MAKEFLAGS} -s"
+                               ;;
+                       2)
+                               ;;
+                       *)
+                               usage "'${OPTARG}' is not a valid value for -N"
+                               ;;
+                       esac
+                       setmakeenv MAKEVERBOSE "${OPTARG}"
+                       ;;
+
                -n)
                        runcmd=echo
                        ;;
@@ -806,7 +826,7 @@
        eval cat <<EOF ${makewrapout}
 #! /bin/sh
 # Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from:  \$NetBSD: build.sh,v 1.118 2003/10/19 03:37:36 matt Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.119 2003/10/25 03:46:09 lukem Exp $
 #
 
 EOF
diff -r d470bf4d56b1 -r 4c0a258eea48 doc/BUILDING.mdoc
--- a/doc/BUILDING.mdoc Sat Oct 25 03:45:03 2003 +0000
+++ b/doc/BUILDING.mdoc Sat Oct 25 03:46:09 2003 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: BUILDING.mdoc,v 1.29 2003/09/29 07:55:17 lukem Exp $
+.\"    $NetBSD: BUILDING.mdoc,v 1.30 2003/10/25 03:46:09 lukem Exp $
 .\"
 .\" Copyright (c) 2001-2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -40,7 +40,7 @@
 .\" Toolchain prefix for commands
 .ds toolprefix nb
 .
-.Dd August 7, 2003
+.Dd October 25, 2003
 .Dt BUILDING 8
 .Os NetBSD
 .
@@ -322,6 +322,22 @@
 .DFLT
 .Dq /etc/mk.conf
 .
+.It Sy MAKEVERBOSE
+Level of verbosity of status messages.
+Supported values:
+.Bl -tag -width xxx
+.It 0
+No descriptive messages are shown.
+.It 1
+Descriptive messages are shown.
+.It 2
+Descriptive messages (prefixed with a
+.Sq # )
+and command output is not suppressed.
+.El
+.DFLT
+2
+.
 .It Sy MKCATPAGES
 .YorN
 Indicates whether preformatted plaintext manual pages will be created
@@ -1096,6 +1112,23 @@
 .It sbmips-el Ta sbmips Ta mipsel
 .El
 .
+.It Fl N Ar noiselevel
+Set the
+.Dq noisyness
+level of the build
+Supported values of
+.Ar noiselevel
+are:
+.Bl -tag -width xxx
+.It 0
+Quiet build.
+.It 1
+Operations are described, command lines are suppressed.
+.It 2
+Noisy build.
+This is the default.
+.El
+.
 .It Fl n
 Show the commands that would be executed by
 .Sy build.sh ,



Home | Main Index | Thread Index | Old Index