svn commit: r1505514 - in /subversion/trunk/build/generator: gen_base.py gen_win_dependencies.py

[rh...@apache.org]

Author: rhuijben
Date: Sun Jul 21 23:27:10 2013
New Revision: 1505514

URL: http://svn.apache.org/r1505514
Log:
Following up on r1505481, reinstate the dynamic generation of the ruby shared
library linkage. And resolve the extension table problems that were hidden
for me by this problem. This should fix building swig ruby on !Windows.

* build/generator/gen_base.py
  (add_dependencies): Use the retrieved extension instead of accidentally
    hardcoding .so.

* build/generator/gen_win_dependencies.py
  (_extension_map): Create a .so for a .so project.

Modified:
    subversion/trunk/build/generator/gen_base.py
    subversion/trunk/build/generator/gen_win_dependencies.py

Modified: subversion/trunk/build/generator/gen_base.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_base.py?rev=1505514&r1=1505513&r2=1505514&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_base.py (original)
+++ subversion/trunk/build/generator/gen_base.py Sun Jul 21 23:27:10 2013
@@ -679,7 +679,7 @@ class TargetSWIG(TargetLib):
       lib_filename = '_' + module_name + lib_extension
     elif self.lang == "ruby":
       lib_extension = self.gen_obj._extension_map['so', 'target']
-      lib_filename = module_name + '.so'
+      lib_filename = module_name + lib_extension
     elif self.lang == "perl":
       lib_filename = '_' + module_name.capitalize() + lib_extension
     else:

Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1505514&r1=1505513&r2=1505514&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Sun Jul 21 23:27:10 2013
@@ -101,7 +101,7 @@ class GenDependenciesBase(gen_base.Gener
     ('lib', 'object'): '.obj',
     ('pyd', 'target'): '.pyd',
     ('pyd', 'object'): '.obj',
-    ('so', 'target'): '.pyd',
+    ('so', 'target'): '.so',
     ('so', 'object'): '.obj',
     }