aboutsummaryrefslogtreecommitdiffstats
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
parentmeson - fix pc file versions that were missing mirco version (diff)
downloadefl-f532be51bc4414975e0fb0a5798eb96151219dea.tar.gz
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
-rw-r--r--meson.build3
-rwxr-xr-xmeson/meson-chmod.sh2
-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
8 files changed, 29 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index 876d885a2a..b3845ab124 100644
--- a/meson.build
+++ b/meson.build
@@ -4,11 +4,12 @@ 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
-
clean_check = run_command('meson/clean_check.sh')
if clean_check.returncode() == 0
error('Meson build requires a clean source tree')
diff --git a/meson/meson-chmod.sh b/meson/meson-chmod.sh
new file mode 100755
index 0000000000..e72cb72c58
--- /dev/null
+++ b/meson/meson-chmod.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+chmod "$1" "${DESTDIR}/$2" && touch "${DESTDIR}/$2"
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',
install: true,
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)
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()
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/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 @@
executable('efl_wl_test',
'efl_wl_test.c',
include_directories : config_dir,
- dependencies: [efl_wl, elementary]
+ dependencies: [efl_wl, elementary],
+ install: true,
)
executable('efl_wl_test_stack',
'efl_wl_test_stack.c',
include_directories : config_dir,
- dependencies: [efl_wl, elementary]
+ dependencies: [efl_wl, elementary],
+ install: true,
)
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 @@
+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)
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(
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)
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 @@
subdir('eo')
subdir('elua')
+subdir('eina')