Description:
quick fix for ruby right now, ruby will do just minimal checking... consider using rubinius for running ruby
Commit status:
[Not Reviewed]
References:
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment

r155:f8b072255536 - - 1 file changed: 4 inserted, 3 deleted

@@ -18,25 +18,25
18 18 if ENV['GRADER_LOGGING']!=nil
19 19 log_fname = ENV['GRADER_LOGGING']
20 20 fp = File.open(log_fname,"a")
21 21 fp.puts("run: #{Time.new.strftime("%H:%M")} #{str}")
22 22 fp.close
23 23 end
24 24 end
25 25
26 26 C_COMPILER = "/usr/bin/gcc"
27 27 CPLUSPLUS_COMPILER = "/usr/bin/g++"
28 28 PASCAL_COMPILER = "/usr/bin/fpc"
29 29 JAVA_COMPILER = "/usr/bin/javac"
30 - RUBY_INTERPRETER = "/home/dae/.rvm/rubies/ruby-1.9.2-p320/bin/ruby"
30 + RUBY_INTERPRETER = "/usr/bin/ruby"
31 31 PYTHON_INTERPRETER = "/usr/bin/python"
32 32 PYTHON_CHECKER = "/usr/bin/pyflakes"
33 33
34 34 C_OPTIONS = "-O2 -s -static -std=c99 -DCONTEST -lm -Wall"
35 35 CPLUSPLUS_OPTIONS = "-O2 -s -static -DCONTEST -lm -Wall"
36 36 PASCAL_OPTIONS = "-O1 -XS -dCONTEST"
37 37 JAVA_OPTIONS = ""
38 38 PYTHON_OPTIONS = ""
39 39
40 40 # Check for the correct number of arguments. Otherwise, print usage.
41 41 if ARGV.length == 0 or ARGV.length > 4
42 42 puts "Usage: compile <language> [<source-file>] [<output-file>] [<message-file>]"
@@ -112,33 +112,34
112 112 md = /\s*public\s*class\s*(\w*)/.match(line)
113 113 classname=md[1] if md
114 114 end
115 115 system("cp #{params[:source_file]} #{classname}.java")
116 116 command = "#{JAVA_COMPILER} #{classname}.java 2> #{params[:message_file]}"
117 117 system(command)
118 118 if File.exists?(classname + ".class")
119 119 File.open(params[:output_file],"w") {|file| file.write("#!/bin/sh\n/usr/bin/java #{classname}\n")}
120 120 File.chmod(0755, params[:output_file])
121 121 end
122 122
123 123 when "ruby"
124 - command = "#{RUBY_INTERPRETER} -c #{params[:source_file]} > #{params[:message_file]}"
125 - system(command)
124 + command = "#{RUBY_INTERPRETER} -c #{params[:source_file]} 2> #{params[:message_file]}"
125 + if system(command)
126 126 File.open(params[:output_file],"w") do |out_file|
127 127 out_file.puts "#!#{RUBY_INTERPRETER}"
128 128 File.open(params[:source_file],"r").each do |line|
129 129 out_file.print line
130 130 end
131 131 end
132 132 File.chmod(0755, params[:output_file])
133 + end
133 134
134 135 when "python"
135 136 command = "#{PYTHON_CHECKER} #{params[:source_file]} > #{params[:message_file]}"
136 137 if system(command)
137 138 #compile to python bytecode
138 139 command = "#{PYTHON_INTERPRETER} -m py_compile #{params[:source_file]}"
139 140 puts "compile: #{command}"
140 141 system(command)
141 142 puts "pwd: " + Dir.pwd
142 143 Dir.new('.').each {|file| puts file}
143 144 File.open(params[:output_file],"w") do |out_file|
144 145 out_file.puts "#!#{PYTHON_INTERPRETER} #{params[:source_file]}c"
You need to be logged in to leave comments. Login now