Skip to content
Snippets Groups Projects
Commit b1f49aea authored by paoletti's avatar paoletti
Browse files

Removed dos2unix; the autograder does fine without it (tested Project 1...

Removed dos2unix; the autograder does fine without it (tested Project 1 Letterman), both source code and test files, and it produces headaches for students (especially those using Mfile)
parent 9270982e
No related branches found
No related tags found
No related merge requests found
...@@ -139,13 +139,12 @@ clean: ...@@ -139,13 +139,12 @@ clean:
$(PARTIAL_SUBMITFILE) $(FULL_SUBMITFILE) $(PERF_FILE) $(PARTIAL_SUBMITFILE) $(FULL_SUBMITFILE) $(PERF_FILE)
rm -Rf *.dSYM rm -Rf *.dSYM
# make partialsubmit.tar.gz - cleans, runs dos2unix, creates tarball # make partialsubmit.tar.gz - cleans, creates tarball
# omitting test cases # omitting test cases
PARTIAL_SUBMITFILES=$(filter-out $(TESTSOURCES), \ PARTIAL_SUBMITFILES=$(filter-out $(TESTSOURCES), \
$(wildcard Makefile *.h *.hpp *.cpp)) $(wildcard Makefile *.h *.hpp *.cpp))
$(PARTIAL_SUBMITFILE): $(PARTIAL_SUBMITFILES) $(PARTIAL_SUBMITFILE): $(PARTIAL_SUBMITFILES)
rm -f $(PARTIAL_SUBMITFILE) $(FULL_SUBMITFILE) rm -f $(PARTIAL_SUBMITFILE) $(FULL_SUBMITFILE)
-dos2unix $(PARTIAL_SUBMITFILES)
COPYFILE_DISABLE=true tar -vczf $(PARTIAL_SUBMITFILE) \ COPYFILE_DISABLE=true tar -vczf $(PARTIAL_SUBMITFILE) \
$(PARTIAL_SUBMITFILES) $(PARTIAL_SUBMITFILES)
@echo !!! WARNING: No test cases included. Use 'make fullsubmit' to include test cases. !!! @echo !!! WARNING: No test cases included. Use 'make fullsubmit' to include test cases. !!!
...@@ -156,7 +155,6 @@ FULL_SUBMITFILES=$(filter-out $(TESTSOURCES), \ ...@@ -156,7 +155,6 @@ FULL_SUBMITFILES=$(filter-out $(TESTSOURCES), \
$(wildcard Makefile *.h *.hpp *.cpp test*.txt)) $(wildcard Makefile *.h *.hpp *.cpp test*.txt))
$(FULL_SUBMITFILE): $(FULL_SUBMITFILES) $(FULL_SUBMITFILE): $(FULL_SUBMITFILES)
rm -f $(PARTIAL_SUBMITFILE) $(FULL_SUBMITFILE) rm -f $(PARTIAL_SUBMITFILE) $(FULL_SUBMITFILE)
-dos2unix $(FULL_SUBMITFILES)
COPYFILE_DISABLE=true tar -vczf $(FULL_SUBMITFILE) $(FULL_SUBMITFILES) COPYFILE_DISABLE=true tar -vczf $(FULL_SUBMITFILE) $(FULL_SUBMITFILES)
@echo !!! Final submission prepared, test cases included... READY FOR GRADING !!! @echo !!! Final submission prepared, test cases included... READY FOR GRADING !!!
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment