From becb5c6cbc5a370b4778374771777c2b493eaa05 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Sun, 22 Nov 2020 07:11:00 -0700 Subject: Move wix tool into windows tool section The wix tool has a slightly expensive "exists" function, so its placement in the tool list as generic means non-Windows platforms also pay this cost. Moved to the win32 section for other_plat_tools as it's only available on Windows platforms. Signed-off-by: Mats Wichmann --- CHANGES.txt | 1 + SCons/Tool/__init__.py | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 7dc5297..e044a67 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -79,6 +79,7 @@ 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. + - Move wix tool into windows-specific section. 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 -- cgit v0.12 From 1a0ba5f53741cc58201084cef93730adaab7b02b Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 23 Nov 2020 20:34:55 -0800 Subject: Update CHANGES.txt working for the change --- CHANGES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 6440664..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,7 +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. - - Move wix tool into windows-specific section. + - 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 -- cgit v0.12