Merge commit 'v7.10.20' into WebGUI8
This commit is contained in:
commit
fdb979ca8a
72 changed files with 830 additions and 224 deletions
|
|
@ -56,6 +56,15 @@ pod2usage("$0: Must specify a configFile")
|
|||
die "Config file '$configFile' does not exist!\n"
|
||||
if !-f WebGUI::Paths->configBase . '/' . $configFile;
|
||||
|
||||
foreach my $libDir ( readLines( "preload.custom" ) ) {
|
||||
if ( !-d $libDir ) {
|
||||
warn "WARNING: Not adding lib directory '$libDir' from preload.custom: Directory does not exist.\n";
|
||||
next;
|
||||
}
|
||||
unshift @INC, $libDir;
|
||||
}
|
||||
|
||||
|
||||
# Open the session
|
||||
my $session = WebGUI::Session->open( $configFile );
|
||||
$session->user( { userId => 3 } );
|
||||
|
|
@ -96,6 +105,24 @@ else {
|
|||
$session->var->end;
|
||||
$session->close;
|
||||
|
||||
#-------------------------------------------------
|
||||
sub readLines {
|
||||
my $file = shift;
|
||||
my @lines;
|
||||
if (open(my $fh, '<', $file)) {
|
||||
while (my $line = <$fh>) {
|
||||
$line =~ s/#.*//;
|
||||
$line =~ s/^\s+//;
|
||||
$line =~ s/\s+$//;
|
||||
next if !$line;
|
||||
push @lines, $line;
|
||||
}
|
||||
close $fh;
|
||||
}
|
||||
return @lines;
|
||||
}
|
||||
|
||||
|
||||
__END__
|
||||
|
||||
=head1 NAME
|
||||
|
|
|
|||
|
|
@ -177,6 +177,7 @@ checkModule('App::Cmd', '0.311' );
|
|||
checkModule('Devel::StackTrace', '1.27' );
|
||||
checkModule('Devel::StackTrace::WithLexicals', '0.03' );
|
||||
checkModule('Data::ICal', '0.16' );
|
||||
checkModule('common::sense', '3.2' );
|
||||
checkModule('Geo::Coder::Googlev3', '0.07' );
|
||||
checkModule('IO::File::WithPath', );
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue