--- nfo/perl/libs/Data/Rap/Engine.pm 2003/03/27 15:03:03 1.5 +++ nfo/perl/libs/Data/Rap/Engine.pm 2003/03/28 07:02:56 1.7 @@ -1,7 +1,13 @@ ## ---------------------------------------------------------------------- -## $Id: Engine.pm,v 1.5 2003/03/27 15:03:03 joko Exp $ +## $Id: Engine.pm,v 1.7 2003/03/28 07:02:56 joko Exp $ ## ---------------------------------------------------------------------- ## $Log: Engine.pm,v $ +## Revision 1.7 2003/03/28 07:02:56 joko +## modified structure around '$wrapper_program' +## +## Revision 1.6 2003/03/27 15:31:05 joko +## fixes to modules regarding new namespace(s) below Data::Mungle::* +## ## Revision 1.5 2003/03/27 15:03:03 joko ## enhanced 'sub run_executable' ## @@ -34,8 +40,8 @@ use Iterate; use shortcuts qw( run_cmd ); -use Data::Code::Ref qw( ref_slot ); -use Data::Transform::Deep qw( expand ); +use Data::Mungle::Code::Ref qw( ref_slot ); +use Data::Mungle::Transform::Deep qw( expand ); sub performTarget { @@ -300,20 +306,12 @@ delete $opts->{executable}; # determine execution method - my $method = 'run_cmd'; my $wrapper_program = ''; # check if program is a namespace-string (contains '::') - use 'do' in this case! if ($program =~ /::/) { - #if ($program =~ s/::/\\/g) { - #$program = '.\\' . $program; - #$method = 'require'; - #do "$program"; - #return; - #$method = 'rap.'; - - $wrapper_program = 'rap.pl'; - + #$wrapper_program = 'rap.pl'; + $wrapper_program = $0; } # prepare arguments @@ -337,7 +335,7 @@ } # build {program} & {arguments} - my $cmd = join(' ', $wrapper_program, $program) . ' ' . join(' ', @buf); + my $cmd = ($wrapper_program ? $wrapper_program . ' ' : '') . $program . ' ' . join(' ', @buf); # trace #print "command: $cmd", "\n"; @@ -351,13 +349,13 @@ #print Dumper(%ENV); - print "command: '$cmd'", "\n"; + #print "command: '$cmd'", "\n"; # V1 - basic #run_cmd($cmd); # V1.b - enhanced: variable local method - my $evalstr = "$method('$cmd');"; + my $evalstr = "run_cmd('$cmd', 'Some task...', { async => 1 });"; eval($evalstr); #my $res = do "$cmd"; #print $res, "\n" if $res; @@ -367,7 +365,7 @@ # V2: via IPC::Run # .... (TODO) - + }