Description:
merge
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r230:791a8b27f2e4 - - 3 files changed: 23 inserted, 12 deleted
@@ -28,19 +28,21 | |||||
|
28 | PASCAL_COMPILER = "/usr/bin/fpc" |
|
28 | PASCAL_COMPILER = "/usr/bin/fpc" |
|
29 | JAVA_COMPILER = "/usr/bin/javac" |
|
29 | JAVA_COMPILER = "/usr/bin/javac" |
|
30 | RUBY_INTERPRETER = "/usr/bin/ruby" |
|
30 | RUBY_INTERPRETER = "/usr/bin/ruby" |
|
31 | PYTHON_INTERPRETER = "/usr/bin/python3" |
|
31 | PYTHON_INTERPRETER = "/usr/bin/python3" |
|
32 | PYTHON_CHECKER = "/usr/bin/pyflakes" |
|
32 | PYTHON_CHECKER = "/usr/bin/pyflakes" |
|
33 | PHP_INTERPRETER = "/usr/bin/php" |
|
33 | PHP_INTERPRETER = "/usr/bin/php" |
|
|
34 | + HASKELL_COMPILER = "/usr/bin/ghc" | ||
|
34 |
|
35 | ||
|
35 | C_OPTIONS = "-O2 -s -static -std=c99 -DCONTEST -lm -Wall" |
|
36 | C_OPTIONS = "-O2 -s -static -std=c99 -DCONTEST -lm -Wall" |
|
36 | CPLUSPLUS_OPTIONS = "-O2 -s -std=c++11 -static -DCONTEST -lm -Wall" |
|
37 | CPLUSPLUS_OPTIONS = "-O2 -s -std=c++11 -static -DCONTEST -lm -Wall" |
|
37 | PASCAL_OPTIONS = "-O1 -XS -dCONTEST" |
|
38 | PASCAL_OPTIONS = "-O1 -XS -dCONTEST" |
|
38 | JAVA_OPTIONS = "" |
|
39 | JAVA_OPTIONS = "" |
|
39 | PYTHON_OPTIONS = "" |
|
40 | PYTHON_OPTIONS = "" |
|
40 | PHP_OPTIONS = "-l" |
|
41 | PHP_OPTIONS = "-l" |
|
|
42 | + HASKELL_OPTIONS = "" | ||
|
41 |
|
43 | ||
|
42 | # Check for the correct number of arguments. Otherwise, print usage. |
|
44 | # Check for the correct number of arguments. Otherwise, print usage. |
|
43 | if ARGV.length == 0 or ARGV.length > 4 |
|
45 | if ARGV.length == 0 or ARGV.length > 4 |
|
44 | puts "Usage: compile <language> [<source-file>] [<output-file>] [<message-file>]" |
|
46 | puts "Usage: compile <language> [<source-file>] [<output-file>] [<message-file>]" |
|
45 | puts |
|
47 | puts |
|
46 | puts "<source-file> is defaulted to \"source\"." |
|
48 | puts "<source-file> is defaulted to \"source\"." |
@@ -142,26 +144,28 | |||||
|
142 | end |
|
144 | end |
|
143 | end |
|
145 | end |
|
144 | File.chmod(0755, params[:output_file]) |
|
146 | File.chmod(0755, params[:output_file]) |
|
145 | end |
|
147 | end |
|
146 |
|
148 | ||
|
147 | when "python" |
|
149 | when "python" |
|
148 | - command = "#{PYTHON_CHECKER} #{params[:source_file]}" |
|
150 | + #command = "#{PYTHON_CHECKER} #{params[:source_file]}" |
|
149 | - if system(command, out: params[:message_file]) |
|
151 | + #if system(command, out: params[:message_file]) |
|
150 | #compile to python bytecode |
|
152 | #compile to python bytecode |
|
151 | command = "#{PYTHON_INTERPRETER} -c \"import py_compile; py_compile.compile('#{params[:source_file]}','#{params[:source_file]}c');\"" |
|
153 | command = "#{PYTHON_INTERPRETER} -c \"import py_compile; py_compile.compile('#{params[:source_file]}','#{params[:source_file]}c');\"" |
|
152 | puts "compile: #{command}" |
|
154 | puts "compile: #{command}" |
|
153 | - system(command) |
|
155 | + system(command, err: params[:message_file]) |
|
154 | - puts "pwd: " + Dir.pwd |
|
156 | + if FileTest.exists?("#{params[:source_file]}c") |
|
155 | - Dir.new('.').each {|file| puts file} |
|
157 | + puts "pwd: " + Dir.pwd |
|
156 | - File.open(params[:output_file],"w") do |out_file| |
|
158 | + Dir.new('.').each {|file| puts file} |
|
157 | - out_file.puts "#!#{PYTHON_INTERPRETER} #{params[:source_file]}c" |
|
159 | + File.open(params[:output_file],"w") do |out_file| |
|
|
160 | + out_file.puts "#!#{PYTHON_INTERPRETER} #{params[:source_file]}c" | ||
|
|
161 | + end | ||
|
|
162 | + File.chmod(0755, params[:output_file]) | ||
|
|
163 | + FileUtils.cp("#{params[:source_file]}c",params[:output_file]) | ||
|
158 | end |
|
164 | end |
|
159 | - File.chmod(0755, params[:output_file]) |
|
165 | + #end |
|
160 | - FileUtils.cp("#{params[:source_file]}c",params[:output_file]) |
|
||
|
161 | - end |
|
||
|
162 |
|
166 | ||
|
163 | when "php" |
|
167 | when "php" |
|
164 | command = "#{PHP_INTERPRETER} #{PHP_OPTIONS} #{params[:source_file]}" |
|
168 | command = "#{PHP_INTERPRETER} #{PHP_OPTIONS} #{params[:source_file]}" |
|
165 | if system(command, err: params[:message_file]) |
|
169 | if system(command, err: params[:message_file]) |
|
166 | File.open(params[:output_file],"w") do |out_file| |
|
170 | File.open(params[:output_file],"w") do |out_file| |
|
167 | out_file.puts "#!#{PHP_INTERPRETER}" |
|
171 | out_file.puts "#!#{PHP_INTERPRETER}" |
@@ -169,12 +173,16 | |||||
|
169 | out_file.print line |
|
173 | out_file.print line |
|
170 | end |
|
174 | end |
|
171 | end |
|
175 | end |
|
172 | File.chmod(0755, params[:output_file]) |
|
176 | File.chmod(0755, params[:output_file]) |
|
173 | end |
|
177 | end |
|
174 |
|
178 | ||
|
|
179 | + when "haskell" | ||
|
|
180 | + command = "#{HASKELL_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{HASKELL_OPTIONS}" | ||
|
|
181 | + system(command, err: params[:message_file]) | ||
|
|
182 | + | ||
|
175 | else |
|
183 | else |
|
176 | talk("ERROR: Invalid language specified!") |
|
184 | talk("ERROR: Invalid language specified!") |
|
177 | open(params[:message_file],"w") do |f| |
|
185 | open(params[:message_file],"w") do |f| |
|
178 | f.puts "ERROR: Invalid language specified!" |
|
186 | f.puts "ERROR: Invalid language specified!" |
|
179 | end |
|
187 | end |
|
180 | exit(127) |
|
188 | exit(127) |
@@ -50,13 +50,13 | |||||
|
50 | puts " <test-result-directory> is defaulted to ./test-result" |
|
50 | puts " <test-result-directory> is defaulted to ./test-result" |
|
51 | puts "WARNING: The judge script will forcefully create the (implicitly and explicitly) specified directories and remove anything inside it." |
|
51 | puts "WARNING: The judge script will forcefully create the (implicitly and explicitly) specified directories and remove anything inside it." |
|
52 | exit(127) |
|
52 | exit(127) |
|
53 | end |
|
53 | end |
|
54 |
|
54 | ||
|
55 | language = ARGV[0] |
|
55 | language = ARGV[0] |
|
56 | - if language != "c" && language != "c++" && language != "pas" && language != "java" && language != "ruby" && language != "python" && language != "php" |
|
56 | + if language != "c" && language != "c++" && language != "pas" && language != "java" && language != "ruby" && language != "python" && language != "php" && language != "haskell" |
|
57 | log "You specified a language that is not supported: #{language}." |
|
57 | log "You specified a language that is not supported: #{language}." |
|
58 | exit(127) |
|
58 | exit(127) |
|
59 | end |
|
59 | end |
|
60 |
|
60 | ||
|
61 | source_file = ARGV[1] |
|
61 | source_file = ARGV[1] |
|
62 | ENV['SOURCE_NAME'] = source_file |
|
62 | ENV['SOURCE_NAME'] = source_file |
@@ -89,14 +89,15 | |||||
|
89 | # Run the program. |
|
89 | # Run the program. |
|
90 | #run_command = "/usr/bin/time -f \"#{time_output_format}\" 2>run_result #{problem_home}/script/box_new -a 2 -f -t #{time_limit} -m #{mem_limit} -i #{input_file_name} -o output.txt #{program_name}" |
|
90 | #run_command = "/usr/bin/time -f \"#{time_output_format}\" 2>run_result #{problem_home}/script/box_new -a 2 -f -t #{time_limit} -m #{mem_limit} -i #{input_file_name} -o output.txt #{program_name}" |
|
91 | # |
|
91 | # |
|
92 |
|
92 | ||
|
93 | JAVA_OPTION = "-s set_robust_list -s futex -s clone -s getppid -s clone -s wait4 -p /usr/bin/ -p ./" |
|
93 | JAVA_OPTION = "-s set_robust_list -s futex -s clone -s getppid -s clone -s wait4 -p /usr/bin/ -p ./" |
|
94 | RUBY_OPTION = "-p /usr/lib64/ -p /usr/local/lib64/ -p /usr/local/lib/ -p /lib64/ -p /dev/urandom -p #{sandbox_dir}/#{program_name} -p #{sandbox_dir}/ -s set_robust_list -s sched_getaffinity -s clock_gettime -s sigaltstack -s pipe2 -s clone -s futex -s openat -s pipe" |
|
94 | RUBY_OPTION = "-p /usr/lib64/ -p /usr/local/lib64/ -p /usr/local/lib/ -p /lib64/ -p /dev/urandom -p #{sandbox_dir}/#{program_name} -p #{sandbox_dir}/ -s set_robust_list -s sched_getaffinity -s clock_gettime -s sigaltstack -s pipe2 -s clone -s futex -s openat -s pipe" |
|
95 | - PYTHON_OPTION = "-p /usr/lib64/ -p /usr/local/lib64/ -p /usr/local/lib/ -p /usr/bin/ -p /lib64/ -p /dev/urandom -p /usr/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p #{sandbox_dir}/#{source_name} -p /proc/mounts -s statfs -s set_robust_list -s openat -s recvmsg -s connect -s socket -s sendto -s futex -s sigaltstack -E PYTHONNOUSERSITE=yes" |
|
95 | + PYTHON_OPTION = "-p /usr/lib64/ -p /usr/local/lib64/ -p /usr/local/lib/ -p /usr/bin/ -p /lib64/ -p /dev/urandom -p /usr/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p #{sandbox_dir}/#{source_name} -p /proc/sys/crypto/fips_enabled -p /proc/self/status -p /proc/mounts -p /var/lib/dpkg/status -s statfs -s set_robust_list -s openat -s sysinfo -s recvmsg -s connect -s socket -s sendto -s futex -s sigaltstack -s getrandom -E PYTHONNOUSERSITE=yes" |
|
96 | PHP_OPTION = "-p /usr/lib64/ -p/lib64/ -p /usr/bin/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p /usr/share/ -s setfsuid -s setfsgid -s openat -s set_robust_list -s futex -s clone -s socket -s connect" |
|
96 | PHP_OPTION = "-p /usr/lib64/ -p/lib64/ -p /usr/bin/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p /usr/share/ -s setfsuid -s setfsgid -s openat -s set_robust_list -s futex -s clone -s socket -s connect" |
|
|
97 | + HASKELL_OPTION = "-s set_robust_list -s clock_gettime -s sysinfo -s timer_create -s timer_settime -s futex -s timer_delete" | ||
|
97 |
|
98 | ||
|
98 | case language |
|
99 | case language |
|
99 | when "java" |
|
100 | when "java" |
|
100 | # for java, extract the classname |
|
101 | # for java, extract the classname |
|
101 | # wne have to add additional systemcall and we don't check the mem limit (dunno how to fix...) |
|
102 | # wne have to add additional systemcall and we don't check the mem limit (dunno how to fix...) |
|
102 | classname = 'DUMMY' |
|
103 | classname = 'DUMMY' |
@@ -106,12 +107,14 | |||||
|
106 | #for java, we cannot really check the memory limit... |
|
107 | #for java, we cannot really check the memory limit... |
|
107 | run_command = "#{problem_home}/script/box -a 3 -f -T -t #{time_limit} #{JAVA_OPTION} -i #{input_file_name} -o output.txt /usr/bin/java -A -Xmx#{mem_limit}k -A #{classname} " |
|
108 | run_command = "#{problem_home}/script/box -a 3 -f -T -t #{time_limit} #{JAVA_OPTION} -i #{input_file_name} -o output.txt /usr/bin/java -A -Xmx#{mem_limit}k -A #{classname} " |
|
108 | when "ruby" |
|
109 | when "ruby" |
|
109 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{mem_limit} #{RUBY_OPTION} -i #{input_file_name} -o output.txt /usr/bin/ruby #{program_name} " |
|
110 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{mem_limit} #{RUBY_OPTION} -i #{input_file_name} -o output.txt /usr/bin/ruby #{program_name} " |
|
110 | when "python" |
|
111 | when "python" |
|
111 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{[128 * 1024,mem_limit].max} #{PYTHON_OPTION} -i #{input_file_name} -o output.txt /usr/bin/python3 #{program_name} " |
|
112 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{[128 * 1024,mem_limit].max} #{PYTHON_OPTION} -i #{input_file_name} -o output.txt /usr/bin/python3 #{program_name} " |
|
|
113 | + when "haskell" | ||
|
|
114 | + run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit} -m #{[512 * 1024,mem_limit].max} #{HASKELL_OPTION} -i #{input_file_name} -o output.txt #{program_name} " | ||
|
112 | when "php" |
|
115 | when "php" |
|
113 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{[128 * 1024,mem_limit].max} #{PHP_OPTION} -i #{input_file_name} -o output.txt /usr/bin/php -A -d -A memory_limit=#{mem_limit}k -A #{program_name} " |
|
116 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{[128 * 1024,mem_limit].max} #{PHP_OPTION} -i #{input_file_name} -o output.txt /usr/bin/php -A -d -A memory_limit=#{mem_limit}k -A #{program_name} " |
|
114 | else # for c++, pascal, we do the normal checking |
|
117 | else # for c++, pascal, we do the normal checking |
|
115 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit} -m #{mem_limit} -i #{input_file_name} -o output.txt #{program_name} " |
|
118 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit} -m #{mem_limit} -i #{input_file_name} -o output.txt #{program_name} " |
|
116 | end |
|
119 | end |
|
117 |
|
120 |
You need to be logged in to leave comments.
Login now