From 49abba5faa090d44599b5bb0e1667fd3216663ec Mon Sep 17 00:00:00 2001 From: Steve Date: Fri, 18 May 2018 07:42:14 +0100 Subject: [PATCH] Use a . in $VERSION.$REVISION instead of a -. --- build/win32/build.sh | 2 +- makefile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/win32/build.sh b/build/win32/build.sh index 40d40d2..273c1cd 100755 --- a/build/win32/build.sh +++ b/build/win32/build.sh @@ -32,7 +32,7 @@ cp /usr/x86_64-w64-mingw32/bin/*.dll $OUT cd $BUILDROOT -zip -r blobwarsAttrition-${VERSION}-${REVISION}.win32.zip $FOLDER +zip -r blobwarsAttrition-${VERSION}.${REVISION}.win32.zip $FOLDER mv *.zip ../../dist diff --git a/makefile b/makefile index 8d82267..9bd6582 100644 --- a/makefile +++ b/makefile @@ -79,9 +79,9 @@ dist: $(RM) -rf $(PROG)-$(VERSION).$(REVISION) mkdir $(PROG)-$(VERSION).$(REVISION) cp -rL $(DIST_FILES) $(PROG)-$(VERSION).$(REVISION) - tar czf $(PROG)-$(VERSION)-$(REVISION).linux-x86.tar.gz $(PROG)-$(VERSION).$(REVISION) + tar czf $(PROG)-$(VERSION).$(REVISION).linux-x86.tar.gz $(PROG)-$(VERSION).$(REVISION) mkdir -p dist - mv $(PROG)-$(VERSION)-$(REVISION).linux-x86.tar.gz dist + mv $(PROG)-$(VERSION).$(REVISION).linux-x86.tar.gz dist $(RM) -rf $(PROG)-$(VERSION).$(REVISION) # prepare an archive for the program @@ -90,9 +90,9 @@ src-dist: mkdir $(PROG)-$(VERSION).$(REVISION) cp -rL $(SRC_DIST_FILES) $(PROG)-$(VERSION).$(REVISION) git log --pretty=format:"%h%x09%an%x09%ad%x09%s" --date=short >$(PROG)-$(VERSION).$(REVISION)/CHANGELOG.raw - tar czf $(PROG)-$(VERSION)-$(REVISION).src.tar.gz $(PROG)-$(VERSION).$(REVISION) + tar czf $(PROG)-$(VERSION).$(REVISION).src.tar.gz $(PROG)-$(VERSION).$(REVISION) mkdir -p dist - mv $(PROG)-$(VERSION)-$(REVISION).src.tar.gz dist + mv $(PROG)-$(VERSION).$(REVISION).src.tar.gz dist $(RM) -rf $(PROG)-$(VERSION).$(REVISION) .PHONY: dist