Description:
last commit is a dud...fixing it now.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r152:394121525814 - - 1 file changed: 1 inserted, 1 deleted
@@ -67,78 +67,78 | |||||
|
67 | if FileTest.exists? params[:output_file] |
|
67 | if FileTest.exists? params[:output_file] |
|
68 | FileUtils.rm(params[:output_file]) |
|
68 | FileUtils.rm(params[:output_file]) |
|
69 | end |
|
69 | end |
|
70 | if FileTest.exists? params[:message_file] |
|
70 | if FileTest.exists? params[:message_file] |
|
71 | FileUtils.rm(params[:message_file]) |
|
71 | FileUtils.rm(params[:message_file]) |
|
72 | end |
|
72 | end |
|
73 |
|
73 | ||
|
74 | # Check if the source file exists before attempt compiling. |
|
74 | # Check if the source file exists before attempt compiling. |
|
75 | if !FileTest.exists? params[:source_file] |
|
75 | if !FileTest.exists? params[:source_file] |
|
76 | talk("ERROR: The source file does not exist!") |
|
76 | talk("ERROR: The source file does not exist!") |
|
77 | open(params[:message_file],"w") do |f| |
|
77 | open(params[:message_file],"w") do |f| |
|
78 | f.puts "ERROR: The source file did not exist." |
|
78 | f.puts "ERROR: The source file did not exist." |
|
79 | end |
|
79 | end |
|
80 | exit(127) |
|
80 | exit(127) |
|
81 | end |
|
81 | end |
|
82 |
|
82 | ||
|
83 | if params[:prog_lang]=='cpp' |
|
83 | if params[:prog_lang]=='cpp' |
|
84 | params[:prog_lang] = 'c++' |
|
84 | params[:prog_lang] = 'c++' |
|
85 | end |
|
85 | end |
|
86 |
|
86 | ||
|
87 | # Compile. |
|
87 | # Compile. |
|
88 | case params[:prog_lang] |
|
88 | case params[:prog_lang] |
|
89 |
|
89 | ||
|
90 | when "c" |
|
90 | when "c" |
|
91 | command = "#{C_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{C_OPTIONS} 2> #{params[:message_file]}" |
|
91 | command = "#{C_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{C_OPTIONS} 2> #{params[:message_file]}" |
|
92 | system(command) |
|
92 | system(command) |
|
93 |
|
93 | ||
|
94 | when "c++" |
|
94 | when "c++" |
|
95 | command = "#{CPLUSPLUS_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{CPLUSPLUS_OPTIONS} 2> #{params[:message_file]}" |
|
95 | command = "#{CPLUSPLUS_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{CPLUSPLUS_OPTIONS} 2> #{params[:message_file]}" |
|
96 | system(command) |
|
96 | system(command) |
|
97 |
|
97 | ||
|
98 | when "pas" |
|
98 | when "pas" |
|
99 | command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS} > #{params[:message_file]}" |
|
99 | command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS} > #{params[:message_file]}" |
|
100 | system(command) |
|
100 | system(command) |
|
101 | FileUtils.mv("output", params[:output_file]) |
|
101 | FileUtils.mv("output", params[:output_file]) |
|
102 |
|
102 | ||
|
103 | when "java" |
|
103 | when "java" |
|
104 | #rename the file to the public class name |
|
104 | #rename the file to the public class name |
|
105 |
|
105 | ||
|
106 | #get the class name |
|
106 | #get the class name |
|
107 | classname = 'DUMMY' |
|
107 | classname = 'DUMMY' |
|
108 | File.foreach(params[:source_file]) do |line| |
|
108 | File.foreach(params[:source_file]) do |line| |
|
109 | md = /\s*public\s*class\s*(\w*)/.match(line) |
|
109 | md = /\s*public\s*class\s*(\w*)/.match(line) |
|
110 | classname=md[1] if md |
|
110 | classname=md[1] if md |
|
111 | end |
|
111 | end |
|
112 | system("cp #{params[:source_file]} #{classname}.java") |
|
112 | system("cp #{params[:source_file]} #{classname}.java") |
|
113 | command = "#{JAVA_COMPILER} #{classname}.java 2> #{params[:message_file]}" |
|
113 | command = "#{JAVA_COMPILER} #{classname}.java 2> #{params[:message_file]}" |
|
114 | system(command) |
|
114 | system(command) |
|
115 |
- if File.exists?(classname + ".class") |
|
115 | + if File.exists?(classname + ".class") |
|
116 | File.open(params[:output_file],"w") {|file| file.write("#!/bin/sh\n/usr/bin/java #{classname}\n")} |
|
116 | File.open(params[:output_file],"w") {|file| file.write("#!/bin/sh\n/usr/bin/java #{classname}\n")} |
|
117 | File.chmod(0755, params[:output_file]) |
|
117 | File.chmod(0755, params[:output_file]) |
|
118 | end |
|
118 | end |
|
119 |
|
119 | ||
|
120 | when "ruby" |
|
120 | when "ruby" |
|
121 | command = "#{RUBY_INTEPRETER} -c #{params[:source_file]} > #{params[:message_file]}" |
|
121 | command = "#{RUBY_INTEPRETER} -c #{params[:source_file]} > #{params[:message_file]}" |
|
122 | system(command) |
|
122 | system(command) |
|
123 | File.open(params[:output_file],"w") do |out_file| |
|
123 | File.open(params[:output_file],"w") do |out_file| |
|
124 | out_file.puts "#!#{RUBY_INTEPRETER}" |
|
124 | out_file.puts "#!#{RUBY_INTEPRETER}" |
|
125 | File.open(params[:source_file],"r").each do |line| |
|
125 | File.open(params[:source_file],"r").each do |line| |
|
126 | out_file.print line |
|
126 | out_file.print line |
|
127 | end |
|
127 | end |
|
128 | end |
|
128 | end |
|
129 | File.chmod(0755, params[:output_file]) |
|
129 | File.chmod(0755, params[:output_file]) |
|
130 |
|
130 | ||
|
131 | else |
|
131 | else |
|
132 | talk("ERROR: Invalid language specified!") |
|
132 | talk("ERROR: Invalid language specified!") |
|
133 | open(params[:message_file],"w") do |f| |
|
133 | open(params[:message_file],"w") do |f| |
|
134 | f.puts "ERROR: Invalid language specified!" |
|
134 | f.puts "ERROR: Invalid language specified!" |
|
135 | end |
|
135 | end |
|
136 | exit(127) |
|
136 | exit(127) |
|
137 | end |
|
137 | end |
|
138 |
|
138 | ||
|
139 | # Report success or failure. |
|
139 | # Report success or failure. |
|
140 | if FileTest.exists? params[:output_file] |
|
140 | if FileTest.exists? params[:output_file] |
|
141 | talk "Compilation was successful!" |
|
141 | talk "Compilation was successful!" |
|
142 | else |
|
142 | else |
|
143 | talk "ERROR: Something was wrong during the compilation!" |
|
143 | talk "ERROR: Something was wrong during the compilation!" |
|
144 | end |
|
144 | end |
You need to be logged in to leave comments.
Login now