diff options
| author | Quentin Glidic <sardemff7+git@sardemff7.net> | 2017-05-15 13:17:06 +0200 |
|---|---|---|
| committer | Quentin Glidic <sardemff7+git@sardemff7.net> | 2017-05-15 13:18:12 +0200 |
| commit | 21982db45041604b645f73dc0c9b8a3914adb49d (patch) | |
| tree | f187a616a42718d22e10c6a5bb2b6afdfe3625b3 | |
| parent | 2140c9dffbd601eac2574473c741b8b9834e3887 (diff) | |
meson: Now dist target is upstream
This reverts commit 2140c9dffbd601eac2574473c741b8b9834e3887, but not
the Makefile.am part. Also fixes EXTRA_DIST.
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rwxr-xr-x | script/dist.sh | 21 |
3 files changed, 1 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am index 263e0490..a5b9de78 100644 --- a/Makefile.am +++ b/Makefile.am @@ -591,4 +591,5 @@ coverage-clean: EXTRA_DIST += \ doc/meson.build \ subprojects/libgwater/xcb/meson.build \ + meson_options.txt \ meson.build diff --git a/meson.build b/meson.build index a5d33374..5016c9db 100644 --- a/meson.build +++ b/meson.build @@ -439,5 +439,3 @@ if ohcount.found() ], ) endif - -run_target('dist', command: [ 'script/dist.sh' ]) diff --git a/script/dist.sh b/script/dist.sh deleted file mode 100755 index 04f7dc3f..00000000 --- a/script/dist.sh +++ /dev/null @@ -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} |