From a82e019de91ea988c67555fd1b342e8e91e85ed5 Mon Sep 17 00:00:00 2001 From: "Igor V. Kovalenko" Date: Tue, 2 Mar 2021 08:22:22 +0300 Subject: [PATCH] build-sys: meson: fix meson dist version Part-of: --- .gitlab-ci.yml | 2 ++ meson.build | 2 ++ scripts/save-tarball-version.sh | 8 ++++++++ 3 files changed, 12 insertions(+) create mode 100755 scripts/save-tarball-version.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5d1558c1..1b6dc11ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -101,8 +101,10 @@ build-meson: - meson build - cd build - ninja + - ulimit -c 0 # don't dump core files on tests that are supposed to assert - ninja test - ninja test-daemon + - ninja dist artifacts: paths: - build/ diff --git a/meson.build b/meson.build index 5a1df59d9..6b86ba2bc 100644 --- a/meson.build +++ b/meson.build @@ -4,6 +4,8 @@ project('pulseaudio', 'c', 'cpp', default_options : [ 'c_std=gnu11', 'cpp_std=c++11' ] ) +meson.add_dist_script('scripts/save-tarball-version.sh', meson.project_version()) + pa_version_str = meson.project_version() # For tarballs, the first split will do nothing, but for builds in git, we # split out suffixes when there are commits since the last tag diff --git a/scripts/save-tarball-version.sh b/scripts/save-tarball-version.sh new file mode 100755 index 000000000..961aa15ab --- /dev/null +++ b/scripts/save-tarball-version.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +if [ "x${1}" == "x" ]; then + echo "Package version must be specified to generate tarball version" + exit 1 +fi + +echo "${1}" > "$MESON_DIST_ROOT/.tarball-version"