X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=config;h=bc8260a2fc0d43a6088292d8abda998802434e90;hb=e7b24af0413d1ca707feb5efd33361d179704407;hp=1eb34d3f674b42bc3b4fd8952b65e1be98c2890c;hpb=0ef7fd9921eb6018b54793ced6592d15979edbc0;p=eval.git

diff --git a/config b/config
index 1eb34d3..bc8260a 100644
--- a/config
+++ b/config
@@ -1,5 +1,5 @@
 # Configuration file for the MO Evaluator
-# (c) 2001--2004 Martin Mares <mj@ucw.cz>
+# (c) 2001--2007 Martin Mares <mj@ucw.cz>
 
 # The root of the whole directory hierarchy
 MO_ROOT=/aux/mo
@@ -15,12 +15,15 @@ EVAL_GROUP=mo-eval
 #TEST_USER=${TEST_USER:-mo-test1}
 TEST_USERS="mo-test1 mo-test2"
 
+# These values are used when creating logins for eval and contestanst.
+EVAL_UID_MIN=65000
+CT_UID_MIN=65100
+CT_UID_MAX=65199
+
 # Sometimes we need to get a list of all contestants (not in the evaluator
 # itself, but in various auxiliary scripts). In such cases we call mo-get-users,
-# which either scans /etc/passwd for users with UID in the following range,
-# or uses an explicit list of contestants CT_USER_LIST (username<tab>fullname).
-#CT_UID_MIN=65100
-#CT_UID_MAX=65199
+# which either uses an explicit list of contestants CT_USER_LIST (username<tab>fullname),
+# or (if undefined) scans /etc/passwd for users with UID between CT_UID_MIN and CT_UID_MAX.
 CT_USER_LIST=userlist
 
 ### Per-task configuration variables (default values, override in per-task config)
@@ -28,7 +31,7 @@ CT_USER_LIST=userlist
 ## Compiler settings:
 
 # Known source file extensions
-EXTENSIONS="c C cpp p pas"
+EXTENSIONS="c cc C cpp p pas"
 
 # Extra compiler flags for C (null, but can be overriden)
 EXTRA_CFLAGS=
@@ -37,16 +40,17 @@ EXTRA_CFLAGS=
 EXTRA_PFLAGS=
 
 # For each source extension, we must give compiler command
-COMP_c='/usr/bin/gcc -O2 -g -o $EXE $EXTRA_CFLAGS $SRC'
+COMP_c='/usr/bin/gcc -std=gnu99 -O2 -g -o $EXE $EXTRA_CFLAGS $SRC'
 COMP_C='/usr/bin/g++ -O2 -g -o $EXE $EXTRA_CFLAGS $SRC'
 COMP_cpp="$COMP_C"
-COMP_p='/usr/bin/fpc -Ci -Cr -g -O2 -So -Sg -o$EXE $EXTRA_PFLAGS $SRC'
+COMP_cc="$COMP_C"
+COMP_p='/usr/bin/fpc -Ci -Cr -Ct -g -O2 -Sg -o$EXE $EXTRA_PFLAGS $SRC'
 COMP_pas="$COMP_p"
 
 # Sandbox options used when compiling
-COMP_SANDBOX_OPTS='-m65536 -t60 -w -e'
+COMP_SANDBOX_OPTS='-m65536 -t60 -w -e -i/dev/null'
 
-# Sandbox initializaton commands for compilation
+# Sandbox initialization commands for compilation
 COMP_SANDBOX_INIT=
 
 # List of extra files needed for compilation. They are copied to the compiler