diff options
| author | Steven Knight <knight@baldmt.com> | 2002-01-15 18:57:52 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-01-15 18:57:52 (GMT) |
| commit | acae06481e87492d8d5b26b5fc102b9e73e8a2f3 (patch) | |
| tree | c97faa0cbd84634aaf2a6b05f24ab0c10de63dd1 /src | |
| parent | b0303dacea7ad8ccd913648302b1c6af2d55404e (diff) | |
| download | SCons-acae06481e87492d8d5b26b5fc102b9e73e8a2f3.zip SCons-acae06481e87492d8d5b26b5fc102b9e73e8a2f3.tar.gz SCons-acae06481e87492d8d5b26b5fc102b9e73e8a2f3.tar.bz2 | |
Add Action() and Scanner() the list of global variables.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Script/SConscript.py | 35 |
2 files changed, 22 insertions, 16 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 70e30be..f87056f 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -23,6 +23,9 @@ RELEASE 0.04 - - Function action fixes: None is now a successful return value. Exceptions are now reported. Document function actions. + - Add 'Action' and 'Scanner' to the global keywords so SConscript + files can use them too. + RELEASE 0.03 - Fri, 11 Jan 2002 01:09:30 -0600 diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index 4208eba..8ba64d1 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -36,6 +36,7 @@ import SCons.Defaults import SCons.Node import SCons.Node.FS import SCons.Environment +import SCons.Scanner import SCons.Action import string import sys @@ -161,21 +162,23 @@ def BuildDefaultGlobals(): """ globals = {} - globals['Builder'] = SCons.Builder.Builder - globals['Environment'] = SCons.Environment.Environment - globals['Object'] = SCons.Defaults.Object - globals['Program'] = SCons.Defaults.Program - globals['Library'] = SCons.Defaults.Library - globals['CScan'] = SCons.Defaults.CScan - globals['SConscript'] = SConscript - globals['Default'] = Default - globals['Help'] = Help - globals['BuildDir'] = BuildDir - globals['GetBuildPath'] = GetBuildPath - globals['Export'] = Export - globals['Import'] = Import - globals['Return'] = Return - globals['Dir'] = SCons.Node.FS.default_fs.Dir - globals['File'] = SCons.Node.FS.default_fs.File + globals['Action'] = SCons.Action.Action + globals['BuildDir'] = BuildDir + globals['Builder'] = SCons.Builder.Builder + globals['CScan'] = SCons.Defaults.CScan + globals['Default'] = Default + globals['Dir'] = SCons.Node.FS.default_fs.Dir + globals['Environment'] = SCons.Environment.Environment + globals['Export'] = Export + globals['File'] = SCons.Node.FS.default_fs.File + globals['GetBuildPath'] = GetBuildPath + globals['Help'] = Help + globals['Import'] = Import + globals['Library'] = SCons.Defaults.Library + globals['Object'] = SCons.Defaults.Object + globals['Program'] = SCons.Defaults.Program + globals['Return'] = Return + globals['Scanner'] = SCons.Scanner.Base + globals['SConscript'] = SConscript globals['SetCommandHandler'] = SCons.Action.SetCommandHandler return globals |