diff options
| -rw-r--r-- | Bugzilla/Install/CPAN.pm | 23 | ||||
| -rw-r--r-- | Bugzilla/Install/Util.pm | 8 | ||||
| -rw-r--r-- | template/en/default/setup/strings.txt.pl | 7 |
3 files changed, 37 insertions, 1 deletions
diff --git a/Bugzilla/Install/CPAN.pm b/Bugzilla/Install/CPAN.pm index 20cdb5bbd..48dcf6fc0 100644 --- a/Bugzilla/Install/CPAN.pm +++ b/Bugzilla/Install/CPAN.pm @@ -33,6 +33,7 @@ use Bugzilla::Constants; use Bugzilla::Install::Requirements qw(have_vers); use Bugzilla::Install::Util qw(bin_loc install_string); +use Config; use CPAN; use Cwd qw(abs_path); use File::Path qw(rmtree); @@ -102,6 +103,8 @@ use constant CPAN_DEFAULTS => { sub check_cpan_requirements { my ($original_dir, $original_args) = @_; + _require_compiler(); + my @install; foreach my $module (REQUIREMENTS) { my $installed = have_vers($module, 1); @@ -122,6 +125,26 @@ sub check_cpan_requirements { } } +sub _require_compiler { + my @errors; + + my $cc_name = $Config{cc}; + my $cc_exists = bin_loc($cc_name); + + if (!$cc_exists) { + push(@errors, install_string('install_no_compiler')); + } + + my $make_name = $CPAN::Config->{make}; + my $make_exists = bin_loc($make_name); + + if (!$make_exists) { + push(@errors, install_string('install_no_make')); + } + + die @errors if @errors; +} + sub install_module { my ($name, $test) = @_; my $bzlib = BZ_LIB; diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm index a2371a0be..bd8942507 100644 --- a/Bugzilla/Install/Util.pm +++ b/Bugzilla/Install/Util.pm @@ -58,8 +58,14 @@ our @EXPORT_OK = qw( sub bin_loc { my ($bin, $path) = @_; + + # If the binary is a full path... + if ($bin =~ m{[/\\]}) { + return MM->maybe_command($bin) || ''; + } + + # Otherwise we look for it in the path in a cross-platform way. my @path = $path ? @$path : File::Spec->path; - foreach my $dir (@path) { next if !-d $dir; my $full_path = File::Spec->catfile($dir, $bin); diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl index 2284c87ef..0bf3bdd7c 100644 --- a/template/en/default/setup/strings.txt.pl +++ b/template/en/default/setup/strings.txt.pl @@ -131,6 +131,13 @@ then the value of the ##column## column that needs to be fixed: EOT install_module => 'Installing ##module## version ##version##...', installation_failed => '*** Installation aborted. Read the messages above. ***', + install_no_compiler => <<END, +ERROR: Using install-module.pl requires that you install a compiler, such as +gcc. +END + install_no_make => <<END, +ERROR: Using install-module.pl requires that you install "make". +END lc_new_vars => <<'END', This version of Bugzilla contains some variables that you may want to change and adapt to your local settings. Please edit the file |