diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-11-18 02:26:23 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-18 02:26:23 (GMT) |
| commit | e8d4f018e5cb5dd0dd420f356b10b1d4788313e9 (patch) | |
| tree | eda1ae18ead5321efef7daf489f48aacb5f5add6 | |
| parent | 6ae91363be2214556f38077c08cf8fb9446b84a7 (diff) | |
| parent | e6681c658b940fd1fe1a2078106ff96e489bcc23 (diff) | |
| download | SCons-e8d4f018e5cb5dd0dd420f356b10b1d4788313e9.zip SCons-e8d4f018e5cb5dd0dd420f356b10b1d4788313e9.tar.gz SCons-e8d4f018e5cb5dd0dd420f356b10b1d4788313e9.tar.bz2 | |
Merge pull request #3242 from mwichmann/wip-textfile
Add Textfile/Substfile to default.
| -rw-r--r-- | src/CHANGES.txt | 1 | ||||
| -rw-r--r-- | src/engine/SCons/Script/__init__.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/__init__.py | 2 |
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, |