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

Re: svn commit: r40151 - trunk/build/generator

From: Greg Stein <gstein_at_gmail.com>
Date: Wed, 21 Oct 2009 14:39:47 -0400

The log message goes on about ".dll" but then the change put ".lib" in
there. And looking back at r37331, it changed it away from ".lib".
So... my takeaway is that the log message is incorrect here.

Cheers,
-g

On Wed, Oct 21, 2009 at 11:16, Joe Swatosh <joe.swatosh_at_gmail.com> wrote:
> Author: joeswatosh
> Date: Wed Oct 21 08:16:29 2009
> New Revision: 40151
>
> Log:
> 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".
>
> Approved by: djames
>
> Modified:
>   trunk/build/generator/gen_base.py
>
> Modified: trunk/build/generator/gen_base.py
> URL: http://svn.collab.net/viewvc/svn/trunk/build/generator/gen_base.py?pathrev=40151&r1=40150&r2=40151
> ==============================================================================
> --- trunk/build/generator/gen_base.py   Wed Oct 21 07:59:10 2009        (r40150)
> +++ trunk/build/generator/gen_base.py   Wed Oct 21 08:16:29 2009        (r40151)
> @@ -550,12 +550,13 @@ class TargetSWIG(TargetLib):
>     # 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=495&dsMessageId=2409825
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2409895
Received on 2009-10-21 20:40:10 CEST

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