Source-Changes-HG archive

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

[src/trunk]: src build.sh: add show-params operation



details:   https://anonhg.NetBSD.org/src/rev/f9142a445b27
branches:  trunk
changeset: 376140:f9142a445b27
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Jun 02 20:48:09 2023 +0000

description:
build.sh: add show-params operation

Add show-params operation to the makefile target, and reword
params operation to describe what it's done since 2012.

(In 2012-11-04 the Makefile's previous params target was renamed
to show-params and a new params target was added to save a 'params'
file, and build.sh wasn't adapted.)

diffstat:

 Makefile |   6 +++---
 build.sh |  11 +++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diffs (74 lines):

diff -r 9091256cb69a -r f9142a445b27 Makefile
--- a/Makefile  Fri Jun 02 20:47:27 2023 +0000
+++ b/Makefile  Fri Jun 02 20:48:09 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.335 2022/08/21 07:10:03 lukem Exp $
+#      $NetBSD: Makefile,v 1.336 2023/06/02 20:48:09 lukem Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -88,8 +88,8 @@
 #   do-top-obj:      creates the top level object directory.
 #   do-tools-obj:    creates object directories for the host toolchain.
 #   do-tools:        builds host toolchain.
-#   params:          record the values of variables that might affect the
-#                    build.
+#   params:          create params file with various make(1) parameters.
+#   show-params:     show various make(1) parameters.
 #   obj:             creates object directories.
 #   do-distrib-dirs: creates the distribution directories.
 #   includes:        installs include files.
diff -r 9091256cb69a -r f9142a445b27 build.sh
--- a/build.sh  Fri Jun 02 20:47:27 2023 +0000
+++ b/build.sh  Fri Jun 02 20:48:09 2023 +0000
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#      $NetBSD: build.sh,v 1.370 2023/06/02 14:29:11 lukem Exp $
+#      $NetBSD: build.sh,v 1.371 2023/06/02 20:48:09 lukem Exp $
 #
 # Copyright (c) 2001-2023 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -563,6 +563,7 @@ level of source directory"
        do_install_image=false
        do_disk_image=false
        do_params=false
+       do_show_params=false
        do_rump=false
        do_dtb=false
 
@@ -1084,7 +1085,8 @@ help()
                         RELEASEDIR/RELEASEMACHINEDIR/installation/installimage.
     disk-image=TARGET   Create bootable disk image in
                         RELEASEDIR/RELEASEMACHINEDIR/binary/gzimg/TARGET.img.gz.
-    params              Show various make(1) parameters.
+    params              Create params file with various make(1) parameters.
+    show-params         Show various make(1) parameters.
     list-arch           Show a list of valid MACHINE/MACHINE_ARCH values,
                         and exit.  The list may be narrowed by passing glob
                         patterns or exact values in MACHINE or MACHINE_ARCH.
@@ -1461,6 +1463,7 @@ parseoptions()
                rump|\
                rumptest|\
                sets|\
+               show-params|\
                sourcesets|\
                syspkgs|\
                tools)
@@ -2013,7 +2016,7 @@ createmakewrapper()
        eval cat <<EOF ${makewrapout}
 #! ${HOST_SH}
 # Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from:  \$NetBSD: build.sh,v 1.370 2023/06/02 14:29:11 lukem Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.371 2023/06/02 20:48:09 lukem Exp $
 # with these arguments: ${_args}
 #
 
@@ -2485,7 +2488,7 @@ main()
                        statusmsg "Successful make ${op}"
                        ;;
 
-               cleandir|obj|sourcesets|syspkgs|params)
+               cleandir|obj|sourcesets|syspkgs|params|show-params)
                        ${runcmd} "${makewrapper}" ${parallel} ${op} ||
                            bomb "Failed to make ${op}"
                        statusmsg "Successful make ${op}"



Home | Main Index | Thread Index | Old Index