summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2008-08-26 15:04:01 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2008-08-26 15:04:01 +0100
commit24c8843d4cec0f1caed22a04da86ee822c96c862 (patch)
tree3600a7fe714a345c79608a6bafb03e4b555cd1cb /Makefile
parentc4e92579ba837360f2a1585e5851159e44a224a6 (diff)
Use git-archive for make dist, then append ChangeLog
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile22
1 files changed, 14 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index bfb526fe..6cdd67f2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@
all:
+GIT = git
+GZIP = gzip
+TAR = tar
XSLTPROC = xsltproc --xinclude --nonet
CANONXML = xmllint --nsclean --noblanks --c14n --nonet
XML_LINEBREAKS = perl -pe 's/>/>\n/g'
@@ -110,15 +113,18 @@ dist:
set -e ;\
version="`sed -ne s'!<tp:version>\(.*\)</tp:version>!\1!p' spec/all.xml`";\
distname="telepathy-spec-$$version";\
- darcs dist -d dist;\
- tar -zxf- -C tmp < dist.tar.gz;\
- darcs changes > tmp/dist/ChangeLog;\
+ rm -f tmp/ChangeLog "$$distname".tar "$$distname".tar.gz; \
+ $(GIT) archive --format=tar --prefix="$$distname"/ HEAD \
+ > "$$distname".tar;\
rm -rf tmp/"$$distname";\
- mv tmp/dist tmp/"$$distname";\
- tar -zcvf- -C tmp "$$distname" > tmp/"$$distname".tar.gz;\
- mv tmp/"$$distname".tar.gz .;\
- rm -rf tmp/"$$distname";\
- rm -f dist.tar.gz
+ mkdir tmp/"$$distname";\
+ $(GIT) log --stat > tmp/"$$distname"/ChangeLog || \
+ $(GIT) log > tmp/"$$distname"/ChangeLog;\
+ $(TAR) -rf "$$distname".tar -C tmp --owner 0 --group 0 --mode 0664 \
+ "$$distname"/ChangeLog;\
+ $(GZIP) -9 "$$distname".tar;\
+ $(TAR) -ztvf "$$distname".tar.gz;\
+ rm -rf tmp/"$$distname"
BRANCH = misc
UPLOAD_BRANCH_TO = people.freedesktop.org:public_html/telepathy-spec