Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 428637 – Documentation doesn't build (and even less on Perl 5.10).

Browse Source 
Patch by Marc Schumann <wurblzap@gmail.com>;
r=mkanat,LpSolit; a=mkanat


git-svn-id: svn://10.0.0.236/trunk@250143 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wurblzap%gmail.com
2008-04-12 22:24:23 +00:00
parent 4762c59f3b
commit 9eb71e1085
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/webtools/bugzilla/docs/en/xml/installation.xml
View File

@@ -1,5 +1,5 @@
<!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> -->
<!-- $Id: installation.xml,v 1.155 2008-04-04 06:48:25 lpsolit%gmail.com Exp $ -->
<!-- $Id: installation.xml,v 1.156 2008-04-12 22:24:23 wurblzap%gmail.com Exp $ -->
<chapter id="installing-bugzilla">
<title>Installing Bugzilla</title>
@@ -285,7 +285,7 @@
<listitem>
<para>
CGI &min-cgi-ver; or CGI &min-mp-cgi-ver; if using mod_perl
CGI &min-cgi-ver;
</para>
</listitem>
@@ -469,7 +469,7 @@
<listitem>
<para>
CGI
(&min-cgi-ver;) for mod_perl
(&min-mp-cgi-ver;) for mod_perl
</para>
</listitem>

11
mozilla/webtools/bugzilla/docs/makedocs.pl
View File

@@ -73,9 +73,11 @@ foreach my $module (@$modules, @$opt_modules)
print ENTITIES '<!ENTITY min-' . $name . '-ver "'.$version.'">' . "\n";
}
# CGI is a special case, because it has an optional version *and* a required
# version.
my ($cgi_opt) = grep($_->{package} eq 'CGI', @$opt_modules);
# CGI is a special case, because for Perl versions below 5.10, it has an
# optional version *and* a required version.
# We check @opt_modules first, then @modules, and pick the first we get.
# We'll get the optional one then, if it is given, otherwise the required one.
my ($cgi_opt) = grep($_->{module} eq 'CGI', @$opt_modules, @$modules);
print ENTITIES '<!ENTITY min-mp-cgi-ver "' . $cgi_opt->{version} . '">' . "\n";
print ENTITIES "\n <!-- Database Versions --> \n";
@@ -83,7 +85,8 @@ print ENTITIES "\n <!-- Database Versions --> \n";
my $db_modules = DB_MODULE;
foreach my $db (keys %$db_modules) {
my $dbd = $db_modules->{$db}->{dbd};
my $name = $dbd->{package};
my $name = $dbd->{module};
$name =~ s/::/-/g;
$name = lc($name);
my $version = $dbd->{version} || 'any';
my $db_version = $db_modules->{$db}->{'db_version'};