diff options
| author | anatoly techtonik <techtonik@gmail.com> | 2014-04-28 22:16:58 (GMT) |
|---|---|---|
| committer | anatoly techtonik <techtonik@gmail.com> | 2014-04-28 22:16:58 (GMT) |
| commit | ba592fdf4a541d1adfbc251232c0eacbe986b490 (patch) | |
| tree | 93ce04cdee444a4f212ea8aa965470015dc944bf | |
| parent | 5036e8048daeb6aaa3e46065d04f80e49bce3ec1 (diff) | |
| download | SCons-ba592fdf4a541d1adfbc251232c0eacbe986b490.zip SCons-ba592fdf4a541d1adfbc251232c0eacbe986b490.tar.gz SCons-ba592fdf4a541d1adfbc251232c0eacbe986b490.tar.bz2 | |
Remove RPM and m4 from default tools on Windows to speed up SCons
start. Note that BitKeeper, CVS, Perforce, RCS, SCCS will be removed
from default tools on all platforms in future.
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/__init__.py | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index d11fd70..105269c 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -35,6 +35,11 @@ RELEASE 2.3.2.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE that were failing because of this extra line in the output * error message when SCons import fails now lists lookup paths - Remove support for QMTest harness from runtest.py + - Remove RPM and m4 from default tools on Windows + - BitKeeper, CVS, Perforce, RCS, SCCS are deprecated from default + tools and will be removed in future SCons versions to speed up + SCons initialization (it will still be possible to use these tools + explicitly) From Dirk Baechle: - Update XML doc editor configuration diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py index 31e3d96..55eb1d3 100644 --- a/src/engine/SCons/Tool/__init__.py +++ b/src/engine/SCons/Tool/__init__.py @@ -772,6 +772,9 @@ def tool_list(platform, env): fortran_compilers = ['gfortran', 'g77', 'ifort', 'ifl', 'f95', 'f90', 'f77'] ars = ['ar', 'mslib'] + if not str(platform) == 'win32': + other_plat_tools += ['m4', 'rpm'] + c_compiler = FindTool(c_compilers, env) or c_compilers[0] # XXX this logic about what tool provides what should somehow be @@ -802,7 +805,6 @@ def tool_list(platform, env): #TODO: merge 'install' into 'filesystem' and # make 'filesystem' the default 'filesystem', - 'm4', 'wix', #'midl', 'msvs', # Parser generators 'lex', 'yacc', @@ -814,7 +816,7 @@ def tool_list(platform, env): 'dvipdf', 'dvips', 'gs', 'tex', 'latex', 'pdflatex', 'pdftex', # Archivers - 'tar', 'zip', 'rpm', + 'tar', 'zip', # SourceCode factories 'BitKeeper', 'CVS', 'Perforce', 'RCS', 'SCCS', # 'Subversion', |