diff options
| -rw-r--r-- | Bugzilla/Install/Requirements.pm | 11 | ||||
| -rwxr-xr-x | checksetup.pl | 6 | ||||
| -rw-r--r-- | docs/xml/modules.xml | 10 | ||||
| -rwxr-xr-x | testserver.pl | 8 |
4 files changed, 33 insertions, 2 deletions
diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm index bf2398a3f..f38af2a09 100644 --- a/Bugzilla/Install/Requirements.pm +++ b/Bugzilla/Install/Requirements.pm @@ -98,6 +98,12 @@ use constant OPTIONAL_MODULES => [ version => '1.20' }, { + # 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. + name => 'Template::Plugin::GD::Image', + version => 0 + }, + { name => 'Chart::Base', version => '1.0' }, @@ -162,10 +168,13 @@ use constant WIN32_MODULE_NAMES => { 'GD::Graph' => 'GDGraph', 'GD::Text::Align' => 'GDTextUtil', 'Mail::Mailer' => 'MailTools', + # We provide Template 2.14 or lower for Win32, so it still includes + # the GD plugin. + 'Template::Plugin::GD' => 'Template', }; # This was originally clipped from the libnet Makefile.PL, adapted here to -# use the above vers_cmp routine for accurate version checking. +# use the below vers_cmp routine for accurate version checking. sub have_vers { my ($pkg, $wanted, $silent) = @_; my ($msg, $vnum, $vstr); diff --git a/checksetup.pl b/checksetup.pl index 1de84e56d..bb6e46245 100755 --- a/checksetup.pl +++ b/checksetup.pl @@ -296,7 +296,9 @@ if (!$have_mod{'Image::Magick'} && !$silent) { } if ( (!$have_mod{'GD'} || !$have_mod{'GD::Graph'} - || !$have_mod{'GD::Text::Align'}) && !$silent) + || !$have_mod{'GD::Text::Align'} + || !$have_mod{'Template::Plugin::GD::Image'}) + && !$silent) { print "If you want to see graphical bug reports (bar, pie and line "; print "charts of \ncurrent data), you should install libgd and the "; @@ -306,6 +308,8 @@ if ( (!$have_mod{'GD'} || !$have_mod{'GD::Graph'} 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"; } if (!$have_mod{'PatchReader'} && !$silent) { diff --git a/docs/xml/modules.xml b/docs/xml/modules.xml index 151358cbd..8e2df5999 100644 --- a/docs/xml/modules.xml +++ b/docs/xml/modules.xml @@ -149,6 +149,16 @@ </para> <para> + Template::Plugin::GD: + <literallayout> + CPAN Download Page: <ulink url="http://search.cpan.org/dist/Template-GD/" /> + PPM Download Link: (Just install Template-Toolkit using the instructions below) + + Documentation: <ulink url="http://www.template-toolkit.org/docs/aqua/Modules/index.html" /> + </literallayout> + </para> + + <para> MIME::Base64: <literallayout> CPAN Download Page: <ulink url="http://search.cpan.org/dist/MIME-Base64/"/> diff --git a/testserver.pl b/testserver.pl index 766a2c410..bf818cd0f 100755 --- a/testserver.pl +++ b/testserver.pl @@ -203,6 +203,14 @@ if ($@ eq '') { print "TEST-FAILED Chart returned: $@\n"; } } + + eval 'use Template::Plugin::GD::Image'; + if ($@) { + print "TEST-FAILED Template::Plugin::GD is not installed.\n"; + } + else { + print "TEST-OK Template::Plugin::GD is installed.\n"; + } } sub fetch { |