diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-08-26 15:15:26 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-08-26 15:15:26 +0100 |
| commit | e874248b48ea3d2ed7ecbc3a0d0cd9d280694278 (patch) | |
| tree | 40dad0489a2800087b17b3fd72ae4fdd1bdfc332 /Makefile | |
| parent | 973c8e627a907aa89bf60534aa924d51b5504192 (diff) | |
| parent | 7c134108f4fcf27006b2a2ed070858730e13a926 (diff) | |
Merge branch 'master' into codegen-annotations
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 22 |
1 files changed, 14 insertions, 8 deletions
@@ -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' @@ -113,15 +116,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 |