projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patch-1' of https://github.com/gjones2/Freeside
[freeside.git]
/
rt
/
sbin
/
rt-test-dependencies.in
diff --git
a/rt/sbin/rt-test-dependencies.in
b/rt/sbin/rt-test-dependencies.in
index
37ef32f
..
5ce918b
100644
(file)
--- a/
rt/sbin/rt-test-dependencies.in
+++ b/
rt/sbin/rt-test-dependencies.in
@@
-56,9
+56,10
@@
no warnings qw(numeric redefine);
use Getopt::Long;
my %args;
my %deps;
use Getopt::Long;
my %args;
my %deps;
+my @orig_argv = @ARGV;
GetOptions(
\%args, 'v|verbose',
GetOptions(
\%args, 'v|verbose',
- 'install
',
'with-MYSQL',
+ 'install
!',
'with-MYSQL',
'with-POSTGRESQL|with-pg|with-pgsql', 'with-SQLITE',
'with-ORACLE', 'with-FASTCGI',
'with-MODPERL1', 'with-MODPERL2',
'with-POSTGRESQL|with-pg|with-pgsql', 'with-SQLITE',
'with-ORACLE', 'with-FASTCGI',
'with-MODPERL1', 'with-MODPERL2',
@@
-74,6
+75,7
@@
GetOptions(
'with-DASHBOARDS',
'with-USERLOGO',
'with-SSL-MAILGATE',
'with-DASHBOARDS',
'with-USERLOGO',
'with-SSL-MAILGATE',
+ 'with-HTML-DOC',
'download=s',
'repository=s',
'download=s',
'repository=s',
@@
-103,6
+105,7
@@
my %default = (
'with-DASHBOARDS' => 1,
'with-USERLOGO' => 1,
'with-SSL-MAILGATE' => @RT_SSL_MAILGATE@,
'with-DASHBOARDS' => 1,
'with-USERLOGO' => 1,
'with-SSL-MAILGATE' => @RT_SSL_MAILGATE@,
+ 'with-HTML-DOC' => @RT_DEVEL_MODE@,
);
$args{$_} = $default{$_} foreach grep !exists $args{$_}, keys %default;
);
$args{$_} = $default{$_} foreach grep !exists $args{$_}, keys %default;
@@
-293,7
+296,7
@@
Test::LongString
.
$deps{'FASTCGI'} = [ text_to_hash( << '.') ];
.
$deps{'FASTCGI'} = [ text_to_hash( << '.') ];
-FCGI
+FCGI
0.74
FCGI::ProcManager
.
FCGI::ProcManager
.
@@
-344,7
+347,7
@@
URI 1.59
$deps{'GRAPHVIZ'} = [ text_to_hash( << '.') ];
GraphViz
$deps{'GRAPHVIZ'} = [ text_to_hash( << '.') ];
GraphViz
-IPC::Run
+IPC::Run
0.90
.
$deps{'GD'} = [ text_to_hash( << '.') ];
.
$deps{'GD'} = [ text_to_hash( << '.') ];
@@
-357,8
+360,14
@@
$deps{'USERLOGO'} = [ text_to_hash( << '.') ];
Convert::Color
.
Convert::Color
.
+$deps{'HTML-DOC'} = [ text_to_hash( <<'.') ];
+Pod::Simple 3.17
+HTML::Entities
+.
+
my %AVOID = (
'DBD::Oracle' => [qw(1.23)],
my %AVOID = (
'DBD::Oracle' => [qw(1.23)],
+ 'Email::Address' => [qw(1.893 1.894)],
);
if ($args{'download'}) {
);
if ($args{'download'}) {
@@
-403,7
+412,12
@@
foreach my $type (sort grep $args{$_}, keys %args) {
$Missing_By_Type{$type} = \%missing if keys %missing;
}
$Missing_By_Type{$type} = \%missing if keys %missing;
}
-conclude(%Missing_By_Type);
+if ( $args{'install'} && keys %Missing_By_Type ) {
+ exec($0, @orig_argv, '--no-install');
+}
+else {
+ conclude(%Missing_By_Type);
+}
sub test_deps {
my @deps = @_;
sub test_deps {
my @deps = @_;