From b1f49aeafafb64dc7902a4824b35b01fa49b75b2 Mon Sep 17 00:00:00 2001
From: paoletti <paoletti@umich.edu>
Date: Sun, 5 May 2019 12:29:04 -0400
Subject: [PATCH] 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)
---
Makefile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index af89bf6..91da2de 100644
--- a/Makefile
+++ b/Makefile
@@ -139,13 +139,12 @@ clean:
$(PARTIAL_SUBMITFILE) $(FULL_SUBMITFILE) $(PERF_FILE)
rm -Rf *.dSYM
-# make partialsubmit.tar.gz - cleans, runs dos2unix, creates tarball
+# make partialsubmit.tar.gz - cleans, creates tarball
# omitting test cases
PARTIAL_SUBMITFILES=$(filter-out $(TESTSOURCES), \
$(wildcard Makefile *.h *.hpp *.cpp))
$(PARTIAL_SUBMITFILE): $(PARTIAL_SUBMITFILES)
rm -f $(PARTIAL_SUBMITFILE) $(FULL_SUBMITFILE)
- -dos2unix $(PARTIAL_SUBMITFILES)
COPYFILE_DISABLE=true tar -vczf $(PARTIAL_SUBMITFILE) \
$(PARTIAL_SUBMITFILES)
@echo !!! WARNING: No test cases included. Use 'make fullsubmit' to include test cases. !!!
@@ -156,7 +155,6 @@ FULL_SUBMITFILES=$(filter-out $(TESTSOURCES), \
$(wildcard Makefile *.h *.hpp *.cpp test*.txt))
$(FULL_SUBMITFILE): $(FULL_SUBMITFILES)
rm -f $(PARTIAL_SUBMITFILE) $(FULL_SUBMITFILE)
- -dos2unix $(FULL_SUBMITFILES)
COPYFILE_DISABLE=true tar -vczf $(FULL_SUBMITFILE) $(FULL_SUBMITFILES)
@echo !!! Final submission prepared, test cases included... READY FOR GRADING !!!
--
GitLab