Skip to content

bugzilla
bugzilla
Commit 124ab7cd authored by mkanat%bugzilla.org's avatar mkanat%bugzilla.org
Browse files
Options

Bug 192451: Checksetup should prioritize missing module whines

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> (module owner) a=myk
parent beb7bbd5
Show whitespace changes
Inline Side-by-side
Showing with 271 additions and 290 deletions
Bugzilla/DB.pm
View file @ 124ab7cd
...@@ -135,7 +135,7 @@ sub bz_check_requirements { ...@@ -135,7 +135,7 @@ sub bz_check_requirements {
my $dbd_ver = $db->{dbd_version}; my $dbd_ver = $db->{dbd_version};
my $sql_server = $db->{name}; my $sql_server = $db->{name};
my $sql_want = $db->{db_version}; my $sql_want = $db->{db_version};
unless (have_vers($dbd, $dbd_ver, $output)) { unless (have_vers({ module => $dbd, version => $dbd_ver }, $output)) {
my $command = install_command($dbd); my $command = install_command($dbd);
my $root = ROOT_USER; my $root = ROOT_USER;
my $version = $dbd_ver ? " $dbd_ver or higher" : ''; my $version = $dbd_ver ? " $dbd_ver or higher" : '';
......
Bugzilla/Install/Requirements.pm
View file @ 124ab7cd
...@@ -25,13 +25,13 @@ package Bugzilla::Install::Requirements; ...@@ -25,13 +25,13 @@ package Bugzilla::Install::Requirements;
use strict; use strict;
use List::Util qw(max);
use POSIX (); use POSIX ();
use base qw(Exporter); use base qw(Exporter);
our @EXPORT = qw( our @EXPORT = qw(
REQUIRED_MODULES REQUIRED_MODULES
OPTIONAL_MODULES OPTIONAL_MODULES
MOD_PERL_MODULES
check_requirements check_requirements
check_graphviz check_graphviz
...@@ -42,351 +42,333 @@ our @EXPORT = qw( ...@@ -42,351 +42,333 @@ our @EXPORT = qw(
); );
use Bugzilla::Constants; use Bugzilla::Constants;
# "package" is the perl package we're checking for. "module" is the name
# of the actual module we load with "require" to see if the package is
# installed or not. "version" is the version we need, or 0 if we'll accept
# any version.
use constant REQUIRED_MODULES => [ use constant REQUIRED_MODULES => [
{ {
name => 'CGI', package => 'CGI',
module => 'CGI',
version => '2.93' version => '2.93'
}, },
{ {
name => 'Date::Format', package => 'TimeDate',
module => 'Date::Format',
version => '2.21' version => '2.21'
}, },
{ {
name => 'DBI', package => 'DBI',
module => 'DBI',
version => '1.41' version => '1.41'
}, },
{ {
name => 'File::Spec', package => 'PathTools',
module => 'File::Spec',
version => '0.84' version => '0.84'
}, },
{ {
name => 'Template', package => 'Template-Toolkit',
module => 'Template',
version => '2.12' version => '2.12'
}, },
{ {
name => 'Mail::Mailer', package => 'MailTools',
module => 'Mail::Mailer',
version => '1.67' version => '1.67'
}, },
{ {
name => 'MIME::Base64', package => 'MIME-Base64',
module => 'MIME::Base64',
version => '3.01' version => '3.01'
}, },
{ {
package => 'MIME-tools',
# MIME::Parser is packaged as MIME::Tools on ActiveState Perl # MIME::Parser is packaged as MIME::Tools on ActiveState Perl
name => $^O =~ /MSWin32/i ? 'MIME::Tools' : 'MIME::Parser', module => ON_WINDOWS ? 'MIME::Tools' : 'MIME::Parser',
version => '5.406' version => '5.406'
}, },
]; ];
use constant OPTIONAL_MODULES => [ use constant OPTIONAL_MODULES => [
{ {
name => 'GD', package => 'GD',
version => '1.20' module => 'GD',
version => '1.20',
feature => 'Graphical Reports, New Charts, Old Charts'
}, },
{ {
package => 'Template-GD',
# This module tells us whether or not Template-GD is installed # This module tells us whether or not Template-GD is installed
# on Template-Toolkits after 2.14, and still works with 2.14 and lower. # on Template-Toolkits after 2.14, and still works with 2.14 and lower.
name => 'Template::Plugin::GD::Image', module => 'Template::Plugin::GD::Image',
version => 0 version => 0,
feature => 'Graphical Reports'
}, },
{ {
name => 'Chart::Base', package => 'Chart',
version => '1.0' module => 'Chart::Base',
version => '1.0',
feature => 'New Charts, Old Charts'
}, },
{ {
name => 'GD::Graph', package => 'GDGraph',
version => 0 module => 'GD::Graph',
version => 0,
feature => 'Graphical Reports'
}, },
{ {
name => 'GD::Text::Align', package => 'GDTextUtil',
version => 0 module => 'GD::Text',
version => 0,
feature => 'Graphical Reports'
}, },
{ {
name => 'XML::Twig', package => 'XML-Twig',
version => 0 module => 'XML::Twig',
version => 0,
feature => 'Move Bugs Between Installations'
}, },
{ {
name => 'LWP::UserAgent', package => 'libwww-perl',
version => 0 module => 'LWP::UserAgent',
version => 0,
feature => 'Automatic Update Notifications'
}, },
{ {
name => 'PatchReader', package => 'PatchReader',
version => '0.9.4' module => 'PatchReader',
version => '0.9.4',
feature => 'Patch Viewer'
}, },
{ {
name => 'Image::Magick', package => 'PerlMagick',
version => 0 module => 'Image::Magick',
version => 0,
feature => 'Optionally Convert BMP Attachments to PNGs'
}, },
{ {
name => 'Net::LDAP', package => 'perl-ldap',
version => 0 module => 'Net::LDAP',
version => 0,
feature => 'LDAP Authentication'
}, },
{ {
name => 'SOAP::Lite', package => 'SOAP-Lite',
version => 0 module => 'SOAP::Lite',
version => 0,
feature => 'XML-RPC Interface'
}, },
{ {
# Since Perl 5.8, we need the 'utf8_mode' method of HTML::Parser # We need the 'utf8_mode' method of HTML::Parser, for HTML::Scrubber.
# which has been introduced in version 3.39_92 and fixed in 3.40 package => 'HTML-Parser',
# to not complain when running Perl 5.6. module => 'HTML::Parser',
# This module is required by HTML::Scrubber. version => '3.40',
name => 'HTML::Parser', feature => 'More HTML in Product/Group Descriptions'
version => ($] >= 5.008) ? '3.40' : 0
}, },
{ {
name => 'HTML::Scrubber', package => 'HTML-Scrubber',
version => 0 module => 'HTML::Scrubber',
version => 0,
feature => 'More HTML in Product/Group Descriptions'
}, },
];
# These are only required if you want to use Bugzilla with
# mod_perl.
use constant MOD_PERL_MODULES => [
{ {
name => 'mod_perl2', package => 'mod_perl',
version => '1.999022' module => 'mod_perl2',
version => '1.999022',
feature => 'mod_perl'
}, },
# Even very new releases of perl (5.8.5) don't come with this version, # Even very new releases of perl (5.8.5) don't come with this version,
# so I didn't want to make it a general requirement just for # so I didn't want to make it a general requirement just for
# running under mod_cgi. # running under mod_cgi.
{ {
name => 'CGI', package => 'CGI',
version => '3.11' module => 'CGI',
version => '3.11',
feature => 'mod_perl'
}, },
{ {
name => 'Apache::DBI', package => 'Apache-DBI',
version => '0.96' module => 'Apache::DBI',
version => '0.96',
feature => 'mod_perl'
}, },
]; ];
# Remember that you only have to add modules to this hash if their
# names are significantly different on ActiveState than on normal perl.
# If it's just a difference between "::" and "-" in the name, don't worry
# about it--install_command() handles that automatically.
use constant WIN32_MODULE_NAMES => {
'Chart::Base' => 'Chart',
'Date::Format' => 'TimeDate',
'Template' => 'Template-Toolkit',
'GD::Graph' => 'GDGraph',
'GD::Text::Align' => 'GDTextUtil',
'Mail::Mailer' => 'MailTools',
'Net::LDAP' => 'perl-ldap',
# We provide Template 2.14 or lower for Win32, so it still includes
# the GD plugin.
'Template::Plugin::GD' => 'Template-Toolkit',
};
sub check_requirements { sub check_requirements {
my ($output) = @_; my ($output) = @_;
print "\nChecking perl modules...\n" if $output; print "\nChecking perl modules...\n" if $output;
my $modules = REQUIRED_MODULES;
my $root = ROOT_USER; my $root = ROOT_USER;
my %missing; my %missing = _check_missing(REQUIRED_MODULES, $output);
foreach my $module (@{$modules}) {
unless (have_vers($module->{name}, $module->{version}, $output)) {
$missing{$module->{name}} = $module->{version};
}
}
print "\nYou need one of the following DBD modules installed, depending",
" on\nwhich database you are using with Bugzilla:\n" if $output;
print "\nChecking available perl DBD modules...\n" if $output;
my $have_one_dbd = 0; my $have_one_dbd = 0;
my $db_modules = DB_MODULE; my $db_modules = DB_MODULE;
foreach my $db (keys %$db_modules) { foreach my $db (keys %$db_modules) {
if (have_vers($db_modules->{$db}->{dbd}, my %info = (module => $db_modules->{$db}->{dbd},
$db_modules->{$db}->{dbd_version}, $output)) version => $db_modules->{$db}->{dbd_version});
{ $have_one_dbd = 1 if have_vers(\%info, $output);
$have_one_dbd = 1;
}
} }
print "\nThe following Perl modules are optional:\n" if $output; print "\nThe following Perl modules are optional:\n" if $output;
my $opt_modules = OPTIONAL_MODULES; my %missing_optional = _check_missing(OPTIONAL_MODULES, $output);
my %have_mod;
foreach my $module (@$opt_modules) {
$have_mod{$module->{name}} =
have_vers($module->{name}, $module->{version}, $output);
}
print "\nThe following modules are required for mod_perl support:\n"
if $output;
my $mp_modules = MOD_PERL_MODULES;
foreach my $module (@$mp_modules) {
$have_mod{$module->{name}} =
have_vers($module->{name}, $module->{version}, $output);
}
# If we're running on Windows, reset the input line terminator so that # If we're running on Windows, reset the input line terminator so that
# console input works properly - loading CGI tends to mess it up # console input works properly - loading CGI tends to mess it up
$/ = "\015\012" if ON_WINDOWS; $/ = "\015\012" if ON_WINDOWS;
if ($output) { my $pass = !scalar(keys %missing) && $have_one_dbd;
print "\n"; return {
pass => $pass,
if ($^O =~ /MSWin32/i) { one_dbd => $have_one_dbd,
print "All the required modules are available at:\n", missing => \%missing,
" http://landfill.bugzilla.org/ppm/\n", optional => \%missing_optional,
"You can add the repository with the following command:\n", any_missing => !$pass || scalar(keys %missing_optional),
" ppm rep add bugzilla http://landfill.bugzilla.org/ppm/", };
"\n\n"; }
}
# New/Old Charts # A helper for check_requirements
if ((!$have_mod{'GD'} || !$have_mod{'Chart::Base'})) { sub _check_missing {
print "If you you want to see graphical bug charts (plotting", my ($modules, $output) = @_;
" historical data over \ntime), you should install libgd",
" and the following Perl modules (as $root):\n\n";
print " GD: " . install_command("GD") ."\n"
if !$have_mod{'GD'};
print " Chart: " . install_command("Chart::Base") . "\n"
if !$have_mod{'Chart::Base'};
print "\n";
}
# Bug Import/Export my %missing;
if (!$have_mod{'XML::Twig'}) { foreach my $module (@$modules) {
print "If you want to use the bug import/export feature to move", unless (have_vers($module, $output)) {
" bugs to or from\nother bugzilla installations, you will", $missing{$module->{package}} = $module;
" need to install the XML::Twig\nmodule by running",
" (as $root):\n\n",
" " . install_command("XML::Twig") . "\n\n";
} }
# Automatic Updates
if (!$have_mod{'LWP::UserAgent'}) {
print "If you want to use the automatic update notification",
" feature you will\nneed to install the LWP::UserAgent",
" module by running (as $root):\n\n",
" " . install_command("LWP::UserAgent") . "\n\n";
} }
# BMP to PNG return %missing;
if (!$have_mod{'Image::Magick'}) { }
print "If you want to convert BMP image attachments to PNG to",
" conserve\ndisk space, you will need to install the",
" ImageMagick application\nAvailable from",
" http://www.imagemagick.org, and the Image::Magick\n",
"Perl module by running (as $root):\n\n",
" " . install_command("Image::Magick") . "\n\n";
}
# Web Services sub print_module_instructions {
if (!$have_mod{'SOAP::Lite'}) { my ($check_results, $output) = @_;
print "If you want your Bugzilla installation to be accessible\n",
"via its Web Service interface, you will need to install\n",
"the SOAP::Lite module by running (as $root):\n\n";
print " SOAP::Lite: " .
install_command("SOAP::Lite") . "\n\n";
}
# Graphical Reports # We only print these notes if we have to.
if (!$have_mod{'GD'} || !$have_mod{'GD::Graph'} if ((!$output && %{$check_results->{missing}})
|| !$have_mod{'GD::Text::Align'} || ($output && $check_results->{any_missing}))
|| !$have_mod{'Template::Plugin::GD::Image'})
{ {
print "If you want to see graphical bug reports (bar, pie and", print "\n* NOTE: You must run any commands listed below as "
" line charts of \ncurrent data), you should install libgd", . ROOT_USER . ".\n\n";
" and the following Perl modules:\n\n";
print " GD: " . install_command("GD") . "\n"
if !$have_mod{'GD'};
print " GD::Graph: " . install_command("GD::Graph") . "\n"
if !$have_mod{'GD::Graph'};
print " GD::Text::Align: " . install_command("GD::Text::Align")
. "\n" if !$have_mod{'GD::Text::Align'};
print " Template::Plugin::GD: "
. install_command('Template::Plugin::GD') . "\n"
if !$have_mod{'Template::Plugin::GD::Image'};
print "\n";
}
# Diff View
if (!$have_mod{'PatchReader'}) {
print "If you want to see pretty HTML views of patches, you",
" should install the \nPatchReader module by running",
" (as $root):\n\n",
" " . install_command("PatchReader") . "\n\n";
}
# LDAP
if (!$have_mod{'Net::LDAP'}) {
print "If you wish to use LDAP authentication, then you must",
" install Net::LDAP\nby running (as $root):\n\n",
" " . install_command('Net::LDAP') . "\n\n";
}
# HTML filtering
if (!$have_mod{'HTML::Parser'} || !$have_mod{'HTML::Scrubber'}) {
print "If you want additional HTML tags within product and group",
" descriptions,\nyou should install:\n\n";
print " HTML::Scrubber: " . install_command('HTML::Scrubber') . "\n"
if !$have_mod{'HTML::Scrubber'};
print " HTML::Parser: " . install_command('HTML::Parser') . "\n"
if !$have_mod{'HTML::Parser'};
print "\n";
}
# mod_perl if (ON_WINDOWS) {
if (!$have_mod{'mod_perl2'}) { print <<EOT;
print "If you would like mod_perl support, you must install at", ***********************************************************************
" least the minimum\nrequired version of mod_perl. You", * Note For Windows Users *
" can download mod_perl from:\n", ***********************************************************************
" http://perl.apache.org/download/binaries.html\n", * All the modules listed below are available at: *
"Make sure that you get the 2.0 version, not the 1.0", * *
" version.\n\n"; * http://landfill.bugzilla.org/ppm/ *
* *
* You can add the repository with the following command: *
* *
* ppm rep add bugzilla http://landfill.bugzilla.org/ppm/ *
***********************************************************************
EOT
}
}
# Required Modules
if (my %missing = %{$check_results->{missing}}) {
print <<EOT;
***********************************************************************
* REQUIRED MODULES *
***********************************************************************
* Bugzilla requires you to install some Perl modules which are either *
* missing from your system, or the version on your system is too old. *
* *
* The latest versions of each module can be installed by running the *
* commands below. *
***********************************************************************
EOT
print "COMMANDS:\n\n";
foreach my $package (keys %missing) {
my $command = install_command($missing{$package});
print " $command\n";
} }
if (!$have_mod{'Apache::DBI'} || !$have_mod{'CGI'}) {
print "For mod_perl support, you must install the following",
" perl module(s):\n\n";
print " Apache::DBI: " . install_command('Apache::DBI') . "\n"
if !$have_mod{'Apache::DBI'};
print " CGI: " . install_command('CGI') . "\n"
if !$have_mod{'CGI'};
print "\n"; print "\n";
} }
}
if (!$have_one_dbd) { if (!$check_results->{one_dbd}) {
print "\n"; print <<EOT;
print "Bugzilla requires that at least one DBD module be", ***********************************************************************
" installed in order to\naccess a database. You can install", * DATABASE ACCESS *
" the correct one by running (as $root) the\ncommand listed", ***********************************************************************
" below for your database:\n\n"; * In order to access your database, Bugzilla requires that the *
* correct "DBD" module be installed for the database that you are *
foreach my $db (keys %$db_modules) { * running. *
print $db_modules->{$db}->{name} . ": " * *
. install_command($db_modules->{$db}->{dbd}) . "\n"; * Pick and run the correct command below for the database that you *
print " Minimum version required: " * plan to use with Bugzilla. *
. $db_modules->{$db}->{dbd_version} . "\n"; ***********************************************************************
COMMANDS:
EOT
my %db_modules = %{DB_MODULE()};
foreach my $db (keys %db_modules) {
my $command = install_command(
{ module => $db_modules{$db}->{dbd},
package => $db_modules{$db}->{dbd} });
printf "%10s: \%s\n", $db_modules{$db}->{name}, $command;
print ' ' x 12 . "Minimum version required: "
. $db_modules{$db}->{dbd_version} . "\n";
} }
print "\n"; print "\n";
} }
if (%missing) { return unless $output;
print "\n";
print "Bugzilla requires some Perl modules which are either", if (my %missing = %{$check_results->{optional}}) {
" missing from your\nsystem, or the version on your system", print <<EOT;
" is too old. They can be installed\nby running (as $root)", **********************************************************************
" the following:\n"; * OPTIONAL MODULES *
**********************************************************************
foreach my $module (keys %missing) { * Certain Perl modules are not required by Bugzilla, but by *
print " " . install_command("$module") . "\n"; * installing the latest version you gain access to additional *
if ($missing{$module} > 0) { * features. *
print " Minimum version required: $missing{$module}\n"; * *
* The optional modules you do not have installed are listed below, *
* with the name of the feature they enable. If you want to install *
* one of these modules, just run the appropriate command in the *
* "COMMANDS TO INSTALL" section. *
**********************************************************************
EOT
# We want to sort them so that they are ordered by feature.
my @missing_names = sort {$missing{$a}->{feature}
cmp $missing{$b}->{feature}} (keys %missing);
# Now we have to determine how large the table cols will be.
my $longest_name = max(map(length($_), @missing_names));
# The first column header is at least 11 characters long.
$longest_name = 11 if $longest_name < 11;
# The table is 71 characters long. There are seven mandatory
# characters (* and space) in the string. So, we have a total
# of 64 characters to work with.
my $remaining_space = 64 - $longest_name;
print '*' x 71 . "\n";
printf "* \%${longest_name}s * %-${remaining_space}s *\n",
'MODULE NAME', 'ENABLES FEATURE(S)';
print '*' x 71 . "\n";
foreach my $name (@missing_names) {
printf "* \%${longest_name}s * %-${remaining_space}s *\n",
$name, $missing{$name}->{feature};
}
print '*' x 71 . "\n";
print "COMMANDS TO INSTALL:\n\n";
foreach my $module (@missing_names) {
my $command = install_command($missing{$module});
printf "%15s: $command\n", $module;
} }
} }
print "\n";
}
return {
pass => !scalar(keys %missing) && $have_one_dbd,
missing => \%missing,
optional => \%have_mod,
}
} }
sub check_graphviz { sub check_graphviz {
...@@ -437,28 +419,29 @@ sub display_version_and_os { ...@@ -437,28 +419,29 @@ sub display_version_and_os {
# This was originally clipped from the libnet Makefile.PL, adapted here to # This was originally clipped from the libnet Makefile.PL, adapted here to
# use the below vers_cmp routine for accurate version checking. # use the below vers_cmp routine for accurate version checking.
sub have_vers { sub have_vers {
my ($pkg, $wanted, $output) = @_; my ($params, $output) = @_;
my $module = $params->{module};
my $package = $params->{package};
if (!$package) {
$package = $module;
$package =~ s/::/-/g;
}
my $wanted = $params->{version};
my ($msg, $vnum, $vstr); my ($msg, $vnum, $vstr);
no strict 'refs'; no strict 'refs';
printf("Checking for %15s %-9s ", $pkg, !$wanted?'(any)':"(v$wanted)") printf("Checking for %15s %-9s ", $package, !$wanted?'(any)':"(v$wanted)")
if $output; if $output;
# Modules may change $SIG{__DIE__} and $SIG{__WARN__}, so localise them here eval "require $module;";
# so that later errors display 'normally'
local $::SIG{__DIE__};
local $::SIG{__WARN__};
eval "require $pkg;"; # VERSION is provided by UNIVERSAL::
$vnum = eval { $module->VERSION } || -1;
# do this twice to avoid a "used only once" error for these vars
$vnum = ${"${pkg}::VERSION"} || ${"${pkg}::Version"} || 0;
$vnum = ${"${pkg}::VERSION"} || ${"${pkg}::Version"} || 0;
$vnum = -1 if $@;
# CGI's versioning scheme went 2.75, 2.751, 2.752, 2.753, 2.76 # CGI's versioning scheme went 2.75, 2.751, 2.752, 2.753, 2.76
# That breaks the standard version tests, so we need to manually correct # That breaks the standard version tests, so we need to manually correct
# the version # the version
if ($pkg eq 'CGI' && $vnum =~ /(2\.7\d)(\d+)/) { if ($module eq 'CGI' && $vnum =~ /(2\.7\d)(\d+)/) {
$vnum = $1 . "." . $2; $vnum = $1 . "." . $2;
} }
...@@ -522,14 +505,19 @@ sub vers_cmp { ...@@ -522,14 +505,19 @@ sub vers_cmp {
sub install_command { sub install_command {
my $module = shift; my $module = shift;
my ($command, $package);
if (ON_WINDOWS) { if (ON_WINDOWS) {
return "ppm install " . WIN32_MODULE_NAMES->{$module} if $command = 'ppm install %s';
WIN32_MODULE_NAMES->{$module}; $package = $module->{package};
$module =~ s/::/-/g; }
return "ppm install " . $module; else {
} else { $command = "$^X -MCPAN -e 'install \%s'";
return "$^X -MCPAN -e 'install \"$module\"'"; # Non-Windows installations need to use module names, because
# CPAN doesn't understand package names.
$package = $module->{module};
} }
return sprintf $command, $package;
} }
...@@ -607,17 +595,15 @@ Returns: C<1> if the check was successful, C<0> otherwise. ...@@ -607,17 +595,15 @@ Returns: C<1> if the check was successful, C<0> otherwise.
Returns: -1 if $a is less than $b, 0 if they are equal, and Returns: -1 if $a is less than $b, 0 if they are equal, and
1 if $a is greater than $b. 1 if $a is greater than $b.
=item C<have_vers($pkg, $wanted, $output)> =item C<have_vers($module, $output)>
Description: Tells you whether or not you have the appropriate Description: Tells you whether or not you have the appropriate
version of the module requested. It also prints version of the module requested. It also prints
out a message to the user explaining the check out a message to the user explaining the check
and the result. and the result.
Params: C<$pkg> - A string, the name of the package you're checking. Params: C<$module> - A hashref, in the format of an item from
C<$wanted> - The version of the package you require. L</REQUIRED_MODULES>.
Set this to 0 if you don't require any
particular version.
C<$output> - Set to true if you want this function to C<$output> - Set to true if you want this function to
print information to STDOUT about what it's print information to STDOUT about what it's
doing. doing.
...@@ -631,7 +617,8 @@ Returns: C<1> if the check was successful, C<0> otherwise. ...@@ -631,7 +617,8 @@ Returns: C<1> if the check was successful, C<0> otherwise.
module specified, depending on whether you're module specified, depending on whether you're
on Windows or Linux. on Windows or Linux.
Params: C<$module> - The name of the module. Params: C<$module> - A hashref, in the format of an item from
L</REQUIRED_MODULES>.
Returns: nothing Returns: nothing
......
checksetup.pl
View file @ 124ab7cd
...@@ -96,6 +96,8 @@ my $silent = scalar(keys %answer) && !$switch{'verbose'}; ...@@ -96,6 +96,8 @@ my $silent = scalar(keys %answer) && !$switch{'verbose'};
display_version_and_os() unless $silent; display_version_and_os() unless $silent;
# Check required --MODULES-- # Check required --MODULES--
my $module_results = check_requirements(!$silent); my $module_results = check_requirements(!$silent);
Bugzilla::Install::Requirements::print_module_instructions(
$module_results, !$silent);
exit if !$module_results->{pass}; exit if !$module_results->{pass};
# Break out if checking the modules is all we have been asked to do. # Break out if checking the modules is all we have been asked to do.
exit if $switch{'check-modules'}; exit if $switch{'check-modules'};
......
docs/makedocs.pl
View file @ 124ab7cd
...@@ -48,7 +48,7 @@ if (eval { require Pod::Simple }) { ...@@ -48,7 +48,7 @@ if (eval { require Pod::Simple }) {
}; };
use Bugzilla::Install::Requirements use Bugzilla::Install::Requirements
qw(REQUIRED_MODULES OPTIONAL_MODULES MOD_PERL_MODULES); qw(REQUIRED_MODULES OPTIONAL_MODULES);
use Bugzilla::Constants qw(DB_MODULE BUGZILLA_VERSION); use Bugzilla::Constants qw(DB_MODULE BUGZILLA_VERSION);
############################################################################### ###############################################################################
...@@ -57,14 +57,13 @@ use Bugzilla::Constants qw(DB_MODULE BUGZILLA_VERSION); ...@@ -57,14 +57,13 @@ use Bugzilla::Constants qw(DB_MODULE BUGZILLA_VERSION);
my $modules = REQUIRED_MODULES; my $modules = REQUIRED_MODULES;
my $opt_modules = OPTIONAL_MODULES; my $opt_modules = OPTIONAL_MODULES;
my $mod_perl_modules = MOD_PERL_MODULES;
open(ENTITIES, '>', 'xml/bugzilla.ent') or die('Could not open xml/bugzilla.ent: ' . $!); open(ENTITIES, '>', 'xml/bugzilla.ent') or die('Could not open xml/bugzilla.ent: ' . $!);
print ENTITIES '<?xml version="1.0"?>' ."\n\n"; print ENTITIES '<?xml version="1.0"?>' ."\n\n";
print ENTITIES '<!-- Module Versions -->' . "\n"; print ENTITIES '<!-- Module Versions -->' . "\n";
foreach my $module (@$modules, @$opt_modules) foreach my $module (@$modules, @$opt_modules)
{ {
my $name = $module->{'name'}; my $name = $module->{'module'};
$name =~ s/::/-/g; $name =~ s/::/-/g;
$name = lc($name); $name = lc($name);
#This needs to be a string comparison, due to the modules having #This needs to be a string comparison, due to the modules having
...@@ -73,17 +72,10 @@ foreach my $module (@$modules, @$opt_modules) ...@@ -73,17 +72,10 @@ foreach my $module (@$modules, @$opt_modules)
print ENTITIES '<!ENTITY min-' . $name . '-ver "'.$version.'">' . "\n"; print ENTITIES '<!ENTITY min-' . $name . '-ver "'.$version.'">' . "\n";
} }
print ENTITIES "\n <!-- mod_perl Versions --> \n"; # CGI is a special case, because it has an optional version *and* a required
foreach my $module (@$mod_perl_modules) # version.
{ my ($cgi_opt) = grep($_->{package} eq 'CGI', @$opt_modules);
my $name = $module->{'name'}; print ENTITIES '<!ENTITY min-mp-cgi-ver "' . $cgi_opt->{version} . '">' . "\n";
$name =~ s/::/-/g;
$name = lc($name);
#This needs to be a string comparison, due to the modules having
#version numbers like 0.9.4
my $version = $module->{'version'} eq 0 ? 'any' : $module->{'version'};
print ENTITIES '<!ENTITY min-mp-' . $name . '-ver "'.$version.'">' . "\n";
}
print ENTITIES "\n <!-- Database Versions --> \n"; print ENTITIES "\n <!-- Database Versions --> \n";
......
docs/xml/installation.xml
View file @ 124ab7cd
<!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> --> <!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> -->
<!-- $Id: installation.xml,v 1.130 2006/10/08 18:41:45 mozilla%colinogilvie.co.uk Exp $ --> <!-- $Id: installation.xml,v 1.131 2006/10/17 05:58:41 mkanat%bugzilla.org Exp $ -->
<chapter id="installing-bugzilla"> <chapter id="installing-bugzilla">
<title>Installing Bugzilla</title> <title>Installing Bugzilla</title>
...@@ -373,8 +373,8 @@ ...@@ -373,8 +373,8 @@
<listitem> <listitem>
<para> <para>
<link linkend="install-modules-gd-text-align">GD::Text::Align</link> <link linkend="install-modules-gd-text">GD::Text</link>
(&min-gd-text-align-ver;) for bug charting (&min-gd-text-ver;) for bug charting
</para> </para>
</listitem> </listitem>
...@@ -477,10 +477,10 @@ ...@@ -477,10 +477,10 @@
</para> </para>
</section> </section>
<section id="install-modules-gd-text-align"> <section id="install-modules-gd-text">
<title>GD::Text::Align (&min-gd-text-align-ver;)</title> <title>GD::Text (&min-gd-text-ver;)</title>
<para>The GD::Text::Align module is only required if you want graphical <para>The GD::Text module is only required if you want graphical
reports. reports.
</para> </para>
</section> </section>
...@@ -575,14 +575,14 @@ ...@@ -575,14 +575,14 @@
<para>Bugzilla requires <literal>mod_perl</literal> to be installed, which can be <para>Bugzilla requires <literal>mod_perl</literal> to be installed, which can be
obtained from <ulink url="http://perl.apache.org"/> - Bugzilla requires obtained from <ulink url="http://perl.apache.org"/> - Bugzilla requires
version &min-mp-mod_perl2-ver; (AKA 2.0.0-RC5) to be installed.</para> version &min-mod_perl2-ver; (AKA 2.0.0-RC5) to be installed.</para>
<para>Bugzilla also requires a more up-to-date version of the CGI <para>Bugzilla also requires a more up-to-date version of the CGI
perl module to be installed, version &min-mp-cgi-ver; as opposed to &min-cgi-ver; perl module to be installed, version &min-mp-cgi-ver; as opposed to &min-cgi-ver;
</para> </para>
<para>Finally, Bugzilla also requires <literal>Apache::DBI</literal> <para>Finally, Bugzilla also requires <literal>Apache::DBI</literal>
(&min-mp-apache-dbi-ver;) to be installed as well.</para> (&min-apache-dbi-ver;) to be installed as well.</para>
</section> </section>
</section> </section>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment