diff options
| author | Craig A. Berry <craigberry@mac.com> | 2011-01-21 15:55:32 -0600 |
|---|---|---|
| committer | Craig A. Berry <craigberry@mac.com> | 2011-01-21 17:06:56 -0600 |
| commit | 600dcb9e59f9225c279448736cc8836eaa11d715 (patch) | |
| tree | d436c7d974ad7f533cab18fcb79a2d1a07c4a9ef /pod | |
| parent | 64a589f6fd1ab06ffa458b66637e3d0b434d6166 (diff) | |
| download | perl-600dcb9e59f9225c279448736cc8836eaa11d715.tar.gz | |
Automate current perldelta entry in vms/descrip_mms.template.
pod/buildtoc knows which one is current, so we might as well
substitute it in one place and be done with it.
Diffstat (limited to 'pod')
| -rw-r--r-- | pod/buildtoc | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/pod/buildtoc b/pod/buildtoc index 1a4e02cc72..6d4b6abce3 100644 --- a/pod/buildtoc +++ b/pod/buildtoc @@ -162,7 +162,7 @@ if (defined $delta_source) { die "$0: delta source defined but not target"; } } elsif (defined $delta_target) { - die "$0: delta target defined but not target"; + die "$0: delta target defined but not source"; } close MASTER; @@ -572,11 +572,6 @@ SNIP sort keys %Pods, keys %Readmepods; } -sub generate_descrip_mms_3 { - map qq{\t- If F\$Search("[.pod]$_").nes."" Then Delete/NoConfirm/Log [.pod]$_;*}, - sort keys %Generated, keys %Copies; -} - sub generate_nmake_1 { # XXX Fix this with File::Spec (map {sprintf "\tcopy ..\\README.%-8s ..\\pod\\perl$_.pod\n", $_} @@ -682,6 +677,14 @@ sub do_vms { die "$0: $name contains NUL bytes" if $makefile =~ /\0/; +# Looking for the macro defining the current perldelta: +#PERLDELTA_CURRENT = [.pod]perl5139delta.pod + + $makefile =~ s/\nPERLDELTA_CURRENT\s+=\s+\Q[.pod]perl\E\d+delta\.pod\n + /\0/sx; + verify_contiguous($name, $makefile, 'current perldelta macro'); + $makefile =~ s/\0+/join "\n", '', "PERLDELTA_CURRENT = [.pod]$delta_target", ''/se; + # Looking for rules like this # [.lib.pods]perl.pod : [.pod]perl.pod # @ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods] @@ -694,12 +697,6 @@ sub do_vms { verify_contiguous($name, $makefile, 'copy rules'); $makefile =~ s/\0+/join "\n", '', &generate_descrip_mms_2/se; -# Looking for rules like this: -# - If F$Search("[.pod]perldelta.pod").nes."" Then Delete/NoConfirm/Log [.pod]perldelta.pod;* - $makefile =~ s!(?:\t- If F\$Search\("\[\.pod\]perl\d*[a-z]+\Q.pod").nes."" Then Delete/NoConfirm/Log [.pod]perl\E\d*[a-z]+\.pod;\*\n)+!\0!sg; - verify_contiguous($name, $makefile, 'delete rules'); - $makefile =~ s/\0+/join "\n", &generate_descrip_mms_3, ''/se; - $makefile; } |