Bump version number and update Changes

[gruntmaster-daemon.git] / lib / Gruntmaster / Daemon / Format.pm

diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm
index 86c194ab3866b8876601acd5c41dd04dc78fb578..c49ffc1ea1b1b7336efa8ad04b76691c40531def 100644 (file)
--- a/lib/Gruntmaster/Daemon/Format.pm
+++ b/lib/Gruntmaster/Daemon/Format.pm
@@ -8,12 +8,14 @@ no if $] > 5.017011, warnings => 'experimental::smartmatch';
 
 use POSIX qw//;
 use File::Basename qw/fileparse/;
 
 use POSIX qw//;
 use File::Basename qw/fileparse/;

+use File::Slurp qw/write_file/;

 use Gruntmaster::Daemon::Constants qw/TLE OLE DIED NZX/;
 use Time::HiRes qw/alarm/;
 use List::MoreUtils qw/natatime/;
 use Gruntmaster::Daemon::Constants qw/TLE OLE DIED NZX/;
 use Time::HiRes qw/alarm/;
 use List::MoreUtils qw/natatime/;

+use Log::Log4perl qw/get_logger/;

 use IPC::Signal qw/sig_name sig_num/;
 
 use IPC::Signal qw/sig_name sig_num/;
 

-our $VERSION = "5999-TRIAL";
+our $VERSION = "5999.000_002";

 our @EXPORT_OK = qw/prepare_files/;
 
 ##################################################
 our @EXPORT_OK = qw/prepare_files/;
 
 ##################################################


@@ -24,9 +26,9 @@ sub command_and_args{
        given($format) {
                "./$basename" when [qw/C CPP PASCAL/];
                "./$basename.exe" when 'MONO';
        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" }
        }
 }
                default { die "Don't know how to execute format $format" }
        }
 }


@@ -70,12 +72,10 @@ sub mkrun{
 
 sub prepare{
        my ($name, $format) = @_;
 
 sub prepare{
        my ($name, $format) = @_;

-       our $errors;
-       my $basename = fileparse $name, qr/\.[^.]*/;

        get_logger->trace("Preparing file $name...");
 
        get_logger->trace("Preparing file $name...");
 

-       $errors .= `gruntmaster-compile $format $basename $name 2>&1`;
-       $errors .= "\n";
+       $Gruntmaster::Daemon::errors .= `gruntmaster-compile $format $name 2>&1`;
+       $Gruntmaster::Daemon::errors .= "\n";

        die 'Compile error' if $?
 }
 
        die 'Compile error' if $?
 }