From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 30 Jan 2015 11:26:57 +0000 (+0200)
Subject: Always compile to $basename
X-Git-Tag: 5999.000_005~71
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=c2af0332feff46fa63709349c52dd699e1a46890;p=gruntmaster-daemon.git

Always compile to $basename
---

diff --git a/gruntmaster-compile b/gruntmaster-compile
index 1641d35..4033651 100755
--- a/gruntmaster-compile
+++ b/gruntmaster-compile
@@ -18,15 +18,32 @@ if ($ret) {
 	given ($format){
 		exec 'gcc', qw/-DONLINE_JUDGE -std=gnu11 -Wall -Wextra -O2 -o/, $basename, $name when 'C';
 		exec 'g++', qw/-DONLINE_JUDGE -std=gnu++11 -fabi-version=6 -Wall -Wextra -O2 -o/, $basename, $name when 'CPP';
+		when ('MONO') {
+			system 'gmcs', '-d:ONLINE_JUDGE', $name and die "gmcs failed: errno=$! return=$?";
+			rename "$basename.exe", $basename;
+			chmod 0755, $basename;
+		}
 		exec 'gmcs', '-d:ONLINE_JUDGE', $name when  'MONO';
-		exec 'javac', $name when 'JAVA';
+		when ('JAVA') {
+			system 'javac', $name and die "javac failed: errno=$! return=$?";
+			system 'jar', 'cfe', $basename, $basename, "$basename.class" and die "jar failed: errno=$! return=$?";
+			chmod 0755, $basename;
+			exit
+		}
 		exec 'fpc', qw/-dONLINE_JUDGE -O2/, $name when 'PASCAL';
 		exec 'go', qw/build -compiler gc/, $name when 'GOLANG';
 		exec 'go', qw/build -compiler gccgo/, $name, when 'GCCGO';
 		exec 'ghc', qw/-DONLINE_JUDGE -Wall -O2 -o/, $basename, $name when 'HASKELL';
 
 		when ([qw/PERL PYTHON/]){
-			copy $name, $basename;
+			open IN, '<', $name;
+			open OUT, '>', $basename;
+			print OUT "#!/usr/bin/perl\n"   if $_ eq 'PERL';
+			print OUT "#!/usr/bin/python\n" if $_ eq 'PYTHON';
+			print OUT while <IN>;
+			close OUT;
+			close IN;
+			chmod 0755, $basename;
 			exit
 		}
 	}
diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm
index 529931f..cfc3cf3 100644
--- a/lib/Gruntmaster/Daemon/Format.pm
+++ b/lib/Gruntmaster/Daemon/Format.pm
@@ -65,19 +65,6 @@ sub execlist {
 	die [$excode, $exmsg] if $excode > 0; ## no critic (RequireCarping)
 }
 
-sub command_and_args{
-	my ($format, $basename) = @_;
-
-	given($format) {
-		"./$basename" when [qw/C CPP GCCGO GOLANG HASKELL PASCAL/];
-		"./$basename.exe" when 'MONO';
-		java => $basename when 'JAVA';
-		perl => $basename when 'PERL';
-		python => $basename when 'PYTHON';
-		default { die "Don't know how to execute format $format\n" }
-	}
-}
-
 sub mkrun{
 	my $format = shift;
 	sub{
@@ -94,7 +81,7 @@ sub mkrun{
 		while (my ($fd, $file) = $it->()) {
 			push @args, "--fd=$fd $file";
 		}
-		execlist $basename, @args, command_and_args($format, $basename);
+		execlist $basename, @args, "./$basename"
 	}
 }