summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2012-01-10 14:36:26 +0100
committerNicholas Clark <nick@ccl4.org>2012-01-17 11:16:35 +0100
commit6c6fc3be9a6e74e4af716aada7ae4cbd4feb8338 (patch)
treea4b483b5bd185cdf630c82af997cf3f9a0339fb4
parent66056247dd2c721175d33eaf15386969664425ea (diff)
downloadperl-6c6fc3be9a6e74e4af716aada7ae4cbd4feb8338.tar.gz
Purge references to --netscape and --libpods, no longer in Pod::Html
The long deprecated --netscape flag was removed in commit 27b29ec338b08496. This was originally added to control use of Netscape specific HTML extensions, , but became a no-op when that functionality was removed. --libpods was removed in commit 3b49d8d9ac841d8e. However neither commit removed use of these flags by callers to Pod::Html, notably in installhtml and the Makefiles that invoke it. Hence this commit.
-rw-r--r--Cross/Makefile-cross-SH1
-rw-r--r--INSTALL1
-rwxr-xr-xMakefile.SH1
-rw-r--r--ext/Pod-Html/bin/pod2html20
-rw-r--r--installhtml22
-rw-r--r--pod/Makefile.SH4
-rw-r--r--t/porting/known_pod_issues.dat4
-rw-r--r--win32/pod.mak4
8 files changed, 9 insertions, 48 deletions
diff --git a/Cross/Makefile-cross-SH b/Cross/Makefile-cross-SH
index d71364d5a2..1f9a226ba1 100644
--- a/Cross/Makefile-cross-SH
+++ b/Cross/Makefile-cross-SH
@@ -809,7 +809,6 @@ install.html: all installhtml
--htmlroot=$(privlib)/html \
--splithead=pod/perlipc \
--splititem=pod/perlfunc \
- --libpods=perlfunc:perlguts:perlvar:perlrun:perlop \
--ignore=Porting/Maintainers.pm,Porting/pumpkin.pod,Porting/repository.pod \
--verbose
diff --git a/INSTALL b/INSTALL
index 87c56796cd..5c2846fee5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2196,7 +2196,6 @@ perl documentation:
--htmlroot=/perl/nmanual \
--splithead=pod/perlipc \
--splititem=pod/perlfunc \
- --libpods=perlfunc:perlguts:perlvar:perlrun:perlop \
--verbose
See the documentation in installhtml for more details. It can take
diff --git a/Makefile.SH b/Makefile.SH
index a9ed850a74..f4643a2b96 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -1114,7 +1114,6 @@ install.html: all installhtml
--htmlroot=$(privlib)/html \
--splithead=pod/perlipc \
--splititem=pod/perlfunc \
- --libpods=perlfunc:perlguts:perlvar:perlrun:perlop \
--ignore=Porting/Maintainers.pm,Porting/pumpkin.pod,Porting/repository.pod \
--verbose
diff --git a/ext/Pod-Html/bin/pod2html b/ext/Pod-Html/bin/pod2html
index 9f4081a6d6..c422ebf48a 100644
--- a/ext/Pod-Html/bin/pod2html
+++ b/ext/Pod-Html/bin/pod2html
@@ -8,7 +8,7 @@ pod2html - convert .pod files to .html files
pod2html --help --htmlroot=<name> --infile=<name> --outfile=<name>
--podpath=<name>:...:<name> --podroot=<name>
- --libpods=<name>:...:<name> --recurse --norecurse --verbose
+ --recurse --norecurse --verbose
--index --noindex --title=<name>
=head1 DESCRIPTION
@@ -61,24 +61,6 @@ Specify the base directory for finding library pods.
Specify which subdirectories of the podroot contain pod files whose
HTML converted forms can be linked-to in cross-references.
-=item libpods
-
- --libpods=name:...:name
-
-List of page names (eg, "perlfunc") which contain linkable C<=item>s.
-
-=item netscape
-
- --netscape
-
-Use Netscape HTML directives when applicable.
-
-=item nonetscape
-
- --nonetscape
-
-Do not use Netscape HTML directives (default).
-
=item index
--index
diff --git a/installhtml b/installhtml
index a4952817b0..0208cc87b2 100644
--- a/installhtml
+++ b/installhtml
@@ -18,8 +18,7 @@ installhtml - converts a collection of POD pages to HTML format.
installhtml [--help] [--podpath=<name>:...:<name>] [--podroot=<name>]
[--htmldir=<name>] [--htmlroot=<name>] [--norecurse] [--recurse]
[--splithead=<name>,...,<name>] [--splititem=<name>,...,<name>]
- [--libpods=<name>,...,<name>] [--ignore=<name>,...,<name>]
- [--verbose]
+ [--ignore=<name>,...,<name>] [--verbose]
=head1 DESCRIPTION
@@ -77,11 +76,6 @@ split, rather it invokes I<splitpod> to do the dirty work. As with
The directory containing the splitpod program. The default is 'podroot/pod'.
-=item B<--libpods> library PODs for LE<lt>E<gt> links
-
-Comma-separated list of "library" pod files. This is the same list that
-will be passed to pod2html when any pod is converted.
-
=item B<--ignore> files to be ignored
Comma-separated of files that shouldn't be installed, given relative
@@ -104,7 +98,6 @@ perl documentation:
--htmlroot=/perl/nmanual \
--splithead=pod/perlipc \
--splititem=pod/perlfunc \
- --libpods=perlfunc,perlguts,perlvar,perlrun,perlop \
--recurse \
--verbose
@@ -120,7 +113,7 @@ $usage =<<END_OF_USAGE;
Usage: $0 --help --podpath=<name>:...:<name> --podroot=<name>
--htmldir=<name> --htmlroot=<name> --norecurse --recurse
--splithead=<name>,...,<name> --splititem=<name>,...,<name>
- --libpods=<name>,...,<name> --ignore=<name>,...,<name> --verbose
+ --ignore=<name>,...,<name> --verbose
--help - this message
--podpath - colon-separated list of directories containing .pod and
@@ -131,9 +124,6 @@ Usage: $0 --help --podpath=<name>:...:<name> --podroot=<name>
to the filesystem (\$podroot/html by default).
--htmlroot - http-server base directory from which all relative paths
in podpath stem (default is /).
- --libpods - comma-separated list of files to search for =item pod
- directives in as targets of C<> and implicit links (empty
- by default).
--norecurse - don't recurse on those subdirectories listed in podpath.
(default behavior).
--recurse - recurse on those subdirectories listed in podpath
@@ -149,10 +139,9 @@ Usage: $0 --help --podpath=<name>:...:<name> --podroot=<name>
END_OF_USAGE
-my (@libpods, @podpath, $podroot, $htmldir, $htmlroot, $recurse, @splithead,
+my (@podpath, $podroot, $htmldir, $htmlroot, $recurse, @splithead,
@splititem, $splitpod, $verbose, $pod2html, @ignore);
-@libpods = ();
@podpath = ( "." ); # colon-separated list of directories containing .pod
# and .pm files to be converted.
$podroot = "."; # assume the pods we want are here
@@ -182,7 +171,6 @@ my $result = GetOptions( \%Options, qw(
podroot=s
htmldir=s
htmlroot=s
- libpods=s
ignore=s
recurse!
splithead=s
@@ -287,7 +275,6 @@ sub parse_command_line {
# lists of files
@splithead = split(",", $Options{splithead}) if defined $Options{splithead};
@splititem = split(",", $Options{splititem}) if defined $Options{splititem};
- @libpods = split(",", $Options{libpods}) if defined $Options{libpods};
$htmldir = $Options{htmldir} if defined $Options{htmldir};
$htmlroot = $Options{htmlroot} if defined $Options{htmlroot};
@@ -600,11 +587,10 @@ sub runpod2html {
"--htmldir=$htmldir",
"--htmlroot=$htmlroot",
"--podpath=".join(":", @podpath),
- "--podroot=$podroot", "--netscape",
+ "--podroot=$podroot",
"--header",
($doindex ? "--index" : "--noindex"),
"--" . ($recurse ? "" : "no") . "recurse",
- ($#libpods >= 0) ? "--libpods=" . join(":", @libpods) : "",
"--infile=$podroot/$pod", "--outfile=$htmldir/$html");
die "$0: error running $pod2html: $!\n" if $?;
}
diff --git a/pod/Makefile.SH b/pod/Makefile.SH
index 5cc9b83902..331e15c9f8 100644
--- a/pod/Makefile.SH
+++ b/pod/Makefile.SH
@@ -55,9 +55,7 @@ LDLIBPTH = $ldlibpth
$spitshell >>Makefile <<'!NO!SUBS!'
HTMLROOT = / # Change this to fix cross-references in HTML
-POD2HTML_ARGS = --htmlroot=$(HTMLROOT) \
- --podroot=.. --podpath=pod:lib:ext:vms \
- --libpods=perlfunc:perlguts:perlvar:perlrun:perlop
+POD2HTML_ARGS = --htmlroot=$(HTMLROOT) --podroot=.. --podpath=pod:lib:ext:vms
POD2HTML = ../ext/Pod-Html/pod2html
POD2MAN = ../cpan/podlators/pod2man
POD2LATEX = ../cpan/Pod-LaTeX/pod2latex
diff --git a/t/porting/known_pod_issues.dat b/t/porting/known_pod_issues.dat
index c4b487cb67..fe4851c0ac 100644
--- a/t/porting/known_pod_issues.dat
+++ b/t/porting/known_pod_issues.dat
@@ -1,4 +1,4 @@
-# This file is the data file for t/porting/podcheck.t.
+# This file is the data file for porting/podcheck.t.
# There are three types of lines.
# Comment lines are white-space only or begin with a '#', like this one. Any
# changes you make to the comment lines will be lost when the file is
@@ -195,7 +195,7 @@ ext/vms-stdio/stdio.pm Verbatim line length including indents exceeds 79 by 1
ext/xs-apitest/apitest.pm Verbatim line length including indents exceeds 79 by 1
install ? Should you be using F<...> or maybe L<...> instead of 1
install Verbatim line length including indents exceeds 79 by 11
-installhtml Verbatim line length including indents exceeds 79 by 5
+installhtml Verbatim line length including indents exceeds 79 by 3
os2/os2/os2-extattr/extattr.pm ? Should you be using F<...> or maybe L<...> instead of 1
os2/os2/os2-process/process.pm Verbatim line length including indents exceeds 79 by 27
os2/os2/os2-rexx/dll/dll.pm Verbatim line length including indents exceeds 79 by 2
diff --git a/win32/pod.mak b/win32/pod.mak
index 12da085732..23a7d5effd 100644
--- a/win32/pod.mak
+++ b/win32/pod.mak
@@ -1,7 +1,5 @@
HTMLROOT = / # Change this to fix cross-references in HTML
-POD2HTML_ARGS = --htmlroot=$(HTMLROOT) \
- --podroot=.. --podpath=pod:lib:ext:vms \
- --libpods=perlfunc:perlguts:perlvar:perlrun:perlop
+POD2HTML_ARGS = --htmlroot=$(HTMLROOT) --podroot=.. --podpath=pod:lib:ext:vms
POD2HTML = ../ext/Pod-Html/pod2html
POD2MAN = ../cpan/podlators/pod2man
POD2TEXT = ../cpan/podlators/pod2text