[Spice-commits] 4 commits - build-aux/meson-dist Makefile.am meson.build subprojects/spice-common

[GitLab Mirror]

 Makefile.am              |    1 +
 build-aux/meson-dist     |   36 ++++++++++++++++++++++++++++++++++++
 meson.build              |    4 +++-
 subprojects/spice-common |    2 +-
 4 files changed, 41 insertions(+), 2 deletions(-)

New commits:
commit ee6c01a235bb81617077b70d0090e4a411368c86
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Sun Jun 13 19:44:19 2021 +0100

    build: Remove some useless file from Meson distribution
    
    Remove:
    - internal documentation;
    - CI files.
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>

diff --git a/build-aux/meson-dist b/build-aux/meson-dist
index 80d534fe..7146ad1e 100755
--- a/build-aux/meson-dist
+++ b/build-aux/meson-dist
@@ -14,3 +14,23 @@ fi
 
 # generate tarball version
 echo "$1" > "$MESON_DIST_ROOT/.tarball-version"
+
+# remove useless files
+pushd "$MESON_DIST_ROOT"
+find . -name .gitignore -delete
+rm -rf \
+build-aux/useless-if-before-free \
+build-aux/vc-list-files \
+cfg.mk \
+docs/how_to_release.md \
+docs/manual/images/pepper.png \
+docs/Spice_user_manual.odt \
+GNUmakefile \
+.mailmap \
+maint.mk \
+README.Windows.md \
+server/tests/autobahn-check-report \
+server/tests/fuzzingclient.json \
+TODO.multiclient \
+.travis.yml \
+uncrustify_cfg
commit 0219bea62e93b0fd583daca56e028719d696e039
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Sun Jun 13 19:20:57 2021 +0100

    build: Improve Meson distribution file
    
    Generate .tarball-version file.
    Code from spice-gtk.
    Meson 0.49 is required for multiple parameters to meson.add_dist_script.
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>

diff --git a/build-aux/meson-dist b/build-aux/meson-dist
new file mode 100755
index 00000000..80d534fe
--- /dev/null
+++ b/build-aux/meson-dist
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+set -o pipefail
+
+if test "$1" = ""; then
+    echo "Version not provided" >&2
+    exit 1
+fi
+if ! test -d "$2"; then
+    echo "Source directory not provided" >&2
+    exit 1
+fi
+
+# generate tarball version
+echo "$1" > "$MESON_DIST_ROOT/.tarball-version"
diff --git a/meson.build b/meson.build
index fa3cfe5b..36e6337a 100644
--- a/meson.build
+++ b/meson.build
@@ -4,10 +4,12 @@
 project('spice', 'c', 'cpp',
         version : run_command('build-aux/git-version-gen', meson.source_root() + '/.tarball-version', check : true).stdout().strip(),
         license : 'LGPLv2.1',
-        meson_version : '>= 0.48',
+        meson_version : '>= 0.49',
         default_options : ['buildtype=debugoptimized',
                            'warning_level=2'])
 
+meson.add_dist_script('build-aux/meson-dist', meson.project_version(), meson.source_root())
+
 message('Updating submodules')
 run_command('build-aux/meson/check-spice-common', check : true)
 
commit 6534d72a1e6a39904d4a1ff0f8bdcfbdbcbd7276
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Mon Jun 14 07:21:35 2021 +0100

    Update spice-common submodule
    
    This brings in the following changes:
    
    Frediano Ziglio (1):
          build: Update Meson requirement to 0.49
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>

diff --git a/subprojects/spice-common b/subprojects/spice-common
index bac2aa4e..de79bac8 160000
--- a/subprojects/spice-common
+++ b/subprojects/spice-common
@@ -1 +1 @@
-Subproject commit bac2aa4e2de8535b6f688a0278fba5f618b32a24
+Subproject commit de79bac8e94ce84f4c88719729d59a6f5e3d6bf3
commit cf729077e7f7471669efd30052838e9cc865754e
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Sun Jun 13 19:44:04 2021 +0100

    build: Add missing file to Autoconf distribution
    
    Add doxygen.cfg, required to build Doxygen documentation.
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>

diff --git a/Makefile.am b/Makefile.am
index f2eb87d5..ec593b5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,7 @@ EXTRA_DIST =					\
 	build-aux/meson/check-spice-common	\
 	CHANGELOG.md				\
 	doxygen.sh				\
+	doxygen.cfg				\
 	.version				\
 	$(NULL)