X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=blobdiff_plain;f=maint%2FMakefile.PL.inc%2F53_autogen_pod.pl;h=2496a4753a919c86f9bdf7b1dbacbcf250b4557c;hp=e3592e57ee543afad856b0cc23964d60f05ed36a;hb=ffce4b65b2c49bbb04919766c376625d426542f7;hpb=e01862e481716a38079f38aa688f9a5c6317c449 diff --git a/maint/Makefile.PL.inc/53_autogen_pod.pl b/maint/Makefile.PL.inc/53_autogen_pod.pl index e3592e5..2496a47 100644 --- a/maint/Makefile.PL.inc/53_autogen_pod.pl +++ b/maint/Makefile.PL.inc/53_autogen_pod.pl @@ -85,12 +85,7 @@ EOP # on some OSes generated files may have an incorrect \n - fix it # so that the xt tests pass on a fresh checkout (also shipping a # dist with CRLFs is beyond obnoxious) -# -# Ironically EUMM's dos2unix is broken on win32 itself - it does -# not take into account the CRLF layer present on win32 -# do the ENV trick again if ($^O eq 'MSWin32' or $^O eq 'cygwin') { - { local $ENV{PERLIO} = 'unix'; system( $^X, qw( -MExtUtils::Command -e dos2unix -- ), $pod_dir ); @@ -98,17 +93,14 @@ if ($^O eq 'MSWin32' or $^O eq 'cygwin') { postamble <<"EOP"; -test_xt : dbic_fixup_generated_pod +clonedir_post_generate_files : pod_crlf_fixup -dbic_fixup_generated_pod : -\t@{[ $mm_proto->oneliner( qq(\$\$ENV{PERLIO}='unix' and system( \$\$^X, qw( -MExtUtils::Command -e dos2unix -- ), q($pod_dir) ) ) ) ]} +pod_crlf_fixup : +@{[ $crlf_fixup->($pod_dir) ]} EOP } - -# copy the contents of $pod_dir over to the workdir -# (yes, overwriting is fine, though nothing should reside there) { postamble <<"EOP"; @@ -119,6 +111,7 @@ dbic_clonedir_copy_generated_pod : \t@{[ $mm_proto->oneliner("install([ from_to => {q($pod_dir) => File::Spec->curdir(), write => q($pod_dir.packlist)}, verbose => 0, uninstall_shadows => 0, skip => [] ])", ['-MExtUtils::Install']) ]} + EOP }