Merge pull request #19 from tautschnig/zip

Create a zip archive containing a directory

Author: peterschrammel

Makefile

@@ -1,12 +1,12 @@
 CBMC=../cbmc
 2LS=../2ls
-YEAR=2017
+YEAR=2018
 
 all: cbmc 2ls
 
-cbmc: CBMC-sv-comp-$(YEAR).tar.gz
+cbmc: CBMC-sv-comp-$(YEAR).zip
 
-2ls: 2ls-sv-comp-$(YEAR).tar.gz
+2ls: 2ls-sv-comp-$(YEAR).zip
 
 .PHONY: cbmc 2ls
 
@@ -15,20 +15,24 @@ cbmc: CBMC-sv-comp-$(YEAR).tar.gz
 	cat $*.inc tool-wrapper.inc >> $@
 	chmod 755 $@
 
-CBMC-sv-comp-$(YEAR).tar.gz: cbmc.inc tool-wrapper.inc $(CBMC)/LICENSE $(CBMC)/src/cbmc/cbmc
-	mkdir -p tmp
+CBMC-sv-comp-$(YEAR).zip: cbmc.inc tool-wrapper.inc $(CBMC)/LICENSE $(CBMC)/src/cbmc/cbmc
+	mkdir -p $(basename $@)
 	$(MAKE) cbmc-wrapper
-	mv cbmc-wrapper tmp/cbmc
-	cp $(CBMC)/LICENSE tmp/
-	cp $(CBMC)/src/cbmc/cbmc tmp/cbmc-binary
-	cd tmp && chmod a+rX * && tar cfz ../$@ * && rm cbmc cbmc-binary LICENSE
-	rmdir tmp
+	mv cbmc-wrapper $(basename $@)/cbmc
+	cp $(CBMC)/LICENSE $(basename $@)/
+	cp $(CBMC)/src/cbmc/cbmc $(basename $@)/cbmc-binary
+	chmod a+rX $(basename $@)/*
+	zip -r $@ $(basename $@)
+	cd $(basename $@) && rm cbmc cbmc-binary LICENSE
+	rmdir $(basename $@)
 
-2ls-sv-comp-$(YEAR).tar.gz: 2ls.inc tool-wrapper.inc $(2LS)/LICENSE $(2LS)/src/2ls/2ls
-	mkdir -p tmp
+2ls-sv-comp-$(YEAR).zip: 2ls.inc tool-wrapper.inc $(2LS)/LICENSE $(2LS)/src/2ls/2ls
+	mkdir -p $(basename $@)
 	$(MAKE) 2ls-wrapper
-	mv 2ls-wrapper tmp/2ls
-	cp $(2LS)/LICENSE tmp/
-	cp $(2LS)/src/2ls/2ls tmp/2ls-binary
-	cd tmp && chmod a+rX * && tar cfz ../$@ * && rm 2ls 2ls-binary LICENSE
-	rmdir tmp
+	mv 2ls-wrapper $(basename $@)/2ls
+	cp $(2LS)/LICENSE $(basename $@)/
+	cp $(2LS)/src/2ls/2ls $(basename $@)/2ls-binary
+	chmod a+rX $(basename $@)/*
+	zip -r $@ $(basename $@)
+	cd $(basename $@) && rm 2ls 2ls-binary LICENSE
+	rmdir $(basename $@)