diff options
| author | Steven Knight <knight@baldmt.com> | 2002-03-24 00:51:23 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-03-24 00:51:23 (GMT) |
| commit | 94d7ac89ad998937fbbc3c896dffc88cece8e925 (patch) | |
| tree | 9120c2c8716c1ff5c824a644fb3a967ada0e8fd0 /src/engine/SCons/Scanner | |
| parent | 2fa424ece5fd4df18a3aeff1f6e59e2ecb41a28e (diff) | |
| download | SCons-94d7ac89ad998937fbbc3c896dffc88cece8e925.zip SCons-94d7ac89ad998937fbbc3c896dffc88cece8e925.tar.gz SCons-94d7ac89ad998937fbbc3c896dffc88cece8e925.tar.bz2 | |
Move SCons.Util.scons_str2nodes() to SCons.Node/__init__.py and shorten its name.
Diffstat (limited to 'src/engine/SCons/Scanner')
| -rw-r--r-- | src/engine/SCons/Scanner/C.py | 7 | ||||
| -rw-r--r-- | src/engine/SCons/Scanner/Prog.py | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/engine/SCons/Scanner/C.py b/src/engine/SCons/Scanner/C.py index 7a9a4ba..8d4497c 100644 --- a/src/engine/SCons/Scanner/C.py +++ b/src/engine/SCons/Scanner/C.py @@ -33,6 +33,9 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import copy import os.path import re + +import SCons.Node +import SCons.Node.FS import SCons.Scanner import SCons.Util @@ -60,8 +63,8 @@ class CScanner(SCons.Scanner.Recursive): given environment. """ try: - dirs = tuple(SCons.Util.scons_str2nodes(env.Dictionary('CPPPATH'), - self.fs.Dir)) + dirs = tuple(SCons.Node.arg2nodes(env.Dictionary('CPPPATH'), + self.fs.Dir)) except: dirs = () if not self.pathscanners.has_key(dirs): diff --git a/src/engine/SCons/Scanner/Prog.py b/src/engine/SCons/Scanner/Prog.py index 87b0ce8..9ecc37b 100644 --- a/src/engine/SCons/Scanner/Prog.py +++ b/src/engine/SCons/Scanner/Prog.py @@ -26,6 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import copy import string +import SCons.Node import SCons.Node.FS import SCons.Scanner import SCons.Util @@ -65,8 +66,8 @@ class ProgScanner(SCons.Scanner.Base): libs = string.split(libs) try: - dirs = tuple(SCons.Util.scons_str2nodes(env.Dictionary('LIBPATH'), - self.fs.Dir)) + dirs = tuple(SCons.Node.arg2nodes(env.Dictionary('LIBPATH'), + self.fs.Dir)) except: dirs = () |