Remove widespread reliance on SCons.Node.FS.default_fs so we can initialize it once (later than we used to) and eliminate all the __setTopLevelDir() calls.

9 files changed, 16 insertions, 19 deletions

diff --git a/src/engine/SCons/Tool/Perforce.py b/src/engine/SCons/Tool/Perforce.py
index 22c75e9..37115e9 100644
--- a/src/engine/SCons/Tool/Perforce.py
+++ b/src/engine/SCons/Tool/Perforce.py
@@ -75,7 +75,7 @@ def generate(env):
     # calling getcwd() for itself, which is odd.  If no PWD variable
     # is present, p4 WILL call getcwd, but this seems to cause problems
     # with good ol' Win32's tilde-mangling for long file names.
-    environ['PWD'] = SCons.Node.FS.default_fs.Dir('#').get_abspath()
+    environ['PWD'] = env.Dir('#').get_abspath()
 
     for var in _import_env:
         v = os.environ.get(var)
diff --git a/src/engine/SCons/Tool/jar.py b/src/engine/SCons/Tool/jar.py
index a721d96..b069990 100644
--- a/src/engine/SCons/Tool/jar.py
+++ b/src/engine/SCons/Tool/jar.py
@@ -82,7 +82,7 @@ def jarChdir(target, source, env, for_signature):
 JarAction = SCons.Action.Action('$JARCOM', '$JARCOMSTR')
 
 JarBuilder = SCons.Builder.Builder(action = JarAction,
-                                   source_factory = SCons.Node.FS.default_fs.Entry,
+                                   source_factory = SCons.Node.FS.Entry,
                                    suffix = '$JARSUFFIX')
 
 def generate(env):
diff --git a/src/engine/SCons/Tool/javac.py b/src/engine/SCons/Tool/javac.py
index 8741c23..44a4bd0 100644
--- a/src/engine/SCons/Tool/javac.py
+++ b/src/engine/SCons/Tool/javac.py
@@ -99,8 +99,8 @@ JavaAction = SCons.Action.Action('$JAVACCOM', '$JAVACCOMSTR')
 
 JavaBuilder = SCons.Builder.Builder(action = JavaAction,
                     emitter = emit_java_classes,
-                    target_factory = SCons.Node.FS.default_fs.Dir,
-                    source_factory = SCons.Node.FS.default_fs.Dir)
+                    target_factory = SCons.Node.FS.Dir,
+                    source_factory = SCons.Node.FS.Dir)
 
 def generate(env):
     """Add Builders and construction variables for javac to an Environment."""
diff --git a/src/engine/SCons/Tool/javah.py b/src/engine/SCons/Tool/javah.py
index 4d5749a..26fcc53 100644
--- a/src/engine/SCons/Tool/javah.py
+++ b/src/engine/SCons/Tool/javah.py
@@ -59,7 +59,7 @@ def emit_java_headers(target, source, env):
                 classdir = s.attributes.java_classdir
             except AttributeError:
                 classdir = '.'
-    classdir = SCons.Node.FS.default_fs.Dir(classdir).rdir()
+    classdir = env.Dir(classdir).rdir()
     if str(classdir) == '.':
         c_ = None
     else:
@@ -111,8 +111,8 @@ JavaHAction = SCons.Action.Action('$JAVAHCOM', '$JAVAHCOMSTR')
 JavaHBuilder = SCons.Builder.Builder(action = JavaHAction,
                      emitter = emit_java_headers,
                      src_suffix = '$JAVACLASSSUFFIX',
-                     target_factory = SCons.Node.FS.default_fs.Entry,
-                     source_factory = SCons.Node.FS.default_fs.File)
+                     target_factory = SCons.Node.FS.Entry,
+                     source_factory = SCons.Node.FS.File)
 
 def generate(env):
     """Add Builders and construction variables for javah to an Environment."""
diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py
index 04e09f5..e03eb8d 100644
--- a/src/engine/SCons/Tool/msvs.py
+++ b/src/engine/SCons/Tool/msvs.py
@@ -1049,8 +1049,8 @@ def projectEmitter(target, source, env):
     suff = env.subst('$MSVSPROJECTSUFFIX')
     target[0] = base + suff
 
-    dspfile = SCons.Node.FS.default_fs.File(target[0]).srcnode()
-    dswfile = SCons.Node.FS.default_fs.File(SCons.Util.splitext(str(dspfile))[0] + env.subst('$MSVSSOLUTIONSUFFIX'))
+    dspfile = env.File(target[0]).srcnode()
+    dswfile = env.File(SCons.Util.splitext(str(dspfile))[0] + env.subst('$MSVSSOLUTIONSUFFIX'))
 
     # XXX Need to find a way to abstract this; the build engine
     # shouldn't depend on anything in SCons.Script.
@@ -1060,7 +1060,7 @@ def projectEmitter(target, source, env):
     source[0].attributes.sconstruct = stack[0].sconscript
 
     bdswpath = SCons.Util.splitext(str(target[0]))[0] + env.subst('$MSVSSOLUTIONSUFFIX')
-    bdswfile = SCons.Node.FS.default_fs.File(bdswpath)
+    bdswfile = env.File(bdswpath)
 
     # only make these side effects if they're
     # not the same file.
diff --git a/src/engine/SCons/Tool/qt.py b/src/engine/SCons/Tool/qt.py
index bc2d41b..04b6215 100644
--- a/src/engine/SCons/Tool/qt.py
+++ b/src/engine/SCons/Tool/qt.py
@@ -107,7 +107,6 @@ class _Automoc:
             debug = 0
         
         # some shortcuts used in the scanner
-        FS = SCons.Node.FS.default_fs
         splitext = SCons.Util.splitext
         objBuilder = getattr(env, self.objBuilderName)
   
@@ -147,9 +146,7 @@ class _Automoc:
                 # try to find the header file in the corresponding source
                 # directory
                 hname = splitext(cpp.name)[0] + h_ext
-                h = find_file(hname,
-                              (cpp.get_dir(),),
-                              FS.File)
+                h = find_file(hname, (cpp.get_dir(),), env.File)
                 if h:
                     if debug:
                         print "scons: qt: Scanning '%s' (header of '%s')" % (str(h), str(cpp))
diff --git a/src/engine/SCons/Tool/rmic.py b/src/engine/SCons/Tool/rmic.py
index c5c4854..4b48e0b 100644
--- a/src/engine/SCons/Tool/rmic.py
+++ b/src/engine/SCons/Tool/rmic.py
@@ -58,7 +58,7 @@ def emit_rmic_classes(target, source, env):
                 classdir = s.attributes.java_classdir
             except AttributeError:
                 classdir = '.'
-    classdir = SCons.Node.FS.default_fs.Dir(classdir).rdir()
+    classdir = env.Dir(classdir).rdir()
     if str(classdir) == '.':
         c_ = None
     else:
@@ -95,8 +95,8 @@ RMICAction = SCons.Action.Action('$RMICCOM', '$RMICCOMSTR')
 RMICBuilder = SCons.Builder.Builder(action = RMICAction,
                      emitter = emit_rmic_classes,
                      src_suffix = '$JAVACLASSSUFFIX',
-                     target_factory = SCons.Node.FS.default_fs.Dir,
-                     source_factory = SCons.Node.FS.default_fs.File)
+                     target_factory = SCons.Node.FS.Dir,
+                     source_factory = SCons.Node.FS.File)
 
 def generate(env):
     """Add Builders and construction variables for rmic to an Environment."""
diff --git a/src/engine/SCons/Tool/tar.py b/src/engine/SCons/Tool/tar.py
index 079865e..58b7554 100644
--- a/src/engine/SCons/Tool/tar.py
+++ b/src/engine/SCons/Tool/tar.py
@@ -44,7 +44,7 @@ tars = ['tar', 'gtar']
 TarAction = SCons.Action.Action('$TARCOM', '$TARCOMSTR')
 
 TarBuilder = SCons.Builder.Builder(action = TarAction,
-                                   source_factory = SCons.Node.FS.default_fs.Entry,
+                                   source_factory = SCons.Node.FS.Entry,
                                    source_scanner = SCons.Defaults.DirScanner,
                                    suffix = '$TARSUFFIX',
                                    multi = 1)
diff --git a/src/engine/SCons/Tool/zip.py b/src/engine/SCons/Tool/zip.py
index b67528b..fe9ce32 100644
--- a/src/engine/SCons/Tool/zip.py
+++ b/src/engine/SCons/Tool/zip.py
@@ -69,7 +69,7 @@ else:
 zipAction = SCons.Action.Action(zip, varlist=['ZIPCOMPRESSION'])
 
 ZipBuilder = SCons.Builder.Builder(action = SCons.Action.Action('$ZIPCOM', '$ZIPCOMSTR'),
-                                   source_factory = SCons.Node.FS.default_fs.Entry,
+                                   source_factory = SCons.Node.FS.Entry,
                                    source_scanner = SCons.Defaults.DirScanner,
                                    suffix = '$ZIPSUFFIX',
                                    multi = 1)