summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Moody <dmoody256@gmail.com>2022-05-11 02:17:58 (GMT)
committerDaniel Moody <dmoody256@gmail.com>2022-05-11 02:17:58 (GMT)
commitf8458960e2d9cf190298f57643d4439e3ee882ad (patch)
tree2bae2fa15fb9dcf7089d0d4cc53a3e1d34483ecd
parente99fa0ca00f414a6c446090d2926747f931c73d5 (diff)
downloadSCons-f8458960e2d9cf190298f57643d4439e3ee882ad.zip
SCons-f8458960e2d9cf190298f57643d4439e3ee882ad.tar.gz
SCons-f8458960e2d9cf190298f57643d4439e3ee882ad.tar.bz2
fix whitespace typo
-rwxr-xr-xCHANGES.txt2
-rwxr-xr-xRELEASE.txt2
-rw-r--r--SCons/Action.py2
-rw-r--r--SCons/Action.xml2
-rw-r--r--test/Actions/subst_shell_env-fixture/SConstruct2
5 files changed, 5 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index edb9648..3383bc4 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -80,7 +80,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
- Added user configurable setting of ninja depfile format via NINJA_DEPFILE_PARSE_FORMAT.
Now setting NINJA_DEPFILE_PARSE_FORMAT to [msvc,gcc,clang] can force the ninja expected
format. Compiler tools will also configure the variable automatically.
- - Added SHELL_ENV_GENERATOR construction variables. This variable allows the user to Define
+ - Added SHELL_ENV_GENERATOR construction variables. This variable allows the user to Define
a function which will be called to obtain an environment which will be used in the shell
command of some Action.
diff --git a/RELEASE.txt b/RELEASE.txt
index abb4391..22db598 100755
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -16,7 +16,7 @@ NEW FUNCTIONALITY
- Added MSVC_USE_SCRIPT_ARGS variable to pass arguments to MSVC_USE_SCRIPT.
- Added Configure.CheckMember() checker to check if struct/class has the specified member.
-- Added SHELL_ENV_GENERATOR construction variables. This variable allows the user to Define
+- Added SHELL_ENV_GENERATOR construction variables. This variable allows the user to Define
a function which will be called to obtain an environment which will be used in the shell
command of some Action.
diff --git a/SCons/Action.py b/SCons/Action.py
index 5c127a9..0849178 100644
--- a/SCons/Action.py
+++ b/SCons/Action.py
@@ -924,7 +924,7 @@ class CommandAction(_ActionAction):
escape = env.get('ESCAPE', lambda x: x)
- ENV = env.get('SHELL_ENV_GENERATOR ', get_default_ENV)(env, target, source)
+ ENV = env.get('SHELL_ENV_GENERATOR', get_default_ENV)(env, target, source)
# Ensure that the ENV values are all strings:
diff --git a/SCons/Action.xml b/SCons/Action.xml
index 8849f71..ee24a68 100644
--- a/SCons/Action.xml
+++ b/SCons/Action.xml
@@ -200,7 +200,7 @@ in which the command should be executed.
</summary>
</cvar>
-<cvar name="SHELL_ENV_GENERATOR ">
+<cvar name="SHELL_ENV_GENERATOR">
<summary>
<para>
A function to obtain the environment dictionary which will be used
diff --git a/test/Actions/subst_shell_env-fixture/SConstruct b/test/Actions/subst_shell_env-fixture/SConstruct
index 18a04bc..6e48add 100644
--- a/test/Actions/subst_shell_env-fixture/SConstruct
+++ b/test/Actions/subst_shell_env-fixture/SConstruct
@@ -10,7 +10,7 @@ def expand_this_generator(env, target, source, for_signature):
env = Environment(tools=['textfile'])
-env['SHELL_ENV_GENERATOR '] = custom_environment_expansion
+env['SHELL_ENV_GENERATOR'] = custom_environment_expansion
env['EXPAND_THIS'] = expand_this_generator
env['ENV']['EXPANDED_SHELL_VAR'] = "$EXPAND_THIS"