diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-12-18 19:59:48 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-18 18:30:47 +0200 |
| commit | c693bd9bb4be3b2f5413277aba723cb58223b44b (patch) | |
| tree | d1f747173854fee64d497c718f66c7ae600e216e /test cases | |
| parent | 67c106a00152b44409a36ce7295a232afd09941c (diff) | |
| download | meson-c693bd9bb4be3b2f5413277aba723cb58223b44b.tar.gz | |
Allow passing arguments to install scripts
Closes #1213
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/common/60 install script/meson.build | 8 | ||||
| -rw-r--r-- | test cases/common/60 install script/myinstall.py | 12 | ||||
| -rwxr-xr-x | test cases/common/60 install script/myinstall.sh | 10 |
3 files changed, 14 insertions, 16 deletions
diff --git a/test cases/common/60 install script/meson.build b/test cases/common/60 install script/meson.build index 6cab8404f..7cbde8d11 100644 --- a/test cases/common/60 install script/meson.build +++ b/test cases/common/60 install script/meson.build @@ -1,8 +1,4 @@ project('custom install script', 'c') -if meson.get_compiler('c').get_id() == 'msvc' - install_data('no-installed-files', install_dir : '') -else - meson.add_install_script('myinstall.sh') - executable('prog', 'prog.c', install : true) -endif +executable('prog', 'prog.c', install : true) +meson.add_install_script('myinstall.py', 'diiba/daaba', 'file.dat') diff --git a/test cases/common/60 install script/myinstall.py b/test cases/common/60 install script/myinstall.py new file mode 100644 index 000000000..969aba58e --- /dev/null +++ b/test cases/common/60 install script/myinstall.py @@ -0,0 +1,12 @@ +#!/usr/bin/env python + +import os +import sys + +prefix = os.environ['MESON_INSTALL_DESTDIR_PREFIX'] + +dirname = os.path.join(prefix, sys.argv[1]) + +os.makedirs(dirname) +with open(os.path.join(dirname, sys.argv[2]), 'w') as f: + f.write('') diff --git a/test cases/common/60 install script/myinstall.sh b/test cases/common/60 install script/myinstall.sh deleted file mode 100755 index 79512c9e4..000000000 --- a/test cases/common/60 install script/myinstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -eu - -echo Starting custom installation step - -mkdir -p "${DESTDIR}${MESON_INSTALL_PREFIX}/diiba/daaba" -touch "${DESTDIR}${MESON_INSTALL_PREFIX}/diiba/daaba/file.dat" - -echo Finished custom install step |
