Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Resolve issues on MSWin32 when 'unzip' is in the PATH

  • Loading branch information...
commit fecb4af99d23fbe52c4213ad471384ea3b869314 1 parent 009cf37
@bingos bingos authored
Showing with 40 additions and 5 deletions.
  1. +5 −0 CHANGES
  2. +33 −4 Makefile.PL
  3. +2 −1  lib/Archive/Extract.pm
View
5 CHANGES
@@ -1,3 +1,8 @@
+Changes for 0.54 Mon Aug 22 11:52:18 2011
+============================================
+* Resolve issues on MSWin32 when 'unzip' is
+ found in PATH
+
Changes for 0.52 Thu Apr 28 20:56:27 2011
============================================
* Only use unzip from /usr/local/bin when on
View
37 Makefile.PL
@@ -1,13 +1,19 @@
use ExtUtils::MakeMaker;
use strict;
-WriteMakefile (
+WriteMakefile1(
+ LICENSE => 'perl',
+ META_MERGE => {
+ resources => {
+ repository => 'https://github.com/jib/archive-extract',
+ },
+ },
NAME => 'Archive::Extract',
VERSION_FROM => 'lib/Archive/Extract.pm', # finds $VERSION
dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz' },
- PREREQ_PM => {
+ PREREQ_PM => {
'IPC::Cmd' => 0.64, # pipe fix
- 'Test::More' => 0,
+ 'Test::More' => 0,
'File::Spec' => 0.82,
'File::Path' => 0,
'File::Basename' => 0,
@@ -18,4 +24,27 @@ WriteMakefile (
INSTALLDIRS => ( $] >= 5.009005 ? 'perl' : 'site' ),
AUTHOR => 'Jos Boumans <kane[at]cpan.org>',
ABSTRACT => 'Generic archive extracting mechanism'
-);
+);
+
+sub WriteMakefile1 { #Written by Alexandr Ciornii, version 0.21. Added by eumm-upgrade.
+ my %params=@_;
+ my $eumm_version=$ExtUtils::MakeMaker::VERSION;
+ $eumm_version=eval $eumm_version;
+ die "EXTRA_META is deprecated" if exists $params{EXTRA_META};
+ die "License not specified" if not exists $params{LICENSE};
+ if ($params{BUILD_REQUIRES} and $eumm_version < 6.5503) {
+ #EUMM 6.5502 has problems with BUILD_REQUIRES
+ $params{PREREQ_PM}={ %{$params{PREREQ_PM} || {}} , %{$params{BUILD_REQUIRES}} };
+ delete $params{BUILD_REQUIRES};
+ }
+ delete $params{CONFIGURE_REQUIRES} if $eumm_version < 6.52;
+ delete $params{MIN_PERL_VERSION} if $eumm_version < 6.48;
+ delete $params{META_MERGE} if $eumm_version < 6.46;
+ delete $params{META_ADD} if $eumm_version < 6.46;
+ delete $params{LICENSE} if $eumm_version < 6.31;
+ delete $params{AUTHOR} if $] < 5.005;
+ delete $params{ABSTRACT_FROM} if $] < 5.005;
+ delete $params{BINARY_LOCATION} if $] < 5.005;
+
+ WriteMakefile(%params);
+}
View
3  lib/Archive/Extract.pm
@@ -45,7 +45,7 @@ use vars qw[$VERSION $PREFER_BIN $PROGRAMS $WARN $DEBUG
$_ALLOW_BIN $_ALLOW_PURE_PERL $_ALLOW_TAR_ITER
];
-$VERSION = '0.52';
+$VERSION = '0.54';
$PREFER_BIN = 0;
$WARN = 1;
$DEBUG = 0;
@@ -1087,6 +1087,7 @@ sub _unzip_bin {
$self->_error( $self->_no_buffer_files( $self->archive ) );
} else {
+ local $/ = ON_WIN32 ? "\r\n" : "\n";
$self->files( [split $/, $buffer] );
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.