meson - dont install eina bench cmp and use install_mode

devs/herdsman/staging
Carsten Haitzler 4 years ago
parent c9dca7ce5d
commit b03c818b1c
  1. 2
      meson.build
  2. 2
      meson/meson-chmod.sh
  3. 5
      src/bin/edje/meson.build
  4. 9
      src/bin/eet/meson.build
  5. 7
      src/scripts/eina/meson.build
  6. 7
      src/scripts/eo/meson.build

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

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

@ -95,6 +95,5 @@ edje_watch = executable('edje_watch',
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)
install_data('edje_recc', install_dir : dir_bin,
install_mode: 'rwxr-xr-x')

@ -14,12 +14,3 @@ if meson.is_cross_build()
else
eet_bin = _eet_bin
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)

@ -1,3 +1,4 @@
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)
# disabled because its a pretty useless script that forces python as a
# a dependency and doesn't parse anything efl or test apps produce
#install_data('eina-bench-cmp', install_dir : dir_bin,
# install_mode: 'rwxr-xr-x')

@ -8,8 +8,5 @@ configure_file(
input: 'eo_debug.in',
output: 'eo_debug',
configuration: eo_debug_config,
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)
install_dir: dir_bin,
install_mode: 'rwxr-xr-x')

Loading…
Cancel
Save