Bug fixes: BuildDir() non-writable files, and CPPPATH/LIBPATH variable subsitution (from Charles Crain).

2 files changed, 14 insertions, 1 deletions

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 5cc06ac..ee5deaa 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -50,7 +50,7 @@ except AttributeError:
     def file_link(src, dest):
         shutil.copyfile(src, dest)
         st=os.stat(src)
-        os.chmod(dest, stat.S_IMODE(st[stat.ST_MODE]))
+        os.chmod(dest, stat.S_IMODE(st[stat.ST_MODE]) | stat.S_IWRITE)
 
 class PathName:
     """This is a string like object with limited capabilities (i.e.,
diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index f97627e..b166be1 100644
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -31,6 +31,7 @@ import unittest
 import SCons.Node.FS
 from TestCmd import TestCmd
 from SCons.Errors import UserError
+import stat
 
 built_it = None
 
@@ -85,6 +86,18 @@ class BuildDirTestCase(unittest.TestCase):
         assert f1.srcpath == 'src/test1', f1.srcpath
         assert f2.srcpath == 'src/test1', f2.srcpath
 
+        # Test to see if file_link() works...
+        test=TestCmd(workdir='')
+        test.subdir('src','build')
+        test.write('src/foo', 'foo\n')
+        os.chmod(test.workpath('src/foo'), stat.S_IRUSR)
+        SCons.Node.FS.file_link(test.workpath('src/foo'),
+                                test.workpath('build/foo'))
+        os.chmod(test.workpath('src/foo'), stat.S_IRUSR | stat.S_IWRITE)
+        st=os.stat(test.workpath('build/foo'))
+        assert (stat.S_IMODE(st[stat.ST_MODE]) & stat.S_IWRITE), \
+               stat.S_IMODE(st[stat.ST_MODE])
+
         exc_caught = 0
         try:
             fs = SCons.Node.FS.FS()