[Module-build-checkins] Module-Build/lib/Module/Build/Platform Windows.pm,1.13.2.6,1.13.2.7
Status: Beta
Brought to you by:
kwilliams
|
From: Randy W. S. <si...@us...> - 2005-03-22 06:39:40
|
Update of /cvsroot/module-build/Module-Build/lib/Module/Build/Platform In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3974/lib/Module/Build/Platform Modified Files: Tag: release-0_26_branch Windows.pm Log Message: Derive name of generated files from the basename of the output library, eliminating dependency on the module name. Index: Windows.pm =================================================================== RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Platform/Windows.pm,v retrieving revision 1.13.2.6 retrieving revision 1.13.2.7 diff -u -d -r1.13.2.6 -r1.13.2.7 --- Windows.pm 2 Dec 2004 23:39:52 -0000 1.13.2.6 +++ Windows.pm 22 Mar 2005 06:39:31 -0000 1.13.2.7 @@ -115,12 +115,13 @@ my ($self, $to, $file_base) = @_; my ($cf, $p) = ($self->{config}, $self->{properties}); - my $mylib = File::Spec->catfile( - $to, File::Basename::basename("$file_base.$cf->{dlext}") ); + my $basename = File::Basename::basename( $file_base ); + my $mylib = File::Spec->catfile( $to, "$basename.$cf->{dlext}" ); my %spec = ( srcdir => File::Basename::dirname($file_base), builddir => $to, + basename => $basename, startup => [ ], objects => [ "$file_base$cf->{obj_ext}", @{$p->{objects} || []} ], libs => [ ], @@ -134,10 +135,6 @@ use_scripts => 1, # XXX provide user option to change this??? ); - unless ( $spec{basename} ) { - ($spec{basename} = $self->{properties}{module_name}) =~ s/.*:://; - } - $spec{srcdir} = File::Spec->canonpath( $spec{srcdir} ); $spec{builddir} = File::Spec->canonpath( $spec{builddir} ); |