Issue 1287: copy File attributes from the local Node to a Repository

Node so we identify shared object files in a Repository and can link
them into a local shared library.  (Matthew Wesley)

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

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index f496fa747de37c0d14dc15f065d75af4aa4c4cec..b6116ed49b85c4d22b03fe3642bb6bb0655983a6 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -8,6 +8,15 @@
 
 
 
+RELEASE 1.X - XXX
+
+  From Matthew Wesley:
+
+    - Copy file attributes so we identify, and can link a shared library
+      from, shared object files in a Repository.
+
+
+
 RELEASE 1.X - XXX
 
   From Benoit Belley:

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 790d840df36ee951be597da61b139922a39ed6aa..98efc7aa6663fe3cb504f7ba6eea754ea17f38ee 100644 (file)
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -2834,6 +2834,19 @@ class File(Base):
                    (isinstance(node, File) or isinstance(node, Entry) \
                     or not node.is_derived()):
                         result = node
+                        # Copy over our local attributes to the repository
+                        # Node so we identify shared object files in the
+                        # repository and don't assume they're static.
+                        #
+                        # This isn't perfect; the attribute would ideally
+                        # be attached to the object in the repository in
+                        # case it was built statically in the repository
+                        # and we changed it to shared locally, but that's
+                        # rarely the case and would only occur if you
+                        # intentionally used the same suffix for both
+                        # shared and static objects anyway.  So this
+                        # should work well in practice.
+                        result.attributes = self.attributes
                         break
         self._memo['rfile'] = result
         return result

diff --git a/test/Repository/SharedLibrary.py b/test/Repository/SharedLibrary.py
new file mode 100644 (file)
index 0000000..011dc83
--- /dev/null
+++ b/test/Repository/SharedLibrary.py
@@ -0,0 +1,144 @@
+#!/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 we can create a local shared library containing shared
+object files built in a repository.
+"""
+
+import os
+import string
+import sys
+
+import TestCmd
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+#
+test.subdir('repository', 'work')
+
+#
+workpath_repository = test.workpath('repository')
+
+#
+opts = '-Y ' + workpath_repository
+
+#
+test.write(['repository', 'SConstruct'], """\
+env = Environment()
+f1 = env.SharedObject('f1.c')
+f2 = env.SharedObject('f2.c')
+f3 = env.SharedObject('f3.c')
+if ARGUMENTS.get('PROGRAM'):
+    lib = env.SharedLibrary(target = 'foo',
+                            source = ['f1.os', 'f2.os', 'f3.os'],
+                            WINDOWS_INSERT_DEF = 1)
+    env.Program(target='prog', source='prog.c', LIBS='foo', LIBPATH=['.'])
+""")
+
+test.write(['repository', 'f1.c'], r"""
+#include <stdio.h>
+
+void
+f1(void)
+{
+        printf("f1.c\n");
+        fflush(stdout);
+}
+""")
+
+test.write(['repository', 'f2.c'], r"""
+#include <stdio.h>
+
+void
+f2(void)
+{
+        printf("f2.c\n");
+        fflush(stdout);
+}
+""")
+
+test.write(['repository', 'f3.c'], r"""
+#include <stdio.h>
+
+void
+f3(void)
+{
+        printf("f3.c\n");
+        fflush(stdout);
+}
+""")
+
+test.write(['repository', "foo.def"], r"""
+LIBRARY        "foo"
+DESCRIPTION    "Foo Shared Library"
+
+EXPORTS
+   f1
+   f2
+   f3
+""")
+
+test.write(['repository', 'prog.c'], r"""
+#include <stdio.h>
+void f1(void);
+void f2(void);
+void f3(void);
+int
+main(int argc, char *argv[])
+{
+        argv[argc++] = "--";
+        f1();
+        f2();
+        f3();
+        printf("prog.c\n");
+        return 0;
+}
+""")
+
+test.run(chdir = 'repository', arguments = '.')
+
+# Make the 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='PROGRAM=1',
+         stderr=TestSCons.noisy_ar,
+         match=TestSCons.match_re_dotall)
+
+if os.name == 'posix':
+    os.environ['LD_LIBRARY_PATH'] = test.workpath('work')
+if string.find(sys.platform, 'irix') != -1:
+    os.environ['LD_LIBRARYN32_PATH'] = test.workpath('work')
+
+test.run(program = test.workpath('work', 'prog'),
+         stdout = "f1.c\nf2.c\nf3.c\nprog.c\n")
+
+test.pass_test()