summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/CHANGES.txt1
-rw-r--r--src/engine/SCons/Script/__init__.py2
-rw-r--r--src/engine/SCons/Tool/__init__.py2
3 files changed, 5 insertions, 0 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index c9d4ceb..97c3455 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -175,6 +175,7 @@ RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
- Some script changes in trying to find scons engine
- Update (pep8) configure-cache script, add a --show option.
- Fix for a couple of "what if tool not found" exceptions in framework.
+ - Add Textfile/Substfile to default environment. (issue #3147)
From Bernhard M. Wiedemann:
- Update SCons' internal scons build logic to allow overriding build date
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index d602507..007eb0d 100644
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -377,7 +377,9 @@ GlobalDefaultBuilders = [
'SharedObject',
'StaticLibrary',
'StaticObject',
+ 'Substfile',
'Tar',
+ 'Textfile',
'TypeLibrary',
'Zip',
'Package',
diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py
index 8a94a71..d5fe445 100644
--- a/src/engine/SCons/Tool/__init__.py
+++ b/src/engine/SCons/Tool/__init__.py
@@ -1239,6 +1239,8 @@ def tool_list(platform, env):
'tex', 'latex', 'pdflatex', 'pdftex',
# Archivers
'tar', 'zip',
+ # Text tools
+ 'textfile',
], env)
tools = ([linker, c_compiler, cxx_compiler,