Fix use of VariantDir when the -n option is used and doesn't,

therefore, actually create the variant directory.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3693 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 516850e0f8793cfde5de9d5f341cc66402fe4feb..8a16c8c8d729b8c23edf80ff0a26a89332acf474 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -21,6 +21,9 @@ RELEASE 1.X - XXX
     - Support using the -f option to search for a different top-level
       file name when walking up with the -D, -U or -u options.
 
+    - Fix use of VariantDir when the -n option is used and doesn't,
+      therefore, actually create the variant directory.
+
 
 
 RELEASE 1.1.0 - Thu, 09 Oct 2008 08:33:47 -0700

diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py
index 5cfde6499e5fa1770bec758cb806674f748d40a4..4119a3b6a210abdbfae7cee71c497b0257d0eff1 100644 (file)
--- a/src/engine/SCons/Script/SConscript.py
+++ b/src/engine/SCons/Script/SConscript.py
@@ -279,7 +279,20 @@ def _SConscript(fs, *files, **kw):
                 fs.chdir(frame.prev_dir, change_os_dir=0)
                 rdir = frame.prev_dir.rdir()
                 rdir._create()  # Make sure there's a directory there.
-                os.chdir(rdir.get_abspath())
+                try:
+                    os.chdir(rdir.get_abspath())
+                except OSError, e:
+                    # We still couldn't chdir there, so raise the error,
+                    # but only if actions are being executed.
+                    #
+                    # If the -n option was used, the directory would *not*
+                    # have been created and we should just carry on and
+                    # let things muddle through.  This isn't guaranteed
+                    # to work if the SConscript files are reading things
+                    # from disk (for example), but it should work well
+                    # enough for most configurations.
+                    if SCons.Action.execute_actions:
+                        raise e
 
             results.append(frame.retval)
 

diff --git a/test/VariantDir/no-execute.py b/test/VariantDir/no-execute.py
new file mode 100644 (file)
index 0000000..2006b31
--- /dev/null
+++ b/test/VariantDir/no-execute.py
@@ -0,0 +1,67 @@
+
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Verify that use of a VariantDir works when the -n option is used (and
+the VariantDir, therefore, isn't actually created).
+"""
+
+import os
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.subdir('a')
+
+test.write('SConstruct', """\
+env = Environment()
+Export('env')
+env.SConscript('SConscript', exported=['env'], variant_dir='build', duplicate=0)
+""")
+
+test.write('SConscript', """\
+Import(['env'])
+env.SConscript('a/SConscript', exports=['env'], duplicate=0)
+""")
+
+test.write(['a', 'SConscript'], """\
+Import(['env'])
+env.Command('file.out', 'file.in', Copy('$TARGET', '$SOURCE'))
+""")
+
+test.write(['a', 'file.in'], "a/file.in\n")
+
+expect = """\
+scons: building associated VariantDir targets: build
+Copy("%s", "%s")
+""" % (os.path.join('build', 'a', 'file.out'),
+       os.path.join('a', 'file.in'))
+
+test.run(arguments = '-Q -n', stdout=expect)
+
+test.pass_test()