Removed s from scons.

SCSCons/Defaults.py

@@ -123,7 +123,6 @@ SharedCheck = SCons.Action.Action(SharedFlagChecker, None)
 # SConscript files until we've given them some fair warning and a
 # transition period.
 CScan = SCons.Tool.CScanner
-DScan = SCons.Tool.DScanner
 LaTeXScan = SCons.Tool.LaTeXScanner
 ObjSourceScan = SCons.Tool.SourceFileScanner
 ProgScan = SCons.Tool.ProgramScanner
@@ -610,7 +609,6 @@ ConstructionEnvironment = {
     'CONFIGUREDIR': '#/.sconf_temp',
     'CONFIGURELOG': '#/config.log',
     'CPPSUFFIXES': SCons.Tool.CSuffixes,
-    'DSUFFIXES': SCons.Tool.DSuffixes,
     'ENV': {},
     'IDLSUFFIXES': SCons.Tool.IDLSuffixes,
     '_concat': _concat,

SCSCons/Scanner/D.py

@@ -1,67 +0,0 @@
-# MIT License
-#
-# Copyright The SCons Foundation
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-"""Scanner for the Digital Mars "D" programming language.
-
-Coded by Andy Friesen, 17 Nov 2003
-"""
-
-import SCons.Node.FS
-from . import Classic
-
-def DScanner():
-    """Return a prototype Scanner instance for scanning D source files"""
-    ds = D()
-    return ds
-
-class D(Classic):
-    def __init__(self):
-        super().__init__(
-            name="DScanner",
-            suffixes='$DSUFFIXES',
-            path_variable='DPATH',
-            regex=r'(?:import\s+)([\w\s=,.]+)(?:\s*:[\s\w,=]+)?(?:;)',
-        )
-
-    def find_include(self, include, source_dir, path):
-        # translate dots (package separators) to slashes
-        inc = include.replace('.', '/')
-
-        i = SCons.Node.FS.find_file(inc + '.d', (source_dir,) + path)
-        if i is None:
-            i = SCons.Node.FS.find_file(inc + '.di', (source_dir,) + path)
-        return i, include
-
-    def find_include_names(self, node):
-        includes = []
-        for iii in self.cre.findall(node.get_text_contents()):
-            for jjj in iii.split(','):
-                kkk = jjj.split('=')[-1]
-                includes.append(kkk.strip())
-        return includes
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:

SCSCons/Script/__init__.py

@@ -164,7 +164,6 @@ Touch                   = SCons.Defaults.Touch
 
 # Pre-made, public scanners.
 CScanner                = SCons.Tool.CScanner
-DScanner                = SCons.Tool.DScanner
 DirScanner              = SCons.Defaults.DirScanner
 ProgramScanner          = SCons.Tool.ProgramScanner
 SourceFileScanner       = SCons.Tool.SourceFileScanner

SCSCons/Tool/__init__.py

@@ -47,7 +47,6 @@ import SCons.Errors
 import SCons.Node.FS
 import SCons.Scanner
 import SCons.Scanner.C
-import SCons.Scanner.D
 import SCons.Scanner.LaTeX
 import SCons.Scanner.Prog
 import SCons.Scanner.SWIG
@@ -56,7 +55,6 @@ from SCons.Tool.linkCommon import LibSymlinksActionFunction, LibSymlinksStrFun
 DefaultToolpath = []
 
 CScanner = SCons.Scanner.C.CScanner()
-DScanner = SCons.Scanner.D.DScanner()
 LaTeXScanner = SCons.Scanner.LaTeX.LaTeXScanner()
 PDFLaTeXScanner = SCons.Scanner.LaTeX.PDFLaTeXScanner()
 ProgramScanner = SCons.Scanner.Prog.ProgramScanner()
@@ -69,8 +67,6 @@ CSuffixes = [".c", ".C", ".cxx", ".cpp", ".c++", ".cc",
              ".m", ".mm",
              ".S", ".spp", ".SPP", ".sx"]
 
-DSuffixes = ['.d']
-
 IDLSuffixes = [".idl", ".IDL"]
 
 LaTeXSuffixes = [".tex", ".ltx", ".latex"]
@@ -80,9 +76,6 @@ SWIGSuffixes = ['.i']
 for suffix in CSuffixes:
     SourceFileScanner.add_scanner(suffix, CScanner)
 
-for suffix in DSuffixes:
-    SourceFileScanner.add_scanner(suffix, DScanner)
-
 for suffix in SWIGSuffixes:
     SourceFileScanner.add_scanner(suffix, SWIGScanner)
 

SCSCons/Tool/dmd.py

@@ -76,7 +76,6 @@ LIBS
 import SCons.Action
 import SCons.Builder
 import SCons.Defaults
-import SCons.Scanner.D
 import SCons.Tool
 
 import SCons.Tool.DCommon as DCommon

SCSCons/Tool/ldc.py

@@ -52,7 +52,6 @@ Lib tool variables:
 import SCons.Action
 import SCons.Builder
 import SCons.Defaults
-import SCons.Scanner.D
 import SCons.Tool
 
 import SCons.Tool.DCommon as DCommon