X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FFormat.pm;h=c49ffc1ea1b1b7336efa8ad04b76691c40531def;hp=99fe5144c433f6f09ab652e5420f5ff2a355be3f;hb=d6a1ae0d77398b2a7ed967e10e8420ac7d9980e5;hpb=496fffaa1f2582bd36d8426a0dcf22d94c5fd849 diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm index 99fe514..c49ffc1 100644 --- a/lib/Gruntmaster/Daemon/Format.pm +++ b/lib/Gruntmaster/Daemon/Format.pm @@ -15,7 +15,7 @@ use List::MoreUtils qw/natatime/; use Log::Log4perl qw/get_logger/; use IPC::Signal qw/sig_name sig_num/; -our $VERSION = "5999.000_001"; +our $VERSION = "5999.000_002"; our @EXPORT_OK = qw/prepare_files/; ################################################## @@ -26,9 +26,9 @@ sub command_and_args{ given($format) { "./$basename" when [qw/C CPP PASCAL/]; "./$basename.exe" when 'MONO'; - "java $basename" when 'JAVA'; - "perl $basename" when 'PERL'; - "python $basename" when 'PYTHON'; + java => $basename when 'JAVA'; + perl => $basename when 'PERL'; + python => $basename when 'PYTHON'; default { die "Don't know how to execute format $format" } } } @@ -72,11 +72,10 @@ sub mkrun{ sub prepare{ my ($name, $format) = @_; - our $errors; get_logger->trace("Preparing file $name..."); - $errors .= `gruntmaster-compile $format $name 2>&1`; - $errors .= "\n"; + $Gruntmaster::Daemon::errors .= `gruntmaster-compile $format $name 2>&1`; + $Gruntmaster::Daemon::errors .= "\n"; die 'Compile error' if $? }