Skip to content
Snippets Groups Projects
Commit d2c47bdc authored by Simon McVittie's avatar Simon McVittie
Browse files

Make generation of relocatable tarballs optional


It's easier to do test-builds without this.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent d7d5effd
No related branches found
No related tags found
No related merge requests found
...@@ -109,7 +109,7 @@ pipeline { ...@@ -109,7 +109,7 @@ pipeline {
sh ''' sh '''
set -eu set -eu
cd src cd src
meson --prefix="${WORKSPACE}/src/_build/relocatable-install" -Dpython=python3.5 _build meson --prefix="${WORKSPACE}/src/_build/relocatable-install" -Dpython=python3.5 -Drelocatable=true _build
ninja -C _build ninja -C _build
ninja -C _build install ninja -C _build install
meson test --verbose -C _build meson test --verbose -C _build
......
...@@ -260,15 +260,17 @@ executable( ...@@ -260,15 +260,17 @@ executable(
install_rpath : '${ORIGIN}/../' + get_option('libdir'), install_rpath : '${ORIGIN}/../' + get_option('libdir'),
) )
meson.add_install_script( if get_option('relocatable')
python.path(), meson.add_install_script(
join_paths(meson.current_source_dir(), 'build-relocatable-install.py'), python.path(),
'--srcdir', meson.current_source_dir(), join_paths(meson.current_source_dir(), 'build-relocatable-install.py'),
'--builddir', meson.current_build_dir(), '--srcdir', meson.current_source_dir(),
'--relocatabledir', relocatabledir, '--builddir', meson.current_build_dir(),
'--prefix', get_option('prefix'), '--relocatabledir', relocatabledir,
'--archive', meson.current_build_dir(), '--prefix', get_option('prefix'),
'--set-version', version, '--archive', meson.current_build_dir(),
) '--set-version', version,
)
endif
# vim:set sw=2 sts=2 et: # vim:set sw=2 sts=2 et:
option('python', type : 'string', value : 'python3') option('python', type : 'string', value : 'python3')
option('relocatable', type : 'boolean', value : false)
option('relocatabledir', type : 'string', value : 'auto') option('relocatabledir', type : 'string', value : 'auto')
option('version', type : 'string', value : 'auto') option('version', type : 'string', value : 'auto')
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment