meson: Now dist target is upstream

This reverts commit 2140c9dffb, but not
the Makefile.am part. Also fixes EXTRA_DIST.

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
Quentin Glidic 2017-05-15 13:17:06 +02:00
parent 2140c9dffb
commit 21982db450
No known key found for this signature in database
GPG key ID: AC203F96E2C34BB7
3 changed files with 1 additions and 23 deletions

View file

@ -591,4 +591,5 @@ coverage-clean:
EXTRA_DIST += \
doc/meson.build \
subprojects/libgwater/xcb/meson.build \
meson_options.txt \
meson.build

View file

@ -439,5 +439,3 @@ if ohcount.found()
],
)
endif
run_target('dist', command: [ 'script/dist.sh' ])

View file

@ -1,21 +0,0 @@
#! /bin/sh
NAME=`mesonintrospect ${MESON_BUILD_ROOT} --projectinfo | tr ',[' '\n\n' | sed -n 1,/subprojects/p | grep name | cut -d'"' -f4`
VERSION=`mesonintrospect ${MESON_BUILD_ROOT} --projectinfo | tr ',[' '\n\n' | sed -n 1,/subprojects/p | grep version | cut -d'"' -f4`
PREFIX=${NAME}-${VERSION}
TAR=${MESON_BUILD_ROOT}/${PREFIX}.tar
rm -f ${TAR} ${TAR}.xz
git archive --prefix=${PREFIX}/ --format=tar HEAD > ${TAR}
(
git submodule | \
while read commit path ref; do
(
cd ${path}
git archive --prefix=${PREFIX}/${path}/ --format=tar ${commit} > tmp.tar
tar -Af ${TAR} tmp.tar
rm -f tmp.tar
)
done
)
xz ${TAR}