summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-12-27 15:24:08 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-12-27 15:24:08 +0000
commitf532be51bc4414975e0fb0a5798eb96151219dea (patch)
treefa868d7549e4b3e115cacb3226af61f8bf557c60 /src
parent91990b7cf8024d13a89edbeddb873869eda21a87 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/bin/edje/meson.build4
-rw-r--r--src/bin/eet/meson.build9
-rw-r--r--src/bin/efl_wl/meson.build6
-rw-r--r--src/scripts/eina/meson.build3
-rw-r--r--src/scripts/eo/meson.build4
-rw-r--r--src/scripts/meson.build1
6 files changed, 25 insertions, 2 deletions
diff --git a/src/bin/edje/meson.build b/src/bin/edje/meson.build
index 24d62ead62..2a54e7da1c 100644
--- a/src/bin/edje/meson.build
+++ b/src/bin/edje/meson.build
@@ -94,3 +94,7 @@ edje_watch = executable('edje_watch',
94 install: true, 94 install: true,
95 c_args : package_c_args, 95 c_args : package_c_args,
96) 96)
97
98install_data('edje_recc', install_dir : dir_bin)
99o = join_paths(dir_bin, 'edje_recc')
100meson.add_install_script(chmod, 'a+r+x', o)
diff --git a/src/bin/eet/meson.build b/src/bin/eet/meson.build
index 6f742aea6a..f2b7b4a67b 100644
--- a/src/bin/eet/meson.build
+++ b/src/bin/eet/meson.build
@@ -14,3 +14,12 @@ 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/bin/efl_wl/meson.build b/src/bin/efl_wl/meson.build
index 5f0d655cb0..c95cd0e767 100644
--- a/src/bin/efl_wl/meson.build
+++ b/src/bin/efl_wl/meson.build
@@ -1,11 +1,13 @@
1executable('efl_wl_test', 1executable('efl_wl_test',
2 'efl_wl_test.c', 2 'efl_wl_test.c',
3 include_directories : config_dir, 3 include_directories : config_dir,
4 dependencies: [efl_wl, elementary] 4 dependencies: [efl_wl, elementary],
5 install: true,
5) 6)
6 7
7executable('efl_wl_test_stack', 8executable('efl_wl_test_stack',
8 'efl_wl_test_stack.c', 9 'efl_wl_test_stack.c',
9 include_directories : config_dir, 10 include_directories : config_dir,
10 dependencies: [efl_wl, elementary] 11 dependencies: [efl_wl, elementary],
12 install: true,
11) 13)
diff --git a/src/scripts/eina/meson.build b/src/scripts/eina/meson.build
new file mode 100644
index 0000000000..aacf0a7c94
--- /dev/null
+++ b/src/scripts/eina/meson.build
@@ -0,0 +1,3 @@
1install_data('eina-bench-cmp', install_dir : dir_bin)
2o = join_paths(dir_bin, 'eina-bench-cmp')
3meson.add_install_script(chmod, 'a+r+x', o)
diff --git a/src/scripts/eo/meson.build b/src/scripts/eo/meson.build
index bdb2803541..164f672177 100644
--- a/src/scripts/eo/meson.build
+++ b/src/scripts/eo/meson.build
@@ -9,3 +9,7 @@ configure_file(
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
13# make sure it's executable
14o = join_paths(dir_bin, 'eo_debug')
15meson.add_install_script(chmod, 'a+r+x', o)
diff --git a/src/scripts/meson.build b/src/scripts/meson.build
index 6057ad788a..304d437753 100644
--- a/src/scripts/meson.build
+++ b/src/scripts/meson.build
@@ -1,2 +1,3 @@
1subdir('eo') 1subdir('eo')
2subdir('elua') 2subdir('elua')
3subdir('eina')