aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-12-27 16:29:16 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-12-27 17:17:13 +0000
commitb03c818b1c29ed57953175d4585d930ce05f94f5 (patch)
treea8ee66c05cf38f1763aee45a28713a8c34b3e910
parentmeson - re-enable emotion_test binaries and data like autofoo (diff)
downloadefl-b03c818b1c29ed57953175d4585d930ce05f94f5.tar.gz
meson - dont install eina bench cmp and use install_mode
-rw-r--r--meson.build2
-rwxr-xr-xmeson/meson-chmod.sh2
-rw-r--r--src/bin/edje/meson.build5
-rw-r--r--src/bin/eet/meson.build9
-rw-r--r--src/scripts/eina/meson.build7
-rw-r--r--src/scripts/eo/meson.build7
6 files changed, 8 insertions, 24 deletions
diff --git a/meson.build b/meson.build
index b3845ab124..448d60a479 100644
--- a/meson.build
+++ b/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
diff --git a/meson/meson-chmod.sh b/meson/meson-chmod.sh
deleted file mode 100755
index e72cb72c58..0000000000
--- a/meson/meson-chmod.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-chmod "$1" "${DESTDIR}/$2" && touch "${DESTDIR}/$2"
diff --git a/src/bin/edje/meson.build b/src/bin/edje/meson.build
index 2a54e7da1c..89d6382fae 100644
--- a/src/bin/edje/meson.build
+++ b/src/bin/edje/meson.build
@@ -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')
diff --git a/src/bin/eet/meson.build b/src/bin/eet/meson.build
index f2b7b4a67b..6f742aea6a 100644
--- a/src/bin/eet/meson.build
+++ b/src/bin/eet/meson.build
@@ -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)
-
diff --git a/src/scripts/eina/meson.build b/src/scripts/eina/meson.build
index aacf0a7c94..d1d10ab6bf 100644
--- a/src/scripts/eina/meson.build
+++ b/src/scripts/eina/meson.build
@@ -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')
diff --git a/src/scripts/eo/meson.build b/src/scripts/eo/meson.build
index 164f672177..19a1419c53 100644
--- a/src/scripts/eo/meson.build
+++ b/src/scripts/eo/meson.build
@@ -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')