summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-10-06 03:08:45 (GMT)
committerSteven Knight <knight@baldmt.com>2004-10-06 03:08:45 (GMT)
commit81d864dc3633dee1cc30af3e286f95d81956b7a5 (patch)
tree65f4540a8da20b86fa932c9d46279f5fdcc6d949 /src
parent79e688ca5ed799cfce8c28a907d45452f1bf2255 (diff)
downloadSCons-81d864dc3633dee1cc30af3e286f95d81956b7a5.zip
SCons-81d864dc3633dee1cc30af3e286f95d81956b7a5.tar.gz
SCons-81d864dc3633dee1cc30af3e286f95d81956b7a5.tar.bz2
Add a deprecated warning for the scanner keyword argument for Builder creation. (Kevin Quick)
Diffstat (limited to 'src')
-rw-r--r--src/CHANGES.txt3
-rw-r--r--src/engine/SCons/Builder.py5
-rw-r--r--src/engine/SCons/Tool/midl.py2
3 files changed, 9 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index dc9b733..cf8a4e9 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -183,6 +183,9 @@ RELEASE 0.97 - XXX
Make comparisons of Scanner objects more robust. Add a name to
an internal default ObjSourceScanner.
+ - Add a deprecated warning for use of the old "scanner" keyword argument
+ to Builder creation.
+
From Christoph Wiedemann:
- Add an Environment.SetDefault() method that only sets values if
diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py
index 8e46332..e9d4e11 100644
--- a/src/engine/SCons/Builder.py
+++ b/src/engine/SCons/Builder.py
@@ -430,6 +430,11 @@ class BuilderBase:
"\tspecify the items as keyword arguments to the Builder() call instead.")
overrides.update(overrides['overrides'])
del overrides['overrides']
+ if overrides.has_key('scanner'):
+ SCons.Warnings.warn(SCons.Warnings.DeprecatedWarning,
+ "The \"scanner\" keyword to Builder() creation has been deprecated;\n"
+ "\tuse: source_scanner or target_scanner as appropriate.")
+ del overrides['scanner']
self.overrides = overrides
self.set_src_suffix(src_suffix)
diff --git a/src/engine/SCons/Tool/midl.py b/src/engine/SCons/Tool/midl.py
index 843d31b..6be91ef 100644
--- a/src/engine/SCons/Tool/midl.py
+++ b/src/engine/SCons/Tool/midl.py
@@ -57,7 +57,7 @@ midl_builder = SCons.Builder.Builder(action='$MIDLCOM',
src_suffix = '.idl',
suffix='.tlb',
emitter = midl_emitter,
- scanner = idl_scanner)
+ source_scanner = idl_scanner)
def generate(env):
"""Add Builders and construction variables for midl to an Environment."""