summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2020-02-15 16:01:36 (GMT)
committerMats Wichmann <mats@linux.com>2020-02-15 16:01:36 (GMT)
commit83304e49c44ec770bb5770d6ef6a6ece4dec92f8 (patch)
treed1fd5378fc11679a1a4841c6437f56c3d08b8a0b
parent348f8d81b6aa49d8798eac268700806d121c5f4f (diff)
downloadSCons-83304e49c44ec770bb5770d6ef6a6ece4dec92f8.zip
SCons-83304e49c44ec770bb5770d6ef6a6ece4dec92f8.tar.gz
SCons-83304e49c44ec770bb5770d6ef6a6ece4dec92f8.tar.bz2
Change errant TEXFTILESUFFIX to SUBSTFILESUFFIX
In one location a copy-paste apparently didn't get fixed up, and the wrong construction var was used. Fixes #3540 Signed-off-by: Mats Wichmann <mats@linux.com>
-rwxr-xr-xsrc/CHANGES.txt1
-rw-r--r--src/engine/SCons/Tool/textfile.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index b3a7422..4638bd6 100755
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -68,6 +68,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
- Add an alternate warning message cl.exe is not found and msvc config
cache is in use (SCONS_CACHE_MSVC_CONFIG was given) - config cache
may be out of date.
+ - Fix typo TEXTFILESUFFIX -> SUBSTFILESUFFIX (bug #3540)
RELEASE 3.1.2 - Mon, 17 Dec 2019 02:06:27 +0000
diff --git a/src/engine/SCons/Tool/textfile.py b/src/engine/SCons/Tool/textfile.py
index c233658..b404304 100644
--- a/src/engine/SCons/Tool/textfile.py
+++ b/src/engine/SCons/Tool/textfile.py
@@ -171,7 +171,7 @@ _text_builder = SCons.Builder.Builder(
suffix='$TEXTFILESUFFIX',
)
-_subst_varlist = _common_varlist + ['SUBSTFILEPREFIX', 'TEXTFILESUFFIX']
+_subst_varlist = _common_varlist + ['SUBSTFILEPREFIX', 'SUBSTFILESUFFIX']
_subst_builder = SCons.Builder.Builder(
action=SCons.Action.Action(_action, _strfunc, varlist=_subst_varlist),
source_factory=SCons.Node.FS.File,