Add Install() + Local() functionality.

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

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 1433f2097873976d0816e13ec0935d9f4564e85a..d438cd040b6d6b446cf03b20d11197dffce9c28e 100644 (file)
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -764,7 +764,10 @@ class File(Entry):
                     # ...and it's even up-to-date...
                     if self._local:
                         # ...and they'd like a local copy.
+                        print "Local copy of %s from %s" % (self.path, r.path)
                         file_link(r.path, self.path)
+                        self.set_bsig(bsig)
+                        self.store_bsig()
                     return 1
             self._rfile = self
             return None

diff --git a/test/Repository/Install-Local.py b/test/Repository/Install-Local.py
new file mode 100644 (file)
index 0000000..29c2970
--- /dev/null
+++ b/test/Repository/Install-Local.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2001, 2002 Steven Knight
+#
+# 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__"
+
+import os.path
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.subdir('repository', 'work', ['work', 'install'])
+
+repository_install_file1 = test.workpath('repository', 'install', 'file1')
+repository_install_file2 = test.workpath('repository', 'install', 'file2')
+work_install_file1 = test.workpath('work', 'install', 'file1')
+work_install_file2 = test.workpath('work', 'install', 'file2')
+
+opts = "-Y " + test.workpath('repository')
+
+#
+test.write(['repository', 'SConstruct'], r"""
+env = Environment()
+env.Install('install', 'file1')
+Local(r'%s')
+Local(env.Install('install', 'file2'))
+""" % os.path.join('install', 'file1'))
+
+test.write(['repository', 'file1'], "repository/file1\n")
+test.write(['repository', 'file2'], "repository/file2\n")
+
+test.run(chdir = 'repository', options = opts, arguments = 'install')
+
+test.fail_test(test.read(repository_install_file1) != "repository/file1\n")
+test.fail_test(test.read(repository_install_file2) != "repository/file2\n")
+
+test.up_to_date(chdir = 'repository', options = opts, arguments = 'install')
+
+# Make the entire repository non-writable, so we'll detect
+# if we try to write into it accidentally.
+test.writable('repository', 0)
+
+test.run(chdir = 'work', options = opts, arguments = 'install')
+
+test.fail_test(test.read(work_install_file1) != "repository/file1\n")
+test.fail_test(test.read(work_install_file2) != "repository/file2\n")
+
+test.up_to_date(chdir = 'work', options = opts, arguments = 'install')
+
+#
+test.write(['work', 'file1'], "work/file1\n")
+test.write(['work', 'file2'], "work/file2\n")
+
+test.run(chdir = 'work', options = opts, arguments = 'install')
+
+test.fail_test(test.read(work_install_file1) != "work/file1\n")
+test.fail_test(test.read(work_install_file2) != "work/file2\n")
+
+test.up_to_date(chdir = 'work', options = opts, arguments = 'install')
+
+#
+test.pass_test()