meson - dont install eina bench cmp and use install_mode

This commit is contained in:
Carsten Haitzler 2018-12-27 16:29:16 +00:00
parent c9dca7ce5d
commit b03c818b1c
6 changed files with 8 additions and 24 deletions

View File

@ -4,8 +4,6 @@ project('efl', ['c','cpp'],
meson_version : '>=0.47' meson_version : '>=0.47'
) )
chmod = join_paths(meson.source_root(), 'meson/meson-chmod.sh')
if host_machine.system() == 'darwin' if host_machine.system() == 'darwin'
add_languages('objc') add_languages('objc')
endif endif

View File

@ -1,2 +0,0 @@
#!/bin/sh
chmod "$1" "${DESTDIR}/$2" && touch "${DESTDIR}/$2"

View File

@ -95,6 +95,5 @@ edje_watch = executable('edje_watch',
c_args : package_c_args, c_args : package_c_args,
) )
install_data('edje_recc', install_dir : dir_bin) install_data('edje_recc', install_dir : dir_bin,
o = join_paths(dir_bin, 'edje_recc') install_mode: 'rwxr-xr-x')
meson.add_install_script(chmod, 'a+r+x', o)

View File

@ -14,12 +14,3 @@ if meson.is_cross_build()
else else
eet_bin = _eet_bin eet_bin = _eet_bin
endif endif
install_data('diffeet', install_dir : dir_bin)
o = join_paths(dir_bin, 'diffeet')
meson.add_install_script(chmod, 'a+r+x', o)
install_data('vieet', install_dir : dir_bin)
o = join_paths(dir_bin, 'vieet')
meson.add_install_script(chmod, 'a+r+x', o)

View File

@ -1,3 +1,4 @@
install_data('eina-bench-cmp', install_dir : dir_bin) # disabled because its a pretty useless script that forces python as a
o = join_paths(dir_bin, 'eina-bench-cmp') # a dependency and doesn't parse anything efl or test apps produce
meson.add_install_script(chmod, 'a+r+x', o) #install_data('eina-bench-cmp', install_dir : dir_bin,
# install_mode: 'rwxr-xr-x')

View File

@ -8,8 +8,5 @@ configure_file(
input: 'eo_debug.in', input: 'eo_debug.in',
output: 'eo_debug', output: 'eo_debug',
configuration: eo_debug_config, configuration: eo_debug_config,
install_dir: dir_bin) install_dir: dir_bin,
install_mode: 'rwxr-xr-x')
# make sure it's executable
o = join_paths(dir_bin, 'eo_debug')
meson.add_install_script(chmod, 'a+r+x', o)