Commit d586bae0 authored by Waleed Khan's avatar Waleed Khan
Browse files

Merge branch 'dos2unix' into 'master'

Silence dos2unix errors

The result is that if it 1) doesn't exist, or 2) exits with error, we
don't quit making the submit file. This includes weird cases such as
permission being denied on certain directories.

It's really hard to imagine dos2unix legitimately failing, and even if
it does, the autograder should be already changing CRLF to LFs in its
test case normalization process.

See merge request !2
parents c846c8bb 887c52fc
...@@ -132,7 +132,7 @@ clean: ...@@ -132,7 +132,7 @@ clean:
PARTIAL_SUBMITFILES=$(filter-out $(TESTSOURCES), $(wildcard Makefile *.h *.cpp)) PARTIAL_SUBMITFILES=$(filter-out $(TESTSOURCES), $(wildcard Makefile *.h *.cpp))
$(PARTIAL_SUBMITFILE): $(PARTIAL_SUBMITFILES) $(PARTIAL_SUBMITFILE): $(PARTIAL_SUBMITFILES)
rm -f $(PARTIAL_SUBMITFILE) $(FULL_SUBMITFILE) rm -f $(PARTIAL_SUBMITFILE) $(FULL_SUBMITFILE)
dos2unix $(PARTIAL_SUBMITFILES) -dos2unix $(PARTIAL_SUBMITFILES)
tar -vczf $(PARTIAL_SUBMITFILE) $(PARTIAL_SUBMITFILES) tar -vczf $(PARTIAL_SUBMITFILE) $(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. !!!
...@@ -140,7 +140,7 @@ $(PARTIAL_SUBMITFILE): $(PARTIAL_SUBMITFILES) ...@@ -140,7 +140,7 @@ $(PARTIAL_SUBMITFILE): $(PARTIAL_SUBMITFILES)
FULL_SUBMITFILES=$(filter-out $(TESTSOURCES), $(wildcard Makefile *.h *.cpp test*.txt)) FULL_SUBMITFILES=$(filter-out $(TESTSOURCES), $(wildcard Makefile *.h *.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) -dos2unix $(FULL_SUBMITFILES)
tar -vczf $(FULL_SUBMITFILE) $(FULL_SUBMITFILES) 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 !!!
...@@ -215,4 +215,4 @@ project0.o: project0.cpp class.h ...@@ -215,4 +215,4 @@ project0.o: project0.cpp class.h
# these targets do not create any files # these targets do not create any files
.PHONY: all release debug profile clean alltests partialsubmit fullsubmit help .PHONY: all release debug profile clean alltests partialsubmit fullsubmit help
# disable built-in rules # disable built-in rules
.SUFFIXES: .SUFFIXES:
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment