Petr Šabata
10 years ago
parent
e462ba4e9f
commit
89a2cf7fad
@ -1,3 +1,4 @@
|
||||
/Inline-C-0.60.fedora.tar.gz
|
||||
/Inline-C-0.62.fedora.tar.gz
|
||||
/Inline-C-0.64.tar.gz
|
||||
/Inline-C-0.67.tar.gz
|
||||
|
||||
@ -1,70 +0,0 @@
|
||||
diff --git a/lib/Inline/C.pm b/lib/Inline/C.pm
|
||||
index 51c8a2a..edbdc5e 100644
|
||||
--- a/lib/Inline/C.pm
|
||||
+++ b/lib/Inline/C.pm
|
||||
@@ -777,7 +777,6 @@ sub write_Makefile_PL {
|
||||
my $i = 0;
|
||||
for (@{$o->{ILSM}{MAKEFILE}{TYPEMAPS}}) {
|
||||
$o->{ILSM}{xsubppargs} .= "-typemap \"$_\" ";
|
||||
- $o->{ILSM}{MAKEFILE}{TYPEMAPS}->[$i++] = fix_space($_);
|
||||
}
|
||||
|
||||
my %options = (
|
||||
@@ -956,7 +955,6 @@ sub fix_make {
|
||||
$fix = $fixes{$1}
|
||||
) {
|
||||
my $fixed = $o->{ILSM}{$fix};
|
||||
- $fixed = fix_space($fixed) if $fix eq 'install_lib';
|
||||
print MAKEFILE "$1 = $fixed\n";
|
||||
}
|
||||
else {
|
||||
@@ -1037,11 +1035,6 @@ sub quote_space {
|
||||
$_[0] = $out;
|
||||
}
|
||||
|
||||
-sub fix_space {
|
||||
- $_[0] =~ s/ /\\ /g if $_[0] =~ / /;
|
||||
- $_[0];
|
||||
-}
|
||||
-
|
||||
#==============================================================================
|
||||
# This routine used by C/t/09parser to test that the expected parser is in use
|
||||
#==============================================================================
|
||||
diff --git a/t/27inline_maker.t b/t/27inline_maker.t
|
||||
index 5c41caa..48d5aa6 100644
|
||||
--- a/t/27inline_maker.t
|
||||
+++ b/t/27inline_maker.t
|
||||
@@ -10,6 +10,10 @@ use Cwd;
|
||||
use File::Copy::Recursive qw(rcopy);
|
||||
use autodie;
|
||||
|
||||
+my @make_targets = qw(test install);
|
||||
+my $CLEANUP = 1;
|
||||
+push @make_targets, qw(realclean) if $CLEANUP;
|
||||
+
|
||||
my ($example_modules_dir) = grep { -e } map {
|
||||
File::Spec->rel2abs(File::Spec->catdir($_, 'modules'))
|
||||
} qw(eg example);
|
||||
@@ -23,7 +27,7 @@ plan skip_all => "Inline version 0.64+ required for this."
|
||||
my $lib_dir = File::Spec->rel2abs('lib');
|
||||
my $base_dir = File::Spec->rel2abs($TestInlineSetup::DIR);
|
||||
my $src_dir = File::Spec->catdir($base_dir, 'src dir');
|
||||
-my $inst_dir = File::Spec->catdir($base_dir, 'instdir');
|
||||
+my $inst_dir = File::Spec->catdir($base_dir, 'inst dir');
|
||||
mkpath $inst_dir;
|
||||
|
||||
my $cwd = getcwd;
|
||||
@@ -35,10 +39,10 @@ for my $module (glob "$example_modules_dir/*") {
|
||||
my $cmd = [$^X, "-I$lib_dir", 'Makefile.PL', "INSTALL_BASE=$inst_dir"];
|
||||
my @result = run(command => $cmd, verbose => 0, buffer => \$buffer);
|
||||
ok($result[0], "$module Makefile creation");
|
||||
- diag $buffer unless $result[0];
|
||||
- map { do_make($_) } qw(test install realclean);
|
||||
+ diag "Error: $result[1]\n", $buffer unless $result[0];
|
||||
+ map { do_make($_) } @make_targets;
|
||||
chdir $cwd;
|
||||
- rmtree $src_dir;
|
||||
+ rmtree $src_dir if $CLEANUP;
|
||||
}
|
||||
|
||||
sub do_make {
|
||||
Loading…
Reference in new issue