From 77611e5490ceebd321ee80f97c85166609409e6c Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Wed, 12 Oct 2022 19:04:13 +0100 Subject: [PATCH] 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 --- .gitlab-ci.yml | 9 +++++++++ Makefile.am | 1 + 2 files changed, 10 insertions(+) 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 \