Description:
Merge branch 'master' into windows
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r116:5d4a79b51f8c - - 1 file changed: 1 inserted, 1 deleted
@@ -9,25 +9,25 | |||||
|
9 | # Supported compilers: |
|
9 | # Supported compilers: |
|
10 | # gcc, g++, and fpc. |
|
10 | # gcc, g++, and fpc. |
|
11 | # |
|
11 | # |
|
12 | ############################## |
|
12 | ############################## |
|
13 |
|
13 | ||
|
14 | def talk(msg) |
|
14 | def talk(msg) |
|
15 | if ENV['TALKATIVE']!=nil |
|
15 | if ENV['TALKATIVE']!=nil |
|
16 | puts str |
|
16 | puts str |
|
17 | end |
|
17 | end |
|
18 | if ENV['GRADER_LOGGING']!=nil |
|
18 | if ENV['GRADER_LOGGING']!=nil |
|
19 | log_fname = ENV['GRADER_LOGGING'] |
|
19 | log_fname = ENV['GRADER_LOGGING'] |
|
20 | fp = File.open(log_fname,"a") |
|
20 | fp = File.open(log_fname,"a") |
|
21 |
- fp.puts("run: #{Time.new.strftime("%H:%M")} #{ |
|
21 | + fp.puts("run: #{Time.new.strftime("%H:%M")} #{msg}") |
|
22 | fp.close |
|
22 | fp.close |
|
23 | end |
|
23 | end |
|
24 | end |
|
24 | end |
|
25 |
|
25 | ||
|
26 | C_COMPILER = "gcc" |
|
26 | C_COMPILER = "gcc" |
|
27 | CPLUSPLUS_COMPILER = "g++" |
|
27 | CPLUSPLUS_COMPILER = "g++" |
|
28 | PASCAL_COMPILER = "fpc" |
|
28 | PASCAL_COMPILER = "fpc" |
|
29 |
|
29 | ||
|
30 | C_OPTIONS = "-O2 -s -static -std=c99 -DCONTEST -lm -Wall" |
|
30 | C_OPTIONS = "-O2 -s -static -std=c99 -DCONTEST -lm -Wall" |
|
31 | CPLUSPLUS_OPTIONS = "-O2 -s -static -DCONTEST -lm -Wall" |
|
31 | CPLUSPLUS_OPTIONS = "-O2 -s -static -DCONTEST -lm -Wall" |
|
32 | PASCAL_OPTIONS = "-O1 -XS -dCONTEST" |
|
32 | PASCAL_OPTIONS = "-O1 -XS -dCONTEST" |
|
33 |
|
33 |
You need to be logged in to leave comments.
Login now