dist: convert to tar.gz

This allows the "make dist" target to be used as well as the github
archive generation.
This commit is contained in:
William Hubbs 2016-09-23 15:25:22 -05:00
parent 0a76627345
commit 24010dcb48
2 changed files with 6 additions and 6 deletions

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
*.bz2 *.gz
*.diff *.diff
*.patch *.patch

View File

@ -11,9 +11,9 @@
GITREF?= ${VERSION} GITREF?= ${VERSION}
DISTPREFIX?= ${NAME}-${VERSION} DISTPREFIX?= ${NAME}-${VERSION}
DISTFILE?= ${DISTPREFIX}.tar.bz2 DISTFILE?= ${DISTPREFIX}.tar.gz
CLEANFILES+= ${NAME}-*.tar.bz2 CLEANFILES+= ${NAME}-*.tar.gz
CHANGELOG_LIMIT?= --after="1 year ago" CHANGELOG_LIMIT?= --after="1 year ago"
@ -21,13 +21,13 @@ _SNAP_SH= date -u +%Y%m%d%H%M
_SNAP:= $(shell ${_SNAP_SH}) _SNAP:= $(shell ${_SNAP_SH})
SNAP= ${_SNAP} SNAP= ${_SNAP}
SNAPDIR= ${DISTPREFIX}-${SNAP} SNAPDIR= ${DISTPREFIX}-${SNAP}
SNAPFILE= ${SNAPDIR}.tar.bz2 SNAPFILE= ${SNAPDIR}.tar.gz
changelog: changelog:
git log ${CHANGELOG_LIMIT} --format=full > ChangeLog git log ${CHANGELOG_LIMIT} --format=full > ChangeLog
dist: dist:
git archive --prefix=${DISTPREFIX}/ ${GITREF} | bzip2 > ${DISTFILE} git archive --prefix=${DISTPREFIX}/ ${GITREF} --output=${DISTFILE}
distcheck: dist distcheck: dist
rm -rf ${DISTPREFIX} rm -rf ${DISTPREFIX}
@ -42,7 +42,7 @@ snapshot:
cp -RPp * /tmp/${SNAPDIR} cp -RPp * /tmp/${SNAPDIR}
(cd /tmp/${SNAPDIR}; make clean) (cd /tmp/${SNAPDIR}; make clean)
rm -rf /tmp/${SNAPDIR}/.git 2>/dev/null || true rm -rf /tmp/${SNAPDIR}/.git 2>/dev/null || true
tar -cvjpf ${SNAPFILE} -C /tmp ${SNAPDIR} tar -cvzpf ${SNAPFILE} -C /tmp ${SNAPDIR}
rm -rf /tmp/${SNAPDIR} rm -rf /tmp/${SNAPDIR}
ls -l ${SNAPFILE} ls -l ${SNAPFILE}