Skip to content
This repository has been archived by the owner on Mar 7, 2019. It is now read-only.

Mswin32 paths #64

Merged
merged 3 commits into from Sep 8, 2014
Merged

Mswin32 paths #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e3b580
use / for MSWin32 paths
plicease Sep 8, 2014
9524e56
use / for MSWin32 paths (in test)
plicease Sep 8, 2014
3f23417
do not attempt to dl_load static libraries
plicease Sep 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Alien/Base.pm
View file
Open in desktop
Expand Up @@ -55,7 +55,7 @@ sub import {

push @DynaLoader::dl_resolve_using, @libpaths;

my @librefs = map { DynaLoader::dl_load_file( $_, 0x01 ) } @libpaths;
my @librefs = map { DynaLoader::dl_load_file( $_, 0x01 ) } grep !/\.(a|lib)$/, @libpaths;
push @DynaLoader::dl_librefs, @librefs;

}
Expand Down
1 change: 1 addition & 0 deletions lib/Alien/Base/ModuleBuild.pm
View file
Open in desktop
Expand Up @@ -462,6 +462,7 @@ sub alien_library_destination {

my $dist_name = $self->dist_name;
my $dest = File::Spec->catdir( $lib_dir, qw/auto share dist/, $dist_name );
$dest =~ s{\\}{/}g if $^O eq 'MSWin32';
return $dest;
}

Expand Down
1 change: 1 addition & 0 deletions t/install_destination.t
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@ my $path = $builder->alien_library_destination;

# this is not good enough, I really wish I could introspect File::ShareDir, then again, I wouldn't need this test!
my $path_to_share = File::Spec->catdir( qw/auto share dist My-Test/ );
$path_to_share =~ s{\\}{/}g if $^O eq 'MSWin32';
like $path, qr/\Q$path_to_share\E/, 'path looks good';


Expand Down