Fix use of SConf with SConscriptChdir(). (David Snopek, Christoph Wiedemann)

2 files changed, 6 insertions, 31 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index b4d409c..b86c2de 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -10,20 +10,6 @@
 
 RELEASE 0.15 - XXX
 
-  From Matt Balvin:
-
-  - Fix handling of library prefixes when the subdirectory matches
-    the prefix.
-
-  From Timothee Bessett:
-
-  - Add an M4 Builder.
-
-  From Charles Crain:
-
-  - Use '.lnk' as the suffix on the temporary file for linking long
-    command lines (necessary for the Phar Lap linkloc linker).
-
   From Steven Knight:
 
   - SCons now enforces (with an error) that construction variables
@@ -35,27 +21,10 @@ RELEASE 0.15 - XXX
   - Eliminate a dependency on the distutils.fancy_getopt module by
     copying and pasting its wrap_text() function directly.
 
-  - Make the Script.Options() subclass match the underlying base class
-    implementation.
-
-  From Steve Leblanc:
-
-  - Don't update the .sconsign files when run with -n.
-
   From David Snopek and Christoph Wiedemann
 
   - Fix use of the SConf subsystem with SConscriptChdir().
 
-  From Greg Spencer
-
-  - Check for the existence of MS Visual Studio on disk before using it,
-    to avoid getting fooled by leftover junk in the registry.
-
-  - Add support for MSVC++ .NET.
-
-  - Add support for MS Visual Studio project files (DSP, DSW,
-    SLN and VCPROJ files).
-
 
 
 RELEASE 0.14 - Wed, 21 May 2003 05:16:32 -0500
diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py
index 1546fb1..d01ce7e 100644
--- a/src/engine/SCons/SConf.py
+++ b/src/engine/SCons/SConf.py
@@ -163,6 +163,11 @@ class SConf:
             sys.stdout = self.logstream
             oldStderr = sys.stderr
             sys.stderr = self.logstream
+
+        # the engine assumes the current path is the SConstruct directory ...
+        oldcwd = os.getcwd()
+        os.chdir(SConfFS.pathTop)
+
         self._setCache( nodes ) 
         ret = 1
 
@@ -190,6 +195,7 @@ class SConf:
                     # the node could not be built. we return 0 in this case
                     ret = 0
         finally:
+            os.chdir(oldcwd)
             if self.logstream != None:
                 # restore stdout / stderr
                 sys.stdout = oldStdout