[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [Patch] Make Ruby and Perl shared libraries .dll again

From: David James <james82_at_gmail.com>
Date: Wed, 21 Oct 2009 08:02:09 -0700

On Thu, May 28, 2009 at 10:23 PM, Joe Swatosh <joe.swatosh_at_gmail.com> wrote:
> This is not part of the Ruby bindings so it is not for me to commit
> without approval by a full committer. Is the patch acceptable with the
> log message amended below?

Hi Joe,

Your patch looks good. I haven't tested it, but it sounds like you
have, so +1 to commit.

Cheers,

David

>
> --
> Joe
>
> [[[
>
> Partially revert r37331 "On Windows, shared libs for Python bindings
> should be *.pyd not *.dll."  In addition to changing the shared libs for
> the Python bindings, r37331 inadvertently changed the extensions of the
> shared libraries produced for the Perl and Ruby bindings from .dll to
> .pyd.  Change the extensions back to .dll for the Ruby and Perl
> bindings.
>
> * build/generator/gen_base.py (TargetSWIG.add_dependencies): Mark Python
>  wrapper shared libs as type "pyd" not "lib".
>
> ]]]
>
> ===================================================================
> --- build/generator/gen_base.py (revision 37787)
> +++ build/generator/gen_base.py (working copy)
> @@ -550,12 +550,13 @@
>    # Extract SWIG module name from .i file name
>    module_name = iname[:4] != 'svn_' and iname[:-2] or iname[4:-2]
>
> -    lib_extension = self.gen_obj._extension_map['pyd', 'target']
> +    lib_extension = self.gen_obj._extension_map['lib', 'target']
>    if self.lang == "ruby":
>      lib_filename = module_name + lib_extension
>    elif self.lang == "perl":
>      lib_filename = '_' + module_name.capitalize() + lib_extension
>    else:
> +      lib_extension = self.gen_obj._extension_map['pyd', 'target']
>      lib_filename = '_' + module_name + lib_extension
>
>    self.name = self.lang + '_' + module_name
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2356664
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2409816
Received on 2009-10-21 17:02:41 CEST

This is an archived mail posted to the Subversion Dev mailing list.