diff options
| author | William Deegan <bill@baddogconsulting.com> | 2020-11-24 04:35:07 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2020-11-24 04:35:07 (GMT) |
| commit | 3e67139b312c388289047f969701542365497c6d (patch) | |
| tree | 8a3f9cf23e3d260be1ee18a60b2414198f2be3ca | |
| parent | b0a643847dcf0e37848f9abf7bb1dab0dbd73505 (diff) | |
| parent | 1a0ba5f53741cc58201084cef93730adaab7b02b (diff) | |
| download | SCons-3e67139b312c388289047f969701542365497c6d.zip SCons-3e67139b312c388289047f969701542365497c6d.tar.gz SCons-3e67139b312c388289047f969701542365497c6d.tar.bz2 | |
Merge branch 'mwichmann-wix-win'
| -rwxr-xr-x | CHANGES.txt | 3 | ||||
| -rw-r--r-- | SCons/Tool/__init__.py | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 6263709..38b1cdd 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -30,7 +30,6 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Fix Issue #3759 - include scons.1, sconsign.1, scons-time.1 manpages in sdist and wheel packages. - Change SCons's build so the generated `SCons/__init__.py` is no longer removed by `scons -c` - From Michał Górny: - Fix dvipdf test failure due to passing incorrect flag to dvipdf. @@ -83,6 +82,8 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER runtest test for fallback from qmtest, not needed; added new tests. - Eliminate tex tool usage of "for foo in range(len(iterable))" - Restore internal Trace function to functional state. + - Only try to initialize the wix tool by default (or when tool `default` is explicitly installed) + on Windows based systems. From Simon Tegelid - Fix using TEMPFILE in multiple actions in an action list. Previously a builder, or command diff --git a/SCons/Tool/__init__.py b/SCons/Tool/__init__.py index 0c7afb8..87139f1 100644 --- a/SCons/Tool/__init__.py +++ b/SCons/Tool/__init__.py @@ -694,7 +694,7 @@ def tool_list(platform, env): assemblers = ['masm', 'nasm', 'gas', '386asm'] fortran_compilers = ['gfortran', 'g77', 'ifl', 'cvf', 'f95', 'f90', 'fortran'] ars = ['mslib', 'ar', 'tlib'] - other_plat_tools = ['msvs', 'midl'] + other_plat_tools = ['msvs', 'midl', 'wix'] elif str(platform) == 'os2': "prefer IBM tools on OS/2" linkers = ['ilink', 'gnulink', ] # 'mslink'] @@ -794,7 +794,6 @@ def tool_list(platform, env): # TODO: merge 'install' into 'filesystem' and # make 'filesystem' the default 'filesystem', - 'wix', # 'midl', 'msvs', # Parser generators 'lex', 'yacc', # Foreign function interface |