Use a . in $VERSION.$REVISION instead of a -.

This commit is contained in:
Steve 2018-05-18 07:42:14 +01:00
parent f9064d26f7
commit 49abba5faa
2 changed files with 5 additions and 5 deletions

View File

@ -32,7 +32,7 @@ cp /usr/x86_64-w64-mingw32/bin/*.dll $OUT
cd $BUILDROOT cd $BUILDROOT
zip -r blobwarsAttrition-${VERSION}-${REVISION}.win32.zip $FOLDER zip -r blobwarsAttrition-${VERSION}.${REVISION}.win32.zip $FOLDER
mv *.zip ../../dist mv *.zip ../../dist

View File

@ -79,9 +79,9 @@ dist:
$(RM) -rf $(PROG)-$(VERSION).$(REVISION) $(RM) -rf $(PROG)-$(VERSION).$(REVISION)
mkdir $(PROG)-$(VERSION).$(REVISION) mkdir $(PROG)-$(VERSION).$(REVISION)
cp -rL $(DIST_FILES) $(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 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) $(RM) -rf $(PROG)-$(VERSION).$(REVISION)
# prepare an archive for the program # prepare an archive for the program
@ -90,9 +90,9 @@ src-dist:
mkdir $(PROG)-$(VERSION).$(REVISION) mkdir $(PROG)-$(VERSION).$(REVISION)
cp -rL $(SRC_DIST_FILES) $(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 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 mkdir -p dist
mv $(PROG)-$(VERSION)-$(REVISION).src.tar.gz dist mv $(PROG)-$(VERSION).$(REVISION).src.tar.gz dist
$(RM) -rf $(PROG)-$(VERSION).$(REVISION) $(RM) -rf $(PROG)-$(VERSION).$(REVISION)
.PHONY: dist .PHONY: dist