diff options
| author | Steven Knight <knight@baldmt.com> | 2002-07-17 23:12:12 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-07-17 23:12:12 (GMT) |
| commit | 64a0553a81deaa7cab0158d9f533a1f460ad2c8b (patch) | |
| tree | f8aacc828f3c77f73d8bebf5b6c5ec78eacf05d5 /src/engine/SCons/Script/SConscript.py | |
| parent | 1c2adf628d15657cee31f82525493bd9ab84b369 (diff) | |
| download | SCons-64a0553a81deaa7cab0158d9f533a1f460ad2c8b.zip SCons-64a0553a81deaa7cab0158d9f533a1f460ad2c8b.tar.gz SCons-64a0553a81deaa7cab0158d9f533a1f460ad2c8b.tar.bz2 | |
Repository support (first cut).
Diffstat (limited to 'src/engine/SCons/Script/SConscript.py')
| -rw-r--r-- | src/engine/SCons/Script/SConscript.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index 48c4046..e088c99 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -167,7 +167,7 @@ def SConscript(*ls, **kw): else: f = SCons.Node.FS.default_fs.File(str(fn)) if f.exists(): - file = open(str(f), "r") + file = open(f.rstr(), "r") SCons.Node.FS.default_fs.chdir(f.dir) if sconscript_chdir: old_dir = os.getcwd() @@ -276,10 +276,13 @@ def BuildDefaultGlobals(): globals['FindFile'] = FindFile globals['GetBuildPath'] = GetBuildPath globals['GetCommandHandler'] = SCons.Action.GetCommandHandler + globals['GetLaunchDir'] = GetLaunchDir globals['Help'] = Help globals['Import'] = Import globals['Library'] = SCons.Defaults.StaticLibrary globals['Object'] = SCons.Defaults.StaticObject + globals['Repository'] = SCons.Node.FS.default_fs.Repository + globals['SetBuildSignatureType'] = SetBuildSignatureType globals['StaticLibrary'] = SCons.Defaults.StaticLibrary globals['StaticObject'] = SCons.Defaults.StaticObject globals['SharedLibrary'] = SCons.Defaults.SharedLibrary @@ -294,6 +297,4 @@ def BuildDefaultGlobals(): globals['Split'] = SCons.Util.Split globals['Tool'] = SCons.Tool.Tool globals['WhereIs'] = SCons.Util.WhereIs - globals['GetLaunchDir'] = GetLaunchDir - globals['SetBuildSignatureType'] = SetBuildSignatureType return globals |