[Spice-commits] 3 commits - build-aux/meson-dist .gitlab-ci.yml Makefile.am meson.build

[GitLab Mirror]

 .gitlab-ci.yml       |   20 ++++++++++++++++++++
 Makefile.am          |    1 +
 build-aux/meson-dist |   28 ++++++++++++++++++++++++++++
 meson.build          |    2 +-
 4 files changed, 50 insertions(+), 1 deletion(-)

New commits:
commit 0c761fe14f08dfeb78036e6b7a5ca3537f03f84f
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Fri May 17 15:22:36 2019 +0100

    ci: Try Meson dist
    
    Make sure Meson is able to generate a correct tarball.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6cb2cd..5ddb4db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,6 +82,12 @@ fedora-meson:
 
   script:
     - meson --buildtype=release build-default
+    # Meson does not update submodules recursively
+    - git submodule update --init --recursive
+    # this fix an issue with Meson dist
+    - if ! test -r ../spice-common.git; then DIR=`basename "$PWD"`; ln -s "$DIR/.git/modules/spice-common" ../spice-common.git; fi
+    - rm -rf meson-dist
+    - ninja -C build-default dist
     - ninja -C build-default
     - ninja -C build-default test
 
commit eaaa4f32fa11940e55d6da0a8edd375d5435878a
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Fri May 17 12:26:03 2019 +0100

    build: Do additional changes to Meson distribution
    
    - copy missing recorder files;
    - generate THANKS file.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/Makefile.am b/Makefile.am
index 3c607c9..6ba8c02 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,7 @@ EXTRA_DIST =					\
 	meson_options.txt			\
 	po/meson.build				\
 	build-aux/git-version-gen		\
+	build-aux/meson-dist			\
 	gtk-doc.make				\
 	.version				\
 	$(NULL)
diff --git a/build-aux/meson-dist b/build-aux/meson-dist
new file mode 100755
index 0000000..9a18ff2
--- /dev/null
+++ b/build-aux/meson-dist
@@ -0,0 +1,28 @@
+#!/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"
+
+# add missing recorder files
+(cd "$2" && ls -1 subprojects/spice-common/common/recorder/recorder.[ch] \
+    subprojects/spice-common/common/recorder/recorder_ring.[ch] | \
+    tar cf - -T -) | (cd "$MESON_DIST_ROOT" && exec tar xf -)
+
+# generate THANKS file
+{
+	  echo "The spice-gtk team would like to thank the following contributors:"
+	  echo
+	  (cd "$2" && exec git log --format='%aN <%aE>') | sort -u
+} > "$MESON_DIST_ROOT/THANKS"
diff --git a/meson.build b/meson.build
index 4c065a4..7403ab8 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,7 @@ project('spice-gtk', 'c',
          license : 'LGPLv2.1',
          meson_version : '>= 0.49')
 
-meson.add_dist_script('sh', '-c', 'echo @0@>"$MESON_DIST_ROOT/.tarball-version"'.format(meson.project_version()))
+meson.add_dist_script('build-aux/meson-dist', meson.project_version(), meson.source_root())
 
 #
 # global C defines
commit 20157e329d723e1346a1a022d1232facb96bee0f
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Fri May 17 10:45:32 2019 +0100

    ci: Test we can create a no dirty package
    
    Make sure there's nothing left during build or that
    during build files are not changed in the wrong way.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7766539..a6cb2cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,6 +12,7 @@ variables:
                polkit-devel vala lz4-devel opus-devel pixman-devel
                libcacard-devel celt051-devel libphodav-devel usbutils
                usbredir-devel libusbx-devel libsoup-devel json-glib-devel
+               bzip2
 
   DEPS_MINGW: mingw64-gcc mingw64-pkg-config mingw64-pixman mingw64-openssl
               mingw64-gtk3 mingw64-json-glib mingw64-opus
@@ -39,6 +40,19 @@ fedora-autotools:
     - make -j4
     - make check
     - cd ..
+    # Run dist, check we don't have -dirty in the build
+    - git clean -xfd
+    - git submodule foreach --recursive git clean -xfd
+    - git reset --hard HEAD
+    - ./autogen.sh --disable-dependency-tracking --enable-celt051
+    - make gitignore
+    - (cd subprojects/spice-common && make gitignore)
+    - ./autogen.sh --disable-dependency-tracking --enable-celt051
+    - if grep -q 'VERSION=.*-dirty' configure; then echo 'Version is dirty!'; false; fi
+    - make -j4
+    - make dist
+    - test -e spice-gtk-*.tar.bz2
+    - test \! -e spice-gtk-*-dirty.tar.bz2
     # Run without features
     - git clean -xfd
     - git submodule foreach --recursive git clean -xfd