Commit e7dd3bbc authored by Thibault Saunier's avatar Thibault Saunier

Depend on meson 0.41.0 and use its new dist feature

Reviewed-by: default avatarAlex Băluț <&lt;alexandru.balut@gmail.com&gt;>
Differential Revision: https://phabricator.freedesktop.org/D1821
parent 704c85a8
......@@ -289,6 +289,22 @@
}
]
},
{
"name": "meson",
"buildsystem": "simple",
"ensure-writable": ["easy-install.pth"],
"build-commands": [
"mkdir -p /app/lib/python3.5/site-packages",
"PYTHONUSERBASE=/app/ python3 setup.py install --prefix=/app"
],
"sources": [
{
"type": "archive",
"url": "https://pypi.python.org/packages/6d/32/a474702fcba1144aef89e7ec5d8a33d49be8389a0f983d11aab486c8392b/meson-0.41.2.tar.gz#md5=3b4a99beb09a0286ca1307449570c689",
"sha256": "ad1707717987fe8b7b65392b8327580105fcbdd5f2032bf3b7232b647284c95c"
}
]
},
{
"name": "gstreamer",
"buildsystem": "meson",
......
......@@ -24,7 +24,6 @@ Most of the steps below should be done in the [development environment](HACKING.
3. Check your local repository:
* Make sure your sandbox is using the latest GStreamer release: `$ ptvenv --update --gst-version=<gst-version>`
* Install git-archive-all in your sandbox to be able to create the archive to be distributed: `$ build/flatpak/py-configure --module=git-archive-all && make install`
* Check `$ git status` does not show any change
* Check `$ ptvenv ./configure` is all green
......
project('pitivi', 'c', version : '0.98', meson_version : '>= 0.36.0')
project('pitivi', 'c', version : '0.98', meson_version : '>= 0.41.0')
python = find_program('python3')
intltool_merge = find_program('intltool-merge')
......@@ -73,17 +73,3 @@ if not get_option('disable-help')
endif
subdir('tests')
subdir('tests/validate-tests')
archiver = find_program('git-archive-all', required : false)
if archiver.found()
prefix = 'pitivi-' + meson.project_version()
archive = 'pitivi-' + meson.project_version() + '.tar.gz'
run_target('dist', command : ['git-archive-all', '--prefix=' + prefix, archive])
else
message('git-archive-all not found, you will not be able to run `ninja dist`')
message('Install git-archive-all:')
message(' - with pip:')
message(' $ pip3 install git-archive-all')
message(' - in the sandbox:')
message(' (ptv-flatpak) $ build/flatpak/py-configure --module=git-archive-all && make install')
endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment