meosn - fix install of scripts and bins and their timestamps and modes

i was comparing the bindir results of aurtofoo vs meson and some
things were missing/poking out at me. this makes them be in sync -
install the ewl_wl+test obnaries, ensure to chmod +x+r etc. scritps
AND install them
This commit is contained in:
Carsten Haitzler 2018-12-27 15:24:08 +00:00
parent 91990b7cf8
commit f532be51bc
8 changed files with 29 additions and 3 deletions

View File

@ -4,11 +4,12 @@ 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
clean_check = run_command('meson/clean_check.sh') clean_check = run_command('meson/clean_check.sh')
if clean_check.returncode() == 0 if clean_check.returncode() == 0
error('Meson build requires a clean source tree') error('Meson build requires a clean source tree')

2
meson/meson-chmod.sh Executable file
View File

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

View File

@ -94,3 +94,7 @@ edje_watch = executable('edje_watch',
install: true, install: true,
c_args : package_c_args, c_args : package_c_args,
) )
install_data('edje_recc', install_dir : dir_bin)
o = join_paths(dir_bin, 'edje_recc')
meson.add_install_script(chmod, 'a+r+x', o)

View File

@ -14,3 +14,12 @@ 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,11 +1,13 @@
executable('efl_wl_test', executable('efl_wl_test',
'efl_wl_test.c', 'efl_wl_test.c',
include_directories : config_dir, include_directories : config_dir,
dependencies: [efl_wl, elementary] dependencies: [efl_wl, elementary],
install: true,
) )
executable('efl_wl_test_stack', executable('efl_wl_test_stack',
'efl_wl_test_stack.c', 'efl_wl_test_stack.c',
include_directories : config_dir, include_directories : config_dir,
dependencies: [efl_wl, elementary] dependencies: [efl_wl, elementary],
install: true,
) )

View File

@ -0,0 +1,3 @@
install_data('eina-bench-cmp', install_dir : dir_bin)
o = join_paths(dir_bin, 'eina-bench-cmp')
meson.add_install_script(chmod, 'a+r+x', o)

View File

@ -9,3 +9,7 @@ configure_file(
output: 'eo_debug', output: 'eo_debug',
configuration: eo_debug_config, configuration: eo_debug_config,
install_dir: dir_bin) install_dir: dir_bin)
# make sure it's executable
o = join_paths(dir_bin, 'eo_debug')
meson.add_install_script(chmod, 'a+r+x', o)

View File

@ -1,2 +1,3 @@
subdir('eo') subdir('eo')
subdir('elua') subdir('elua')
subdir('eina')