All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefan Becker <chemobejk@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2] core: enhance printvars for variables with newlines
Date: Thu, 19 Apr 2018 10:40:54 +0300	[thread overview]
Message-ID: <20180419074054.4075-1-chemobejk@gmail.com> (raw)
In-Reply-To: <CAOJ2eMc+3Bx40nWF=VALh6JzeaNVWPekyCGXAL2=a_YX4yJWug@mail.gmail.com>

The current output formats of printvars do not preserve newlines. Add
the option MULTILINE_VARS which causes the variable content to be dumped
in a format that preserves newlines:

   MULTILINE_VAR_START VAR
   ... line 1 ...
   ... line 2 ...
   ...
   MULTILINE_VAR_END VAR

Updated the manual accordingly.

Signed-off-by: Stefan Becker <chemobejk@gmail.com>
---
 Makefile                  | 10 +++++++---
 docs/manual/make-tips.txt | 20 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 54f940659c..bd78da8362 100644
--- a/Makefile
+++ b/Makefile
@@ -979,9 +979,13 @@ printvars:
 		$(sort $(if $(VARS),$(filter $(VARS),$(.VARIABLES)),$(.VARIABLES))), \
 		$(if $(filter-out environment% default automatic, \
 				$(origin $V)), \
-		$(if $(QUOTED_VARS),\
-			$(info $V='$(subst ','\'',$(if $(RAW_VARS),$(value $V),$($V)))'), \
-			$(info $V=$(if $(RAW_VARS),$(value $V),$($V))))))
+		$(if $(MULTILINE_VARS), \
+			$(info MULTILINE_VAR_START $V) \
+			$(info $(if $(RAW_VARS),$(value $V),$($V))) \
+			$(info MULTILINE_VAR_END $V), \
+			$(if $(QUOTED_VARS),\
+				$(info $V='$(subst ','\'',$(if $(RAW_VARS),$(value $V),$($V)))'), \
+				$(info $V=$(if $(RAW_VARS),$(value $V),$($V)))))))
 # ' Syntax colouring...
 
 .PHONY: clean
diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt
index ea1d825bef..c796bd73e2 100644
--- a/docs/manual/make-tips.txt
+++ b/docs/manual/make-tips.txt
@@ -92,6 +92,8 @@ It is possible to tweak the output using some variables:
 
 - +VARS+ will limit the listing to variables which names match the
   specified make-pattern
+- +MULTILINE_VARS+, if set to +YES+, will use a start and end marker around
+  the variable content to preserve newlines in the value
 - +QUOTED_VARS+, if set to +YES+, will single-quote the value
 - +RAW_VARS+, if set to +YES+, will print the unexpanded value
 
@@ -106,6 +108,24 @@ For example:
  BUSYBOX_RDEPENDENCIES=ncurses util-linux
 ----
 
+----
+ $ make -s printvars VARS=BUSYBOX_%DEPENDENCIES MULTILINE_VARS=YES
+ MULTILINE_VAR_START BUSYBOX_DEPENDENCIES
+ skeleton toolchain
+ MULTILINE_VAR_END BUSYBOX_DEPENDENCIES
+ MULTILINE_VAR_START BUSYBOX_FINAL_ALL_DEPENDENCIES
+ skeleton toolchain
+ MULTILINE_VAR_END BUSYBOX_FINAL_ALL_DEPENDENCIES
+ MULTILINE_VAR_START BUSYBOX_FINAL_DEPENDENCIES
+ skeleton toolchain
+ MULTILINE_VAR_END BUSYBOX_FINAL_DEPENDENCIES
+ MULTILINE_VAR_START BUSYBOX_FINAL_PATCH_DEPENDENCIES
+ MULTILINE_VAR_END BUSYBOX_FINAL_PATCH_DEPENDENCIES
+ MULTILINE_VAR_START BUSYBOX_RDEPENDENCIES
+ ncurses util-linux'linux-pam skeleton toolchain host-skeleton host-ccache
+ MULTILINE_VAR_END BUSYBOX_RDEPENDENCIES
+----
+
 ----
  $ make -s printvars VARS=BUSYBOX_%DEPENDENCIES QUOTED_VARS=YES
  BUSYBOX_DEPENDENCIES='skeleton toolchain'
-- 
2.14.3

  reply	other threads:[~2018-04-19  7:40 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CAOJ2eMdEHvZeJ6rECyRkzMZN0UYJ2CYK4yMgR9d89P%2B-tWYJYw@mail.gmail.com>
2018-04-16 11:58 ` [Buildroot] [PATCH RESEND] core: enhance printvars for variables with newlines Stefan Becker
2018-04-16 12:28   ` Yann E. MORIN
2018-04-18 22:27   ` Arnout Vandecappelle
2018-04-19  7:14     ` Stefan Becker
2018-04-19  7:40       ` Stefan Becker [this message]
2018-04-19  8:08         ` [Buildroot] [PATCH v2] " Yann E. MORIN
2018-12-16 13:54       ` [Buildroot] [PATCH RESEND] " Thomas Petazzoni
2018-12-16 14:57         ` Stefan Becker
2018-12-16 15:14           ` Thomas Petazzoni
2018-12-16 15:33             ` Stefan Becker
2018-12-16 16:19               ` Stefan Becker
2018-12-17 20:08             ` Trent Piepho
2018-12-18  0:24               ` Carlos Santos
2018-12-18  1:19                 ` Trent Piepho
2018-04-19  7:47     ` Yann E. MORIN
2018-04-19  7:58       ` Stefan Becker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180419074054.4075-1-chemobejk@gmail.com \
    --to=chemobejk@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.