In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/b14c7f9adb242c4208242f5a1c161dfdb814fe89?hp=2ff38e68adbc6fa5afe7756c10314a0bf62fdab4>
- Log ----------------------------------------------------------------- commit b14c7f9adb242c4208242f5a1c161dfdb814fe89 Author: Steve Hay <[email protected]> Date: Thu Oct 7 21:56:41 2010 +0100 Fix pod/buildtoc's handling of Win32 makefiles The state of the POD file cleanup code in the Win32 makefiles had parted company with what pod/buildtoc was looking for. Fix the script for the current state of play and regenerate the makefiles. ----------------------------------------------------------------------- Summary of changes: pod/buildtoc | 5 +++-- win32/Makefile | 22 +++++++++++----------- win32/makefile.mk | 22 +++++++++++----------- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/pod/buildtoc b/pod/buildtoc index 0d4fb5d..3a572a3 100644 --- a/pod/buildtoc +++ b/pod/buildtoc @@ -591,6 +591,7 @@ sub generate_nmake_2 { join " ", sort keys %Copies, keys %Generated, map {"perl$_.pod"} keys %Readmes); $line =~ s/$/ \\/mg; + $line =~ s/ \\$//; $line; } @@ -635,8 +636,8 @@ sub do_nmake { 1 while $makefile =~ s/\0\tcopy .*\n/\0/gm; $makefile =~ s/\0+/join ("", &generate_nmake_1)/se; - $makefile =~ s{(del /f [^\n]+podchecker[^\n]+).*?(pod2html)} - {"$1\n" . &generate_nmake_2."\n\t $2"}se; + $makefile =~ s{(-cd \$\(PODDIR\) && del /f[^\n]+).*?(-cd \.\.\\utils && del /f)} + {"$1\n" . &generate_nmake_2."\n\t$2"}se; $makefile; } diff --git a/win32/Makefile b/win32/Makefile index 1b81a29..9816d56 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -1184,17 +1184,17 @@ distclean: realclean -if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS -if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API -cd $(PODDIR) && del /f *.html *.bat \ - perlaix.pod perlamiga.pod perlapi.pod perlapollo.pod \ - perlbeos.pod perlbs2000.pod perlce.pod perlcn.pod \ - perlcygwin.pod perl5136delta.pod perldgux.pod perldos.pod \ - perlepoc.pod perlfreebsd.pod perlhaiku.pod perlhpux.pod \ - perlhurd.pod perlintern.pod perlirix.pod perljp.pod perlko.pod \ - perllinux.pod perlmacos.pod perlmacosx.pod perlmodlib.pod \ - perlmpeix.pod perlnetware.pod perlopenbsd.pod perlos2.pod \ - perlos390.pod perlos400.pod perlplan9.pod perlqnx.pod \ - perlriscos.pod perlsolaris.pod perlsymbian.pod perltoc.pod \ - perltru64.pod perltw.pod perluniprops.pod perluts.pod \ - perlvmesa.pod perlvos.pod perlwin32.pod + perl5136delta.pod perlaix.pod perlamiga.pod perlapi.pod \ + perlapollo.pod perlbeos.pod perlbs2000.pod perlce.pod \ + perlcn.pod perlcygwin.pod perldgux.pod perldos.pod perlepoc.pod \ + perlfreebsd.pod perlhaiku.pod perlhpux.pod perlhurd.pod \ + perlintern.pod perlirix.pod perljp.pod perlko.pod perllinux.pod \ + perlmacos.pod perlmacosx.pod perlmodlib.pod perlmpeix.pod \ + perlnetware.pod perlopenbsd.pod perlos2.pod perlos390.pod \ + perlos400.pod perlplan9.pod perlqnx.pod perlriscos.pod \ + perlsolaris.pod perlsymbian.pod perltoc.pod perltru64.pod \ + perltw.pod perluniprops.pod perluts.pod perlvmesa.pod \ + perlvos.pod perlwin32.pod -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \ perldoc perlivp dprofpp libnetcfg enc2xs piconv cpan *.bat \ xsubpp instmodsh prove ptar ptardiff cpanp-run-perl cpanp cpan2dist shasum corelist config_data diff --git a/win32/makefile.mk b/win32/makefile.mk index 55b1968..bbba91e 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1548,17 +1548,17 @@ distclean: realclean -if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS -if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API -cd $(PODDIR) && del /f *.html *.bat \ - perlaix.pod perlamiga.pod perlapi.pod perlapollo.pod \ - perlbeos.pod perlbs2000.pod perlce.pod perlcn.pod \ - perlcygwin.pod perl5136delta.pod perldgux.pod perldos.pod \ - perlepoc.pod perlfreebsd.pod perlhaiku.pod perlhpux.pod \ - perlhurd.pod perlintern.pod perlirix.pod perljp.pod perlko.pod \ - perllinux.pod perlmacos.pod perlmacosx.pod perlmodlib.pod \ - perlmpeix.pod perlnetware.pod perlopenbsd.pod perlos2.pod \ - perlos390.pod perlos400.pod perlplan9.pod perlqnx.pod \ - perlriscos.pod perlsolaris.pod perlsymbian.pod perltoc.pod \ - perltru64.pod perltw.pod perluniprops.pod perluts.pod \ - perlvmesa.pod perlvos.pod perlwin32.pod + perl5136delta.pod perlaix.pod perlamiga.pod perlapi.pod \ + perlapollo.pod perlbeos.pod perlbs2000.pod perlce.pod \ + perlcn.pod perlcygwin.pod perldgux.pod perldos.pod perlepoc.pod \ + perlfreebsd.pod perlhaiku.pod perlhpux.pod perlhurd.pod \ + perlintern.pod perlirix.pod perljp.pod perlko.pod perllinux.pod \ + perlmacos.pod perlmacosx.pod perlmodlib.pod perlmpeix.pod \ + perlnetware.pod perlopenbsd.pod perlos2.pod perlos390.pod \ + perlos400.pod perlplan9.pod perlqnx.pod perlriscos.pod \ + perlsolaris.pod perlsymbian.pod perltoc.pod perltru64.pod \ + perltw.pod perluniprops.pod perluts.pod perlvmesa.pod \ + perlvos.pod perlwin32.pod -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \ perldoc perlivp dprofpp libnetcfg enc2xs piconv cpan *.bat \ xsubpp instmodsh prove ptar ptardiff cpanp-run-perl cpanp cpan2dist shasum corelist config_data -- Perl5 Master Repository
