summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrediano Ziglio <freddy77@gmail.com>2022-10-12 19:04:13 +0100
committerFrediano Ziglio <freddy77@gmail.com>2023-05-11 12:26:06 +0100
commit77611e5490ceebd321ee80f97c85166609409e6c (patch)
treeefb3a8bcf9de9b1320ba8c229dea1dd5936a5224
parent313932ea0202650eb8e7783f1fd476e849d96314 (diff)
build: Add missing file to distribution
Required to build using Meson. Also add a check to "distcheck" job to test you can build with Meson from distribution file. Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
-rw-r--r--.gitlab-ci.yml9
-rw-r--r--Makefile.am1
2 files changed, 10 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 36dbafb5..174ea517 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,8 +88,17 @@ syntax-check:
distcheck:
script:
+ - git clean -fdx
+ - git submodule foreach --recursive git clean -fdx
- ./autogen.sh --enable-manual --enable-werror
- make distcheck
+ - bz2=$( echo spice-*.bz2 )
+ - dir=${bz2%.tar.bz2}
+ - rm -rf "$dir"
+ - tar jxvf "$bz2"
+ - cd "$dir"
+ - meson --buildtype=release build
+ - ninja -C build
# Same as makecheck job but use a Centos image
makecheck-centos:
diff --git a/Makefile.am b/Makefile.am
index ec593b5b..851c2d01 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,7 @@ EXTRA_DIST = \
meson.build \
meson_options.txt \
build-aux/git-version-gen \
+ build-aux/meson-dist \
build-aux/meson/check-spice-common \
CHANGELOG.md \
doxygen.sh \