X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp-cpm3.git/blobdiff_plain/411cf4de1c9ddf0c5a92fad922ef9ddb6d661b85..3ba537752998f2d8554cecee5d586fd1a70256b6:/cbios/Makefile

diff --git a/cbios/Makefile b/cbios/Makefile
index f8018d0..f6bad22 100644
--- a/cbios/Makefile
+++ b/cbios/Makefile
@@ -2,7 +2,7 @@
 
 SRC := bioskrnl.180 boot.180 chario.180 drvtbl.180
 SRC += move.180 time.180 mm.180 misc.180 utils.180
-SRC += msgbuf.180 conbuf.180 ascip.180 sdio.180
+SRC += msgbuf.180 conbuf.180 ascip.180 sdio.180 cfio.180
 SRC += scb.180
 
 INC := config.inc z180reg.inc z180.lib
@@ -11,25 +11,32 @@ INC := config.inc z180reg.inc z180.lib
 OBJ := $(SRC:.180=.rel)
 
 
-$(foreach X,$(subst =,:=,$(filter VCS_%,\
-	$(shell autorevision -t sh -o $(CURDIR)/autorevision.cache))),$(eval $X))
+$(foreach X,$(subst =,:=,$(subst ",,$(filter VCS_%,\
+	$(shell autorevision -t sh -o $(CURDIR)/autorevision.cache)))),$(eval $X))
 
 VERS := $(shell echo "$(VCS_TAG)" | sed -e 's/hexrel-/0./g' -e 's/^v//g')
 
-ifneq ($(VCS_TICK),"0")
-  VERS := $(VERS).$(subst ",,$(VCS_TICK))
+ifneq ($(VCS_TICK),0)
+  VERS := $(VERS).$(VCS_TICK)
 endif
-ifneq ($(VCS_BRANCH),"master")
-  VERS := $(VERS)-$(subst ",,$(VCS_BRANCH))
+ifneq ($(VCS_BRANCH),master)
+  VERS := $(VERS)-$(VCS_BRANCH)
 endif
-ifeq ($(VCS_WC_MODIFIED),"1")
+ifeq ($(VCS_WC_MODIFIED),1)
   VERS := $(VERS)-dirty
 endif
 
 
 SYSFILE = cpm3_$(VERS).sys
 MAPFILE = bnkbios3_$(VERS).map
-ZIPFILE = cpm3_$(VERS).zip
+DIST_NAME = z180-stamp-cpm3_$(VERS).zip
+DIST_NAME_BIN = z180-stamp-cpm3-bin_$(VERS).zip
+PREFIX = z180-stamp-cpm3_$(VERS)
+
+CP = cp
+RM = rm -f
+GIT = git
+ZIP = zip
 
 #CP/M emulator
 CPMEMU = zxcc
@@ -64,8 +71,6 @@ sys: $(SYSFILE)
 bios: bnkbios3.spr
 map: $(MAPFILE)
 
-.phony: bin-dist
-bin-dist: $(ZIPFILE)
 
 $(OBJ):  $(INC)
 boot.rel: version.inc
@@ -157,17 +162,25 @@ bnkbios3.spr : $(OBJ)
 	@$(cpm-asm)
 
 
-$(ZIPFILE): $(SYSFILE) $(MAPFILE)
-	@rm -f $@
-	zip -9 $@ $(SYSFILE) $(MAPFILE)
+.phony: bin-dist
+bin-dist: $(SYSFILE) $(MAPFILE)
+	$(ZIP) -9 $(DIST_NAME_BIN) $(SYSFILE) $(MAPFILE)
+
+.phony: dist
+dist: $(SYSFILE) $(MAPFILE)
+	$(GIT) archive --format=zip --prefix=$(PREFIX)/ -9 -o $(DIST_NAME) HEAD^{tree}
+	@mkdir -p $(PREFIX)
+	@$(CP) autorevision.cache version.inc $(PREFIX)
+	$(ZIP) -r -9 $(DIST_NAME) $(PREFIX) $(SYSFILE) $(MAPFILE)
+	@$(RM) -r $(PREFIX)
 
 
 .phony: clean realclean
 clean:
-	rm -f *.rel *.lst *.sym version.inc
+	$(RM) *.rel *.lst *.sym version.inc
 
 realclean: clean
-	rm -f *.map *.prn *~
+	$(RM) *.map *.prn *~
 
 
 #==================================================================