summaryrefslogtreecommitdiff
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
parentc9dca7ce5deb86fd9252dc5d7f2301636f55a4e3 (diff)
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'],
4 meson_version : '>=0.47' 4 meson_version : '>=0.47'
5) 5)
6 6
7chmod = join_paths(meson.source_root(), 'meson/meson-chmod.sh')
8
9if host_machine.system() == 'darwin' 7if host_machine.system() == 'darwin'
10 add_languages('objc') 8 add_languages('objc')
11endif 9endif
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 @@
1#!/bin/sh
2chmod "$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',
95 c_args : package_c_args, 95 c_args : package_c_args,
96) 96)
97 97
98install_data('edje_recc', install_dir : dir_bin) 98install_data('edje_recc', install_dir : dir_bin,
99o = join_paths(dir_bin, 'edje_recc') 99 install_mode: 'rwxr-xr-x')
100meson.add_install_script(chmod, 'a+r+x', o)
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()
14else 14else
15 eet_bin = _eet_bin 15 eet_bin = _eet_bin
16endif 16endif
17
18install_data('diffeet', install_dir : dir_bin)
19o = join_paths(dir_bin, 'diffeet')
20meson.add_install_script(chmod, 'a+r+x', o)
21
22install_data('vieet', install_dir : dir_bin)
23o = join_paths(dir_bin, 'vieet')
24meson.add_install_script(chmod, 'a+r+x', o)
25
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 @@
1install_data('eina-bench-cmp', install_dir : dir_bin) 1# disabled because its a pretty useless script that forces python as a
2o = join_paths(dir_bin, 'eina-bench-cmp') 2# a dependency and doesn't parse anything efl or test apps produce
3meson.add_install_script(chmod, 'a+r+x', o) 3#install_data('eina-bench-cmp', install_dir : dir_bin,
4# 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(
8 input: 'eo_debug.in', 8 input: 'eo_debug.in',
9 output: 'eo_debug', 9 output: 'eo_debug',
10 configuration: eo_debug_config, 10 configuration: eo_debug_config,
11 install_dir: dir_bin) 11 install_dir: dir_bin,
12 12 install_mode: 'rwxr-xr-x')
13# make sure it's executable
14o = join_paths(dir_bin, 'eo_debug')
15meson.add_install_script(chmod, 'a+r+x', o)