From: Nicholas Clark Date: Mon, 20 Apr 2009 09:01:15 +0000 (+0100) Subject: Move vms/perlvms.pod to pod/ and update the Makfiles and Makefile generators. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=dd0cfdaa8f18412a5bea90a5dd33b46569dea1c5;p=p5sagit%2Fp5-mst-13.2.git Move vms/perlvms.pod to pod/ and update the Makfiles and Makefile generators. --- diff --git a/MANIFEST b/MANIFEST index 68e819c..a4427d8 100644 --- a/MANIFEST +++ b/MANIFEST @@ -3628,6 +3628,7 @@ pod/perluniintro.pod Perl Unicode introduction pod/perlunitut.pod Perl Unicode tutorial pod/perlutil.pod utilities packaged with the Perl distribution pod/perlvar.pod Perl predefined variables +pod/perlvms.pod Perl notes for VMS pod/perlxs.pod Perl XS application programming interface pod/perlxstut.pod Perl XS tutorial pod/pod2html.PL Precursor for translator to turn pod into HTML @@ -3737,7 +3738,7 @@ README.tru64 Perl notes for Tru64 README.tw Perl for Traditional Chinese (in Big5) README.uts Perl notes for UTS README.vmesa Perl notes for VM/ESA -README.vms Perl notes for VMS +README.vms Notes about installing the VMS port README.vos Perl notes for Stratus VOS README.win32 Perl notes for Windows reentr.c Reentrant interfaces @@ -4413,7 +4414,6 @@ vms/make_command.com record MM[SK] command used to build Perl vms/mms2make.pl convert descrip.mms to make syntax vms/munchconfig.c performs shell $var substitution for VMS vms/myconfig.com record local configuration info for bug report -vms/perlvms.pod VMS-specific additions to Perl documentation vms/sockadapt.c glue for SockshShr socket support vms/sockadapt.h glue for SockshShr socket support vms/test.com DCL driver for regression tests diff --git a/Makefile.SH b/Makefile.SH index e1f88c1..7cb0004 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -985,8 +985,6 @@ extra.pods: miniperl$(EXE_EXT) $(LNS) ../$$x "pod/perl"$$nx".pod" ; \ echo "pod/perl"$$nx".pod" >> extra.pods ; \ done - -@rm -f pod/perlvms.pod - -@test -f vms/perlvms.pod && $(LNS) ../vms/perlvms.pod pod/perlvms.pod && echo "pod/perlvms.pod" >> extra.pods extras.make: perl$(EXE_EXT) -@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(LDLIBPTH) $(RUN) ./perl -Ilib -MCPAN -e '@ARGV&&make(@ARGV)' `cat extras.lst` diff --git a/pod.lst b/pod.lst index 3226b38..50e5c88 100644 --- a/pod.lst +++ b/pod.lst @@ -205,7 +205,7 @@ r perlsymbian Perl notes for Symbian r perltru64 Perl notes for Tru64 r perluts Perl notes for UTS r perlvmesa Perl notes for VM/ESA -r perlvms Perl notes for VMS + perlvms Perl notes for VMS r perlvos Perl notes for Stratus VOS r perlwin32 Perl notes for Windows diff --git a/pod/buildtoc b/pod/buildtoc index 31eb1cd..50120ea 100644 --- a/pod/buildtoc +++ b/pod/buildtoc @@ -142,8 +142,7 @@ if (defined $delta_source) { if (defined $delta_target) { # This way round so that keys can act as a MANIFEST skip list # Targets will aways be in the pod directory. Currently we can only cope - # with sources being in the same directory. Fix this and do perlvms.pod - # with this? + # with sources being in the same directory. $Copies{$delta_target} = $delta_source; } else { die "$0: delta source defined but not target"; @@ -531,7 +530,9 @@ sub generate_manifest_pod { sort grep {!$Copies{"$_.pod"}} grep {!$Generated{"$_.pod"}} keys %Pods; } sub generate_manifest_readme { - generate_manifest map {["README.$_", $Readmes{$_}]} sort keys %Readmes; + generate_manifest sort {$a->[0] cmp $b->[0]} + ["README.vms", "Notes about installing the VMS port"], + map {["README.$_", $Readmes{$_}]} keys %Readmes; } sub generate_roffitall { @@ -555,10 +556,10 @@ sub generate_descrip_mms_1 { } sub generate_descrip_mms_2 { - map {sprintf <<'SNIP', $_, $_ eq 'perlvms' ? 'vms' : 'pod', $_} -[.lib.pods]%s.pod : [.%s]%s.pod - @ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods] - Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods] + map {<<"SNIP"} +[.lib.pods]$_.pod : [.pod]$_.pod + \@ If F\$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods] + Copy/NoConfirm/Log \$(MMS\$SOURCE) [.lib.pods] SNIP sort keys %Pods, keys %Readmepods; } @@ -581,7 +582,7 @@ sub generate_nmake_2 { local $Text::Wrap::columns = 76; my $line = wrap ("\t ", "\t ", join " ", sort keys %Copies, keys %Generated, - map {"perl$_.pod"} "vms", keys %Readmes); + map {"perl$_.pod"} keys %Readmes); $line =~ s/$/ \\/mg; $line; } diff --git a/vms/perlvms.pod b/pod/perlvms.pod similarity index 100% rename from vms/perlvms.pod rename to pod/perlvms.pod diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template index 32af468..3fe426f 100644 --- a/vms/descrip_mms.template +++ b/vms/descrip_mms.template @@ -1359,7 +1359,7 @@ makeppport : $(MINIPERL_EXE) $(ARCHDIR)Config.pm @ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods] Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods] -[.lib.pods]perlvms.pod : [.vms]perlvms.pod +[.lib.pods]perlvms.pod : [.pod]perlvms.pod @ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods] Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods] diff --git a/win32/Makefile b/win32/Makefile index 3c69823..db6e405 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -1129,7 +1129,6 @@ utils: $(PERLEXE) $(X2P) copy ..\README.tw ..\pod\perltw.pod copy ..\README.uts ..\pod\perluts.pod copy ..\README.vmesa ..\pod\perlvmesa.pod - copy ..\README.vms ..\pod\perlvms.pod copy ..\README.vos ..\pod\perlvos.pod copy ..\README.win32 ..\pod\perlwin32.pod copy ..\pod\perl5110delta.pod ..\pod\perldelta.pod @@ -1209,8 +1208,8 @@ distclean: realclean perlmint.pod perlmpeix.pod perlnetware.pod perlopenbsd.pod \ perlos2.pod perlos390.pod perlos400.pod perlplan9.pod \ perlqnx.pod perlriscos.pod perlsolaris.pod perlsymbian.pod \ - perltru64.pod perltw.pod perluts.pod perlvmesa.pod perlvms.pod \ - perlvms.pod perlvos.pod perlwin32.pod \ + perltru64.pod perltw.pod perluts.pod perlvmesa.pod perlvos.pod \ + perlwin32.pod \ pod2html pod2latex pod2man pod2text pod2usage \ podchecker podselect -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \ diff --git a/win32/makefile.mk b/win32/makefile.mk index 52de68c..9a26dd9 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1453,7 +1453,6 @@ utils: $(PERLEXE) $(X2P) copy ..\README.tw ..\pod\perltw.pod copy ..\README.uts ..\pod\perluts.pod copy ..\README.vmesa ..\pod\perlvmesa.pod - copy ..\README.vms ..\pod\perlvms.pod copy ..\README.vos ..\pod\perlvos.pod copy ..\README.win32 ..\pod\perlwin32.pod copy ..\pod\perl5110delta.pod ..\pod\perldelta.pod @@ -1531,8 +1530,8 @@ distclean: realclean perlmint.pod perlmpeix.pod perlnetware.pod perlopenbsd.pod \ perlos2.pod perlos390.pod perlos400.pod perlplan9.pod \ perlqnx.pod perlriscos.pod perlsolaris.pod perlsymbian.pod \ - perltru64.pod perltw.pod perluts.pod perlvmesa.pod perlvms.pod \ - perlvms.pod perlvos.pod perlwin32.pod \ + perltru64.pod perltw.pod perluts.pod perlvmesa.pod perlvos.pod \ + perlwin32.pod \ pod2html pod2latex pod2man pod2text pod2usage \ podselect -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \ diff --git a/win32/pod.mak b/win32/pod.mak index 011623c..835b711 100644 --- a/win32/pod.mak +++ b/win32/pod.mak @@ -133,6 +133,7 @@ POD = \ perlunitut.pod \ perlutil.pod \ perlvar.pod \ + perlvms.pod \ perlxs.pod \ perlxstut.pod @@ -255,6 +256,7 @@ MAN = \ perlunitut.man \ perlutil.man \ perlvar.man \ + perlvms.man \ perlxs.man \ perlxstut.man @@ -376,6 +378,7 @@ HTML = \ perlunitut.html \ perlutil.html \ perlvar.html \ + perlvms.html \ perlxs.html \ perlxstut.html # not perltoc.html @@ -499,6 +502,7 @@ TEX = \ perlunitut.tex \ perlutil.tex \ perlvar.tex \ + perlvms.tex \ perlxs.tex \ perlxstut.tex