Use source and object files from managers file list when compiling solution

Author: artikz

cms/__init__.py

@@ -38,6 +38,7 @@
     "LANGUAGE_NAMES", "LANGUAGES", "DEFAULT_LANGUAGES",
     "SOURCE_EXT_TO_LANGUAGE_MAP",
     "LANGUAGE_TO_SOURCE_EXT_MAP", "LANGUAGE_TO_HEADER_EXT_MAP",
+    "LANGUAGE_TO_OBJ_EXT_MAP",
     "SCORE_MODE_IOI_MAX", "SCORE_MODE_IOI_MAX_TOKENED_LAST",
     # log
     # Nothing intended for external use, no need to advertise anything.
@@ -103,6 +104,11 @@
     LANG_CPP: ".h",
     LANG_PASCAL: "lib.pas",
 }
+LANGUAGE_TO_OBJ_EXT_MAP = {
+    LANG_C: ".o",
+    LANG_CPP: ".o",
+    LANG_PASCAL: ".o",
+}
 
 # Task score modes.
 

cms/grading/tasktypes/Batch.py

@@ -27,7 +27,7 @@
 import logging
 
 from cms import LANGUAGES, LANGUAGE_TO_SOURCE_EXT_MAP, \
-    LANGUAGE_TO_HEADER_EXT_MAP
+    LANGUAGE_TO_HEADER_EXT_MAP, LANGUAGE_TO_OBJ_EXT_MAP
 from cms.grading import get_compilation_commands, get_evaluation_commands, \
     compilation_step, evaluation_step, human_evaluation_message, \
     is_evaluation_passed, extract_outcome_and_text, white_diff_step
@@ -171,12 +171,20 @@ def compile(self, job, file_cacher):
             files_to_get["grader%s" % source_ext] = \
                 job.managers["grader%s" % source_ext].digest
 
-        # Also copy all *.h and *lib.pas graders
+        # Also copy all managers that might be useful during compilation.
         for filename in job.managers.iterkeys():
             if any(filename.endswith(header)
                    for header in LANGUAGE_TO_HEADER_EXT_MAP.itervalues()):
                 files_to_get[filename] = \
                     job.managers[filename].digest
+            elif any(filename.endswith(source)
+                     for source in LANGUAGE_TO_SOURCE_EXT_MAP.itervalues()):
+                files_to_get[filename] = \
+                    job.managers[filename].digest
+            elif any(filename.endswith(obj)
+                     for obj in LANGUAGE_TO_OBJ_EXT_MAP.itervalues()):
+                files_to_get[filename] = \
+                    job.managers[filename].digest
 
         for filename, digest in files_to_get.iteritems():
             sandbox.create_file_from_storage(filename, digest)

cms/grading/tasktypes/Communication.py

@@ -29,7 +29,7 @@
 import tempfile
 
 from cms import LANGUAGES, LANGUAGE_TO_SOURCE_EXT_MAP, \
-    LANGUAGE_TO_HEADER_EXT_MAP, config
+    LANGUAGE_TO_HEADER_EXT_MAP, LANGUAGE_TO_OBJ_EXT_MAP, config
 from cms.grading.Sandbox import wait_without_std
 from cms.grading import get_compilation_commands, compilation_step, \
     human_evaluation_message, is_evaluation_passed, \
@@ -128,12 +128,20 @@ def compile(self, job, file_cacher):
         files_to_get[source_filenames[-1]] = \
             job.files[format_filename].digest
 
-        # Also copy all *.h and *lib.pas graders
+        # Also copy all managers that might be useful during compilation.
         for filename in job.managers.iterkeys():
             if any(filename.endswith(header)
                    for header in LANGUAGE_TO_HEADER_EXT_MAP.itervalues()):
                 files_to_get[filename] = \
                     job.managers[filename].digest
+            elif any(filename.endswith(source)
+                     for source in LANGUAGE_TO_SOURCE_EXT_MAP.itervalues()):
+                files_to_get[filename] = \
+                    job.managers[filename].digest
+            elif any(filename.endswith(obj)
+                     for obj in LANGUAGE_TO_OBJ_EXT_MAP.itervalues()):
+                files_to_get[filename] = \
+                    job.managers[filename].digest
 
         for filename, digest in files_to_get.iteritems():
             sandbox.create_file_from_storage(filename, digest)