From 7d301616d2a785de788415d6269d668f53482d7f Mon Sep 17 00:00:00 2001
From: Mats Wichmann <mats@linux.com>
Date: Sat, 16 Mar 2024 09:42:34 -0600
Subject: Update MergeFlags doc  [skip appveyor]

Describe the case of passing a dict (and make one of the examples
show that); describe that using strings has the same limitations
as ParseFlags, which it calls in that case.

Signed-off-by: Mats Wichmann <mats@linux.com>
---
 CHANGES.txt           |  1 +
 RELEASE.txt           |  1 +
 SCons/Environment.xml | 49 ++++++++++++++++++++++++++-----------------------
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 702a1df..c4aea7f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -110,6 +110,7 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       (cache-cleanup-error, future-reserved-variable), improve unittest, tweak
       Sphinx build.
     - Add locking around creation of CacheDir config file. Fixes #4489.
+    - Clarify MergeFlags usage of a dict argument.
 
 
 RELEASE 4.6.0 -  Sun, 19 Nov 2023 17:22:20 -0700
diff --git a/RELEASE.txt b/RELEASE.txt
index c390089..5c68970 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -103,6 +103,7 @@ DOCUMENTATION
   A warning about overwriting env['ENV'] and one about Configure
   checks possibly not running in in no-exec mode also added.
 - Clarify how SCons finds the project top directory, and what that is used for.
+- Clarify MergeFlags usage of a dict argument.
 
 
 
diff --git a/SCons/Environment.xml b/SCons/Environment.xml
index 39a6529..0c7eed5 100644
--- a/SCons/Environment.xml
+++ b/SCons/Environment.xml
@@ -638,7 +638,7 @@ In this case, space-separated strings are not split.</para>
 </listitem>
 <listitem>
 <para>A dictionary is processed in order,
-adding each key:value pair as a valued macro.
+adding each key-value pair as a valued macro.
 Use the value <constant>None</constant> if the macro should not have a value.
 </para>
 </listitem>
@@ -723,7 +723,7 @@ Appending a string <parameter>val</parameter>
 to a dictonary-typed &consvar; enters
 <parameter>val</parameter> as the key in the dictionary,
 and <literal>None</literal> as its value.
-Using a tuple type to supply a <literal>key, value</literal>
+Using a tuple type to supply a key-value pair
 only works for the special case of &cv-CPPDEFINES;
 described above.
 </para>
@@ -2342,35 +2342,38 @@ env.MergeShellPaths({'INCLUDE': ['c:/inc1', 'c:/inc2']}, prepend=0)
 <para>
 Merges values from
 <parameter>arg</parameter>
-into &consvars; in the current &consenv;.
-If
-<parameter>arg</parameter>
+into &consvars; in <parameter>env</parameter>.
+If <parameter>arg</parameter> is a dictionary,
+each key-value pair represents a
+&consvar; name and the corresponding flags to merge.
+If <parameter>arg</parameter>
 is not a dictionary,
-it is converted to one by calling
-&f-link-env-ParseFlags;
-on the argument
+&MergeFlags; attempts to convert it to one
 before the values are merged.
-Note that
+&f-link-env-ParseFlags; is used for this,
+so values to be converted are subject to the
+same limitations:
+&ParseFlags; has knowledge of which &consvars; certain
+flags should go to, but not all;
+and only for GCC and compatible compiler chains.
 <parameter>arg</parameter>
-must be a single value,
-so multiple strings must
-be passed in as a list,
-not as separate arguments to
-&f-env-MergeFlags;.
+must be a single object,
+so to pass multiple strings,
+enclose them in a list.
 </para>
 
 <para>
 If <literal>unique</literal> is true (the default),
-duplicate values are not stored.
-When eliminating duplicate values,
-any &consvars; that end with
-the string
+duplicate values are not retained.
+In case of duplication,
+any &consvar; names that end in
 <literal>PATH</literal>
-keep the left-most unique value.
+keep the left-most value so the
+path searcb order is not altered.
 All other &consvars; keep
-the right-most unique value.
+the right-most value.
 If <literal>unique</literal> is false,
-values are added even if they are duplicates.
+values are appended even if they are duplicates.
 </para>
 
 <para>
@@ -2379,14 +2382,14 @@ Examples:
 
 <example_commands>
 # Add an optimization flag to $CCFLAGS.
-env.MergeFlags('-O3')
+env.MergeFlags({'CCFLAGS': '-O3'})
 
 # Combine the flags returned from running pkg-config with an optimization
 # flag and merge the result into the construction variables.
 env.MergeFlags(['!pkg-config gtk+-2.0 --cflags', '-O3'])
 
 # Combine an optimization flag with the flags returned from running pkg-config
-# twice and merge the result into the construction variables.
+# for two distinct packages and merge into the construction variables.
 env.MergeFlags(
     [
         '-O3',
-- 
cgit v0.12