Hello community, here is the log from the commit of package perl-ExtUtils-Helpers for openSUSE:Factory checked in at 2016-09-12 13:23:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-ExtUtils-Helpers (Old) and /work/SRC/openSUSE:Factory/.perl-ExtUtils-Helpers.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-ExtUtils-Helpers" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-ExtUtils-Helpers/perl-ExtUtils-Helpers.changes 2014-07-27 08:26:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-ExtUtils-Helpers.new/perl-ExtUtils-Helpers.changes 2016-09-12 13:23:33.000000000 +0200 @@ -1,0 +2,17 @@ +Sat Sep 3 05:21:30 UTC 2016 - co...@suse.com + +- updated to 0.025 + see /usr/share/doc/packages/perl-ExtUtils-Helpers/Changes + + 0.025 2016-09-02 09:48:38+02:00 Europe/Amsterdam + - Remove unconditional dependency on ExtUtils::PL2Bat + + 0.024 2016-08-16 22:02:31+02:00 Europe/Amsterdam (TRIAL RELEASE) + - Move pl2bat code to ExtUtils::PL2Bat + + 0.023 2016-08-06 20:52:34+02:00 Europe/Amsterdam (TRIAL RELEASE) + - Make split_like_shell always unixy + - Remove Module::Load dependency + - Remove done_testing, it requires Test::More 0.88 + +------------------------------------------------------------------- Old: ---- ExtUtils-Helpers-0.022.tar.gz New: ---- ExtUtils-Helpers-0.025.tar.gz cpanspec.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-ExtUtils-Helpers.spec ++++++ --- /var/tmp/diff_new_pack.mrs8xy/_old 2016-09-12 13:23:34.000000000 +0200 +++ /var/tmp/diff_new_pack.mrs8xy/_new 2016-09-12 13:23:34.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-ExtUtils-Helpers # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,41 +16,20 @@ # -%bcond_without test - Name: perl-ExtUtils-Helpers -Version: 0.022 +Version: 0.025 Release: 0 %define cpan_name ExtUtils-Helpers Summary: Various portability utilities for module builders License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/ExtUtils-Helpers/ -Source: http://www.cpan.org/authors/id/L/LE/LEONT/%{cpan_name}-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/L/LE/LEONT/%{cpan_name}-%{version}.tar.gz +Source1: cpanspec.yml BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -%if %{with test} -BuildRequires: perl(Cwd) -BuildRequires: perl(File::Spec) -BuildRequires: perl(IO::Handle) -BuildRequires: perl(IPC::Open3) -BuildRequires: perl(Test::More) >= 0.88 -%endif -BuildRequires: perl(Carp) -BuildRequires: perl(Exporter) >= 5.57 -BuildRequires: perl(File::Basename) -BuildRequires: perl(File::Spec::Functions) -BuildRequires: perl(Module::Load) -BuildRequires: perl(Text::ParseWords) -Requires: perl(Carp) -Requires: perl(Exporter) >= 5.57 -Requires: perl(File::Basename) -Requires: perl(File::Copy) -Requires: perl(File::Spec::Functions) -Requires: perl(Module::Load) -Requires: perl(Text::ParseWords) %{perl_requires} %description @@ -64,10 +43,8 @@ %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} %{?_smp_mflags} -%if %{with test} %check %{__make} test -%endif %install %perl_make_install ++++++ ExtUtils-Helpers-0.022.tar.gz -> ExtUtils-Helpers-0.025.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/Changes new/ExtUtils-Helpers-0.025/Changes --- old/ExtUtils-Helpers-0.022/Changes 2014-03-07 13:27:19.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/Changes 2016-09-02 09:48:41.000000000 +0200 @@ -1,5 +1,16 @@ Revision history for ExtUtils-Helpers +0.025 2016-09-02 09:48:38+02:00 Europe/Amsterdam + - Remove unconditional dependency on ExtUtils::PL2Bat + +0.024 2016-08-16 22:02:31+02:00 Europe/Amsterdam (TRIAL RELEASE) + - Move pl2bat code to ExtUtils::PL2Bat + +0.023 2016-08-06 20:52:34+02:00 Europe/Amsterdam (TRIAL RELEASE) + - Make split_like_shell always unixy + - Remove Module::Load dependency + - Remove done_testing, it requires Test::More 0.88 + 0.022 2014-03-07 13:27:09CET+0100 Europe/Amsterdam Cleaned up remains of former functions Skip IO layers on <5.8 for 5.6 compatability diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/INSTALL new/ExtUtils-Helpers-0.025/INSTALL --- old/ExtUtils-Helpers-0.022/INSTALL 2014-03-07 13:27:19.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/INSTALL 2016-09-02 09:48:41.000000000 +0200 @@ -1,4 +1,3 @@ - This is the Perl distribution ExtUtils-Helpers. Installing ExtUtils-Helpers is straightforward. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/LICENSE new/ExtUtils-Helpers-0.025/LICENSE --- old/ExtUtils-Helpers-0.022/LICENSE 2014-03-07 13:27:19.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/LICENSE 2016-09-02 09:48:41.000000000 +0200 @@ -22,7 +22,7 @@ Version 1, February 1989 Copyright (C) 1989 Free Software Foundation, Inc. - 51 Franklin St, Suite 500, Boston, MA 02110-1335 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/MANIFEST new/ExtUtils-Helpers-0.025/MANIFEST --- old/ExtUtils-Helpers-0.022/MANIFEST 2014-03-07 13:27:19.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/MANIFEST 2016-09-02 09:48:41.000000000 +0200 @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.011. +# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.005. Changes INSTALL LICENSE @@ -12,11 +12,10 @@ lib/ExtUtils/Helpers/Unix.pm lib/ExtUtils/Helpers/VMS.pm lib/ExtUtils/Helpers/Windows.pm -t/00-compile.t -t/author-split_like_shell.t t/make_executable.t t/man_pagename.t -t/release-pod-coverage.t -t/release-pod-syntax.t t/split_like_shell.t t/tilde.t +xt/author/00-compile.t +xt/author/pod-coverage.t +xt/author/pod-syntax.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/META.json new/ExtUtils-Helpers-0.025/META.json --- old/ExtUtils-Helpers-0.022/META.json 2014-03-07 13:27:19.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/META.json 2016-09-02 09:48:41.000000000 +0200 @@ -4,27 +4,34 @@ "Ken Williams <kwilli...@cpan.org>", "Leon Timmermans <le...@cpan.org>" ], - "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 5.011, CPAN::Meta::Converter version 2.132830", + "dynamic_config" : 1, + "generated_by" : "Dist::Zilla version 6.005, CPAN::Meta::Converter version 2.150005", "license" : [ "perl_5" ], "meta-spec" : { "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", - "version" : "2" + "version" : 2 }, "name" : "ExtUtils-Helpers", "prereqs" : { "configure" : { "requires" : { - "ExtUtils::MakeMaker" : "6.30" + "ExtUtils::MakeMaker" : "0", + "perl" : "5.006" } }, "develop" : { "requires" : { + "File::Spec" : "0", + "IO::Handle" : "0", + "IPC::Open3" : "0", "Pod::Coverage::TrustPod" : "0", + "Test::More" : "0", "Test::Pod" : "1.41", - "Test::Pod::Coverage" : "1.08" + "Test::Pod::Coverage" : "1.08", + "blib" : "1.01", + "perl" : "5.006" } }, "runtime" : { @@ -34,7 +41,6 @@ "File::Basename" : "0", "File::Copy" : "0", "File::Spec::Functions" : "0", - "Module::Load" : "0", "Text::ParseWords" : "3.24", "perl" : "5.006", "strict" : "0", @@ -44,30 +50,28 @@ "test" : { "requires" : { "Cwd" : "0", - "File::Spec" : "0", - "IO::Handle" : "0", - "IPC::Open3" : "0", "Test::More" : "0", - "lib" : "0" + "lib" : "0", + "perl" : "5.006" } } }, "provides" : { "ExtUtils::Helpers" : { "file" : "lib/ExtUtils/Helpers.pm", - "version" : "0.022" + "version" : "0.025" }, "ExtUtils::Helpers::Unix" : { "file" : "lib/ExtUtils/Helpers/Unix.pm", - "version" : "0.022" + "version" : "0.025" }, "ExtUtils::Helpers::VMS" : { "file" : "lib/ExtUtils/Helpers/VMS.pm", - "version" : "0.022" + "version" : "0.025" }, "ExtUtils::Helpers::Windows" : { "file" : "lib/ExtUtils/Helpers/Windows.pm", - "version" : "0.022" + "version" : "0.025" } }, "release_status" : "stable", @@ -82,6 +86,12 @@ "web" : "https://github.com/Leont/extutils-helpers" } }, - "version" : "0.022" + "version" : "0.025", + "x_contributors" : [ + "Christian Walde <walde.christ...@googlemail.com>", + "Craig A. Berry <craigbe...@mac.com>", + "Leon Timmermans <faw...@gmail.com>", + "Olivier Mengu\u00e9 <dol...@cpan.org>" + ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/META.yml new/ExtUtils-Helpers-0.025/META.yml --- old/ExtUtils-Helpers-0.022/META.yml 2014-03-07 13:27:19.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/META.yml 2016-09-02 09:48:41.000000000 +0200 @@ -4,46 +4,49 @@ - 'Ken Williams <kwilli...@cpan.org>' - 'Leon Timmermans <le...@cpan.org>' build_requires: - Cwd: 0 - File::Spec: 0 - IO::Handle: 0 - IPC::Open3: 0 - Test::More: 0 - lib: 0 + Cwd: '0' + Test::More: '0' + lib: '0' + perl: '5.006' configure_requires: - ExtUtils::MakeMaker: 6.30 -dynamic_config: 0 -generated_by: 'Dist::Zilla version 5.011, CPAN::Meta::Converter version 2.132830' + ExtUtils::MakeMaker: '0' + perl: '5.006' +dynamic_config: 1 +generated_by: 'Dist::Zilla version 6.005, CPAN::Meta::Converter version 2.150005' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + version: '1.4' name: ExtUtils-Helpers provides: ExtUtils::Helpers: file: lib/ExtUtils/Helpers.pm - version: 0.022 + version: '0.025' ExtUtils::Helpers::Unix: file: lib/ExtUtils/Helpers/Unix.pm - version: 0.022 + version: '0.025' ExtUtils::Helpers::VMS: file: lib/ExtUtils/Helpers/VMS.pm - version: 0.022 + version: '0.025' ExtUtils::Helpers::Windows: file: lib/ExtUtils/Helpers/Windows.pm - version: 0.022 + version: '0.025' requires: - Carp: 0 - Exporter: 5.57 - File::Basename: 0 - File::Copy: 0 - File::Spec::Functions: 0 - Module::Load: 0 - Text::ParseWords: 3.24 - perl: 5.006 - strict: 0 - warnings: 0 + Carp: '0' + Exporter: '5.57' + File::Basename: '0' + File::Copy: '0' + File::Spec::Functions: '0' + Text::ParseWords: '3.24' + perl: '5.006' + strict: '0' + warnings: '0' resources: bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=ExtUtils-Helpers repository: git://github.com/Leont/extutils-helpers.git -version: 0.022 +version: '0.025' +x_contributors: + - 'Christian Walde <walde.christ...@googlemail.com>' + - 'Craig A. Berry <craigbe...@mac.com>' + - 'Leon Timmermans <faw...@gmail.com>' + - 'Olivier Mengué <dol...@cpan.org>' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/Makefile.PL new/ExtUtils-Helpers-0.025/Makefile.PL --- old/ExtUtils-Helpers-0.022/Makefile.PL 2014-03-07 13:27:19.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/Makefile.PL 2016-09-02 09:48:41.000000000 +0200 @@ -1,24 +1,20 @@ - -# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.011. +# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.005. use strict; use warnings; use 5.006; -use ExtUtils::MakeMaker 6.30; - - +use ExtUtils::MakeMaker; my %WriteMakefileArgs = ( "ABSTRACT" => "Various portability utilities for module builders", "AUTHOR" => "Ken Williams <kwilliams\@cpan.org>, Leon Timmermans <leont\@cpan.org>", - "BUILD_REQUIRES" => {}, "CONFIGURE_REQUIRES" => { - "ExtUtils::MakeMaker" => "6.30" + "ExtUtils::MakeMaker" => 0 }, "DISTNAME" => "ExtUtils-Helpers", - "EXE_FILES" => [], "LICENSE" => "perl", + "MIN_PERL_VERSION" => "5.006", "NAME" => "ExtUtils::Helpers", "PREREQ_PM" => { "Carp" => 0, @@ -26,20 +22,16 @@ "File::Basename" => 0, "File::Copy" => 0, "File::Spec::Functions" => 0, - "Module::Load" => 0, "Text::ParseWords" => "3.24", "strict" => 0, "warnings" => 0 }, "TEST_REQUIRES" => { "Cwd" => 0, - "File::Spec" => 0, - "IO::Handle" => 0, - "IPC::Open3" => 0, "Test::More" => 0, "lib" => 0 }, - "VERSION" => "0.022", + "VERSION" => "0.025", "test" => { "TESTS" => "t/*.t" } @@ -52,11 +44,7 @@ "Exporter" => "5.57", "File::Basename" => 0, "File::Copy" => 0, - "File::Spec" => 0, "File::Spec::Functions" => 0, - "IO::Handle" => 0, - "IPC::Open3" => 0, - "Module::Load" => 0, "Test::More" => 0, "Text::ParseWords" => "3.24", "lib" => 0, @@ -74,7 +62,8 @@ delete $WriteMakefileArgs{CONFIGURE_REQUIRES} unless eval { ExtUtils::MakeMaker->VERSION(6.52) }; -WriteMakefile(%WriteMakefileArgs); - - +if ( $^O eq 'MSWin32' ) { + $WriteMakefileArgs{PREREQ_PM}{'ExtUtils::PL2bat'} = '0'; +} +WriteMakefile(%WriteMakefileArgs); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/README new/ExtUtils-Helpers-0.025/README --- old/ExtUtils-Helpers-0.022/README 2014-03-07 13:27:19.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/README 2016-09-02 09:48:41.000000000 +0200 @@ -1,7 +1,7 @@ This archive contains the distribution ExtUtils-Helpers, -version 0.022: +version 0.025: Various portability utilities for module builders @@ -11,5 +11,5 @@ the same terms as the Perl 5 programming language system itself. -This README file was generated by Dist::Zilla::Plugin::Readme v5.011. +This README file was generated by Dist::Zilla::Plugin::Readme v6.005. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/dist.ini new/ExtUtils-Helpers-0.025/dist.ini --- old/ExtUtils-Helpers-0.022/dist.ini 2014-03-07 13:27:19.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/dist.ini 2016-09-02 09:48:41.000000000 +0200 @@ -7,3 +7,6 @@ [@LEONT] install_tool = eumm +AutoPrereqs.skip = ^ExtUtils::PL2Bat$ +[OSPrereqs / MSWin32] +ExtUtils::PL2bat = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/lib/ExtUtils/Helpers/Unix.pm new/ExtUtils-Helpers-0.025/lib/ExtUtils/Helpers/Unix.pm --- old/ExtUtils-Helpers-0.022/lib/ExtUtils/Helpers/Unix.pm 2014-03-07 13:27:19.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/lib/ExtUtils/Helpers/Unix.pm 2016-09-02 09:48:41.000000000 +0200 @@ -1,14 +1,13 @@ package ExtUtils::Helpers::Unix; -$ExtUtils::Helpers::Unix::VERSION = '0.022'; +$ExtUtils::Helpers::Unix::VERSION = '0.025'; use strict; use warnings FATAL => 'all'; use Exporter 5.57 'import'; -our @EXPORT = qw/make_executable split_like_shell detildefy/; +our @EXPORT = qw/make_executable detildefy/; use Carp qw/croak/; use Config; -use Text::ParseWords 3.24 qw/shellwords/; my $layer = $] >= 5.008001 ? ":raw" : ""; @@ -31,16 +30,6 @@ return; } -sub split_like_shell { - my ($string) = @_; - - return if not defined $string; - $string =~ s/^\s+|\s+$//g; - return if not length $string; - - return shellwords($string); -} - sub detildefy { my $value = shift; # tilde with optional username @@ -67,7 +56,7 @@ =head1 VERSION -version 0.022 +version 0.025 =for Pod::Coverage make_executable split_like_shell diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/lib/ExtUtils/Helpers/VMS.pm new/ExtUtils-Helpers-0.025/lib/ExtUtils/Helpers/VMS.pm --- old/ExtUtils-Helpers-0.022/lib/ExtUtils/Helpers/VMS.pm 2014-03-07 13:27:19.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/lib/ExtUtils/Helpers/VMS.pm 2016-09-02 09:48:41.000000000 +0200 @@ -1,12 +1,11 @@ package ExtUtils::Helpers::VMS; -$ExtUtils::Helpers::VMS::VERSION = '0.022'; +$ExtUtils::Helpers::VMS::VERSION = '0.025'; use strict; use warnings FATAL => 'all'; use Exporter 5.57 'import'; -our @EXPORT = qw/make_executable split_like_shell detildefy/; +our @EXPORT = qw/make_executable detildefy/; -use ExtUtils::Helpers::Unix qw/split_like_shell/; # Probably very wrong, but whatever use File::Copy qw/copy/; sub make_executable { @@ -62,26 +61,15 @@ my @hdirs = File::Spec::Unix->splitdir($hdir); my @dirs = File::Spec::Unix->splitdir($dir); - my $newdirs; - - # Two cases of tilde handling - if ($arg =~ m#^~/#) { - - # Simple case, just merge together - $newdirs = File::Spec::Unix->catdir(@hdirs, @dirs); - - } else { - - # Complex case, need to add an updir - No delimiters - my @backup = File::Spec::Unix->splitdir(File::Spec::Unix->updir); - - $newdirs = File::Spec::Unix->catdir(@hdirs, @backup, @dirs); + unless ($arg =~ m#^~/#) { + # There is a home directory after the tilde, but it will already + # be present in in @hdirs so we need to remove it by from @dirs. + shift @dirs; } + my $newdirs = File::Spec::Unix->catdir(@hdirs, @dirs); - # Now put the two cases back together $arg = File::Spec::Unix->catpath($hvol, $newdirs, $file); - } return $arg; } @@ -100,7 +88,7 @@ =head1 VERSION -version 0.022 +version 0.025 =for Pod::Coverage make_executable detildefy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/lib/ExtUtils/Helpers/Windows.pm new/ExtUtils-Helpers-0.025/lib/ExtUtils/Helpers/Windows.pm --- old/ExtUtils-Helpers-0.022/lib/ExtUtils/Helpers/Windows.pm 2014-03-07 13:27:19.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/lib/ExtUtils/Helpers/Windows.pm 2016-09-02 09:48:41.000000000 +0200 @@ -1,167 +1,23 @@ package ExtUtils::Helpers::Windows; -$ExtUtils::Helpers::Windows::VERSION = '0.022'; +$ExtUtils::Helpers::Windows::VERSION = '0.025'; use strict; use warnings FATAL => 'all'; use Exporter 5.57 'import'; -our @EXPORT = qw/make_executable split_like_shell detildefy/; +our @EXPORT = qw/make_executable detildefy/; use Config; use Carp qw/carp croak/; +use ExtUtils::PL2Bat 'pl2bat'; sub make_executable { my $script = shift; if (-T $script && $script !~ / \. (?:bat|cmd) $ /x) { - _pl2bat(in => $script, update => 1); + pl2bat(in => $script, update => 1); } return; } -# This routine was copied almost verbatim from the 'pl2bat' utility -# distributed with perl. It requires too much voodoo with shell quoting -# differences and shortcomings between the various flavors of Windows -# to reliably shell out -sub _pl2bat { - my %opts = @_; - - # NOTE: %0 is already enclosed in doublequotes by cmd.exe, as appropriate - $opts{ntargs} = '-x -S %0 %*'; - $opts{otherargs} = '-x -S "%0" %1 %2 %3 %4 %5 %6 %7 %8 %9'; - - $opts{stripsuffix} = qr/\.plx?/ unless exists $opts{stripsuffix}; - - if (not exists $opts{out}) { - $opts{out} = $opts{in}; - $opts{out} =~ s/$opts{stripsuffix}$//i; - $opts{out} .= '.bat' unless $opts{in} =~ /\.bat$/i or $opts{in} eq '-'; - } - - my $head = <<"EOT"; - \@rem = '--*-Perl-*-- - \@echo off - if "%OS%" == "Windows_NT" goto WinNT - perl $opts{otherargs} - \@set ErrorLevel=%ErrorLevel% - goto endofperl - :WinNT - perl $opts{ntargs} - \@set ErrorLevel=%ErrorLevel% - if NOT "%COMSPEC%" == "%SystemRoot%\\system32\\cmd.exe" goto endofperl - if %errorlevel% == 9009 echo You do not have Perl in your PATH. - goto endofperl - \@rem '; -EOT - - $head =~ s/^\s+//gm; - my $headlines = 2 + ($head =~ tr/\n/\n/); - my $tail = <<'EOT'; - __END__ - :endofperl - @"%COMSPEC%" /c exit /b %ErrorLevel% -EOT - $tail =~ s/^\s+//gm; - - my $linedone = 0; - my $taildone = 0; - my $linenum = 0; - my $skiplines = 0; - - my $start = $Config{startperl}; - $start = '#!perl' unless $start =~ /^#!.*perl/; - - open my $in, '<', $opts{in} or croak "Can't open $opts{in}: $!"; - my @file = <$in>; - close $in; - - foreach my $line ( @file ) { - $linenum++; - if ( $line =~ /^:endofperl\b/ ) { - if (!exists $opts{update}) { - warn "$opts{in} has already been converted to a batch file!\n"; - return; - } - $taildone++; - } - if ( not $linedone and $line =~ /^#!.*perl/ ) { - if (exists $opts{update}) { - $skiplines = $linenum - 1; - $line .= '#line '.(1+$headlines)."\n"; - } else { - $line .= '#line '.($linenum+$headlines)."\n"; - } - $linedone++; - } - if ( $line =~ /^#\s*line\b/ and $linenum == 2 + $skiplines ) { - $line = ''; - } - } - - open my $out, '>', $opts{out} or croak "Can't open $opts{out}: $!"; - print $out $head; - print $out $start, ( $opts{usewarnings} ? ' -w' : '' ), - "\n#line ", ($headlines+1), "\n" unless $linedone; - print $out @file[$skiplines..$#file]; - print $out $tail unless $taildone; - close $out; - - return $opts{out}; -} - -sub split_like_shell { - # As it turns out, Windows command-parsing is very different from - # Unix command-parsing. Double-quotes mean different things, - # backslashes don't necessarily mean escapes, and so on. So we - # can't use Text::ParseWords::shellwords() to break a command string - # into words. The algorithm below was bashed out by Randy and Ken - # (mostly Randy), and there are a lot of regression tests, so we - # should feel free to adjust if desired. - - local ($_) = @_; - - my @argv; - return @argv unless defined && length; - - my $arg = ''; - my ($i, $quote_mode ) = ( 0, 0 ); - - while ( $i < length ) { - - my $ch = substr $_, $i, 1; - my $next_ch = substr $_, $i+1, 1; - - if ( $ch eq '\\' && $next_ch eq '"' ) { - $arg .= '"'; - $i++; - } elsif ( $ch eq '\\' && $next_ch eq '\\' ) { - $arg .= '\\'; - $i++; - } elsif ( $ch eq '"' && $next_ch eq '"' && $quote_mode ) { - $quote_mode = !$quote_mode; - $arg .= '"'; - $i++; - } elsif ( $ch eq '"' && $next_ch eq '"' && !$quote_mode && - ( $i + 2 == length() || substr( $_, $i + 2, 1 ) eq ' ' ) - ) { # for cases like: a"" => [ 'a' ] - push @argv, $arg; - $arg = ''; - $i += 2; - } elsif ( $ch eq '"' ) { - $quote_mode = !$quote_mode; - } elsif ( $ch =~ /\s/ && !$quote_mode ) { - push @argv, $arg if $arg; - $arg = ''; - ++$i while substr( $_, $i + 1, 1 ) =~ /\s/; - } else { - $arg .= $ch; - } - - $i++; - } - - push @argv, $arg if defined $arg && length $arg; - return @argv; -} - sub detildefy { my $value = shift; $value =~ s{ ^ ~ (?= [/\\] | $ ) }[$ENV{USERPROFILE}]x if $ENV{USERPROFILE}; @@ -184,7 +40,7 @@ =head1 VERSION -version 0.022 +version 0.025 =for Pod::Coverage make_executable split_like_shell diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/lib/ExtUtils/Helpers.pm new/ExtUtils-Helpers-0.025/lib/ExtUtils/Helpers.pm --- old/ExtUtils-Helpers-0.022/lib/ExtUtils/Helpers.pm 2014-03-07 13:27:19.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/lib/ExtUtils/Helpers.pm 2016-09-02 09:48:41.000000000 +0200 @@ -1,5 +1,5 @@ package ExtUtils::Helpers; -$ExtUtils::Helpers::VERSION = '0.022'; +$ExtUtils::Helpers::VERSION = '0.025'; use strict; use warnings FATAL => 'all'; use Exporter 5.57 'import'; @@ -7,15 +7,26 @@ use Config; use File::Basename qw/basename/; use File::Spec::Functions qw/splitpath canonpath abs2rel splitdir/; -use Module::Load; +use Text::ParseWords 3.24 (); our @EXPORT_OK = qw/make_executable split_like_shell man1_pagename man3_pagename detildefy/; BEGIN { my %impl_for = ( MSWin32 => 'Windows', VMS => 'VMS'); my $package = 'ExtUtils::Helpers::' . ($impl_for{$^O} || 'Unix'); - load($package); - $package->import(); + my $impl = $impl_for{$^O} || 'Unix'; + require "ExtUtils/Helpers/$impl.pm"; + "ExtUtils::Helpers::$impl"->import(); +} + +sub split_like_shell { + my ($string) = @_; + + return if not defined $string; + $string =~ s/^\s+|\s+$//g; + return if not length $string; + + return Text::ParseWords::shellwords($string); } sub man1_pagename { @@ -56,7 +67,7 @@ =head1 VERSION -version 0.022 +version 0.025 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/t/00-compile.t new/ExtUtils-Helpers-0.025/t/00-compile.t --- old/ExtUtils-Helpers-0.022/t/00-compile.t 2014-03-07 13:27:19.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/t/00-compile.t 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -use strict; -use warnings; - -# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.036 - -use Test::More tests => 4 + ($ENV{AUTHOR_TESTING} ? 1 : 0); - - - -my @module_files = ( - 'ExtUtils/Helpers.pm', - 'ExtUtils/Helpers/Unix.pm', - 'ExtUtils/Helpers/VMS.pm', - 'ExtUtils/Helpers/Windows.pm' -); - - - -# no fake home requested - -my $inc_switch = q[-Mblib]; - -use File::Spec; -use IPC::Open3; -use IO::Handle; - -my @warnings; -for my $lib (@module_files) -{ - # see L<perlfaq8/How can I capture STDERR from an external command?> - open my $stdin, '<', File::Spec->devnull or die "can't open devnull: $!"; - my $stderr = IO::Handle->new; - - my $pid = open3($stdin, '>&STDERR', $stderr, $^X, $inc_switch, '-e', "require q[$lib]"); - binmode $stderr, ':crlf' if $^O eq 'MSWin32'; - my @_warnings = <$stderr>; - waitpid($pid, 0); - is($?, 0, "$lib loaded ok"); - - if (@_warnings) - { - warn @_warnings; - push @warnings, @_warnings; - } -} - - - -is(scalar(@warnings), 0, 'no warnings found') if $ENV{AUTHOR_TESTING}; - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/t/author-split_like_shell.t new/ExtUtils-Helpers-0.025/t/author-split_like_shell.t --- old/ExtUtils-Helpers-0.022/t/author-split_like_shell.t 2014-03-07 13:27:19.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/t/author-split_like_shell.t 1970-01-01 01:00:00.000000000 +0100 @@ -1,89 +0,0 @@ -#!/usr/bin/perl - -BEGIN { - unless ($ENV{AUTHOR_TESTING}) { - require Test::More; - Test::More::plan(skip_all => 'these tests are for testing by the author'); - } -} - - -use strict; -use warnings FATAL => 'all'; -use Test::More; -use ExtUtils::Helpers::Unix (); -use ExtUtils::Helpers::Windows (); - -plan(skip_all => 'Author only tests') unless $ENV{AUTHOR_TESTING}; - -my @unix_splits = - ( - { q{one t'wo th'ree f"o\"ur " "five" } => [ 'one', 'two three', 'fo"ur ', 'five' ] }, - { q{ foo bar } => [ 'foo', 'bar' ] }, - { q{ D\'oh f\{g\'h\"i\]\* } => [ "D'oh", "f{g'h\"i]*" ] }, - { q{ D\$foo } => [ 'D$foo' ] }, - { qq{one\\\ntwo} => [ "one\ntwo" ] }, # TODO - ); - -my @win_splits = - ( - { 'a" "b\\c" "d' => [ 'a b\c d' ] }, - { '"a b\\c d"' => [ 'a b\c d' ] }, - { '"a b"\\"c d"' => [ 'a b"c', 'd' ] }, - { '"a b"\\\\"c d"' => [ 'a b\c d' ] }, - { '"a"\\"b" "a\\"b"' => [ 'a"b a"b' ] }, - { '"a"\\\\"b" "a\\\\"b"' => [ 'a\b', 'a\b' ] }, - { '"a"\\"b a\\"b"' => [ 'a"b', 'a"b' ] }, - { 'a"\\"b" "a\\"b' => [ 'a"b', 'a"b' ] }, - { 'a"\\"b" "a\\"b' => [ 'a"b', 'a"b' ] }, - { 'a b' => [ 'a', 'b' ] }, - { "a\nb" => [ 'a', 'b' ] }, - { 'a"\\"b a\\"b' => [ 'a"b a"b' ] }, - { '"a""b" "a"b"' => [ 'a"b ab' ] }, - { '\\"a\\"' => [ '"a"' ] }, - { '"a"" "b"' => [ 'a"', 'b' ] }, - { 'a"b' => [ 'ab' ] }, - { 'a""b' => [ 'ab' ] }, - { 'a"""b' => [ 'a"b' ] }, - { 'a""""b' => [ 'a"b' ] }, - { 'a"""""b' => [ 'a"b' ] }, - { 'a""""""b' => [ 'a""b' ] }, - { '"a"b"' => [ 'ab' ] }, - { '"a""b"' => [ 'a"b' ] }, - { '"a"""b"' => [ 'a"b' ] }, - { '"a""""b"' => [ 'a"b' ] }, - { '"a"""""b"' => [ 'a""b' ] }, - { '"a""""""b"' => [ 'a""b' ] }, - { '' => [ ] }, - { ' ' => [ ] }, - { '""' => [ '' ] }, - { '" "' => [ ' ' ] }, - { '""a' => [ 'a' ] }, - { '""a b' => [ 'a', 'b' ] }, - { 'a""' => [ 'a' ] }, - { 'a"" b' => [ 'a', 'b' ] }, - { '"" a' => [ '', 'a' ] }, - { 'a ""' => [ 'a', '' ] }, - { 'a "" b' => [ 'a', '', 'b' ] }, - { 'a " " b' => [ 'a', ' ', 'b' ] }, - { 'a " b " c' => [ 'a', ' b ', 'c' ] }, -); - -foreach my $test (@win_splits) { - my ($string, $expected) = %$test; - my @result = ExtUtils::Helpers::Windows::split_like_shell($string); - $string =~ s/\n/\\n/g; - is(grep( !defined(), @result ), 0, "\"$string\" result all defined"); - is_deeply(\@result, $expected) or - diag("split_like_shell error \n>$string< is not splitting as >" . join("|", @$expected) . '<'); -} -foreach my $test (@unix_splits) { - my ($string, $expected) = %$test; - my @result = ExtUtils::Helpers::Unix::split_like_shell($string); - $string =~ s/\n/\\n/g; - is(grep( !defined(), @result ), 0, "\"$string\" result all defined"); - is_deeply(\@result, $expected) or - diag("split_like_shell error \n>$string< is not splitting as >" . join("|", @$expected) . '<'); -} - -done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/t/man_pagename.t new/ExtUtils-Helpers-0.025/t/man_pagename.t --- old/ExtUtils-Helpers-0.022/t/man_pagename.t 2014-03-07 13:27:19.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/t/man_pagename.t 2016-09-02 09:48:41.000000000 +0200 @@ -2,7 +2,7 @@ use strict; use warnings FATAL => 'all'; -use Test::More; +use Test::More tests => 4; use Config; use File::Spec::Functions qw/catfile/; use ExtUtils::Helpers qw/man1_pagename man3_pagename/; @@ -20,5 +20,3 @@ is man3_pagename(catfile(qw/lib ExtUtils.pm/)), "ExtUtils.$Config{man3ext}", 'man3_pagename 1'; is man3_pagename(catfile(qw/lib ExtUtils Helpers.pm/)), join($sep, qw/ExtUtils Helpers./).$Config{man3ext}, 'man3_pagename 2'; is man3_pagename(catfile(qw/lib ExtUtils Helpers Unix.pm/)), join($sep, qw/ExtUtils Helpers Unix./).$Config{man3ext}, 'man3_pagename 3'; - -done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/t/release-pod-coverage.t new/ExtUtils-Helpers-0.025/t/release-pod-coverage.t --- old/ExtUtils-Helpers-0.022/t/release-pod-coverage.t 2014-03-07 13:27:19.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/t/release-pod-coverage.t 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -#!perl - -BEGIN { - unless ($ENV{RELEASE_TESTING}) { - require Test::More; - Test::More::plan(skip_all => 'these tests are for release candidate testing'); - } -} - -# This file was automatically generated by Dist::Zilla::Plugin::PodCoverageTests. - -use Test::More; - -eval "use Test::Pod::Coverage 1.08"; -plan skip_all => "Test::Pod::Coverage 1.08 required for testing POD coverage" - if $@; - -eval "use Pod::Coverage::TrustPod"; -plan skip_all => "Pod::Coverage::TrustPod required for testing POD coverage" - if $@; - -all_pod_coverage_ok({ coverage_class => 'Pod::Coverage::TrustPod' }); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/t/release-pod-syntax.t new/ExtUtils-Helpers-0.025/t/release-pod-syntax.t --- old/ExtUtils-Helpers-0.022/t/release-pod-syntax.t 2014-03-07 13:27:19.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/t/release-pod-syntax.t 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -#!perl - -BEGIN { - unless ($ENV{RELEASE_TESTING}) { - require Test::More; - Test::More::plan(skip_all => 'these tests are for release candidate testing'); - } -} - -# This file was automatically generated by Dist::Zilla::Plugin::PodSyntaxTests. -use Test::More; - -eval "use Test::Pod 1.41"; -plan skip_all => "Test::Pod 1.41 required for testing POD" if $@; - -all_pod_files_ok(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/t/split_like_shell.t new/ExtUtils-Helpers-0.025/t/split_like_shell.t --- old/ExtUtils-Helpers-0.022/t/split_like_shell.t 2014-03-07 13:27:19.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/t/split_like_shell.t 2016-09-02 09:48:41.000000000 +0200 @@ -14,61 +14,9 @@ { qq{one\\\ntwo} => [ "one\ntwo" ] }, # TODO ); -my @win_splits = - ( - { 'a" "b\\c" "d' => [ 'a b\c d' ] }, - { '"a b\\c d"' => [ 'a b\c d' ] }, - { '"a b"\\"c d"' => [ 'a b"c', 'd' ] }, - { '"a b"\\\\"c d"' => [ 'a b\c d' ] }, - { '"a"\\"b" "a\\"b"' => [ 'a"b a"b' ] }, - { '"a"\\\\"b" "a\\\\"b"' => [ 'a\b', 'a\b' ] }, - { '"a"\\"b a\\"b"' => [ 'a"b', 'a"b' ] }, - { 'a"\\"b" "a\\"b' => [ 'a"b', 'a"b' ] }, - { 'a"\\"b" "a\\"b' => [ 'a"b', 'a"b' ] }, - { 'a b' => [ 'a', 'b' ] }, - { "a\nb" => [ 'a', 'b' ] }, - { 'a"\\"b a\\"b' => [ 'a"b a"b' ] }, - { '"a""b" "a"b"' => [ 'a"b ab' ] }, - { '\\"a\\"' => [ '"a"' ] }, - { '"a"" "b"' => [ 'a"', 'b' ] }, - { 'a"b' => [ 'ab' ] }, - { 'a""b' => [ 'ab' ] }, - { 'a"""b' => [ 'a"b' ] }, - { 'a""""b' => [ 'a"b' ] }, - { 'a"""""b' => [ 'a"b' ] }, - { 'a""""""b' => [ 'a""b' ] }, - { '"a"b"' => [ 'ab' ] }, - { '"a""b"' => [ 'a"b' ] }, - { '"a"""b"' => [ 'a"b' ] }, - { '"a""""b"' => [ 'a"b' ] }, - { '"a"""""b"' => [ 'a""b' ] }, - { '"a""""""b"' => [ 'a""b' ] }, - { '' => [ ] }, - { ' ' => [ ] }, - { '""' => [ '' ] }, - { '" "' => [ ' ' ] }, - { '""a' => [ 'a' ] }, - { '""a b' => [ 'a', 'b' ] }, - { 'a""' => [ 'a' ] }, - { 'a"" b' => [ 'a', 'b' ] }, - { '"" a' => [ '', 'a' ] }, - { 'a ""' => [ 'a', '' ] }, - { 'a "" b' => [ 'a', '', 'b' ] }, - { 'a " " b' => [ 'a', ' ', 'b' ] }, - { 'a " b " c' => [ 'a', ' b ', 'c' ] }, -); - -if ($^O eq 'MSWin32') { - plan tests => 2 * @win_splits; - foreach my $test (@win_splits) { - do_split_tests($test); - } -} -else { - plan tests => 2 * @unix_splits; - foreach my $test (@unix_splits) { - do_split_tests($test); - } +plan tests => 2 * @unix_splits; +foreach my $test (@unix_splits) { + do_split_tests($test); } sub do_split_tests { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/xt/author/00-compile.t new/ExtUtils-Helpers-0.025/xt/author/00-compile.t --- old/ExtUtils-Helpers-0.022/xt/author/00-compile.t 1970-01-01 01:00:00.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/xt/author/00-compile.t 2016-09-02 09:48:41.000000000 +0200 @@ -0,0 +1,57 @@ +use 5.006; +use strict; +use warnings; + +# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.054 + +use Test::More; + +plan tests => 5; + +my @module_files = ( + 'ExtUtils/Helpers.pm', + 'ExtUtils/Helpers/Unix.pm', + 'ExtUtils/Helpers/VMS.pm', + 'ExtUtils/Helpers/Windows.pm' +); + + + +# no fake home requested + +my $inc_switch = -d 'blib' ? '-Mblib' : '-Ilib'; + +use File::Spec; +use IPC::Open3; +use IO::Handle; + +open my $stdin, '<', File::Spec->devnull or die "can't open devnull: $!"; + +my @warnings; +for my $lib (@module_files) +{ + # see L<perlfaq8/How can I capture STDERR from an external command?> + my $stderr = IO::Handle->new; + + my $pid = open3($stdin, '>&STDERR', $stderr, $^X, $inc_switch, '-e', "require q[$lib]"); + binmode $stderr, ':crlf' if $^O eq 'MSWin32'; + my @_warnings = <$stderr>; + waitpid($pid, 0); + is($?, 0, "$lib loaded ok"); + + shift @_warnings if @_warnings and $_warnings[0] =~ /^Using .*\bblib/ + and not eval { require blib; blib->VERSION('1.01') }; + + if (@_warnings) + { + warn @_warnings; + push @warnings, @_warnings; + } +} + + + +is(scalar(@warnings), 0, 'no warnings found') + or diag 'got warnings: ', ( Test::More->can('explain') ? Test::More::explain(\@warnings) : join("\n", '', @warnings) ); + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/xt/author/pod-coverage.t new/ExtUtils-Helpers-0.025/xt/author/pod-coverage.t --- old/ExtUtils-Helpers-0.022/xt/author/pod-coverage.t 1970-01-01 01:00:00.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/xt/author/pod-coverage.t 2016-09-02 09:48:41.000000000 +0200 @@ -0,0 +1,7 @@ +#!perl +# This file was automatically generated by Dist::Zilla::Plugin::PodCoverageTests. + +use Test::Pod::Coverage 1.08; +use Pod::Coverage::TrustPod; + +all_pod_coverage_ok({ coverage_class => 'Pod::Coverage::TrustPod' }); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-Helpers-0.022/xt/author/pod-syntax.t new/ExtUtils-Helpers-0.025/xt/author/pod-syntax.t --- old/ExtUtils-Helpers-0.022/xt/author/pod-syntax.t 1970-01-01 01:00:00.000000000 +0100 +++ new/ExtUtils-Helpers-0.025/xt/author/pod-syntax.t 2016-09-02 09:48:41.000000000 +0200 @@ -0,0 +1,7 @@ +#!perl +# This file was automatically generated by Dist::Zilla::Plugin::PodSyntaxTests. +use strict; use warnings; +use Test::More; +use Test::Pod 1.41; + +all_pod_files_ok(); ++++++ cpanspec.yml ++++++ --- #description_paragraphs: 3 #description: |- # override description from CPAN #summary: override summary from CPAN #no_testing: broken upstream #sources: # - source1 # - source2 #patches: # foo.patch: -p1 # bar.patch: #preamble: |- # BuildRequires: gcc-c++ #post_prep: |- # hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'` # sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL #post_build: |- # rm unused.files #post_install: |- # sed on %{name}.files #license: SUSE-NonFree #skip_noarch: 1 #custom_build: |- #./Build build flags=%{?_smp_mflags} --myflag #custom_test: |- #startserver && make test #ignore_requires: Bizarre::Module