aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2018-12-04 17:43:10 +0100
committerChristopher Michael <cp.michael@samsung.com>2018-12-06 12:06:17 -0500
commitf5b45a266eaa83477f9c85aa7786323c6b0357d9 (patch)
tree514d0a8efe8ee4ee9d295e5d079c5a3e692c454e
parentefl: fix misspelt focused in API and documents. (diff)
downloadefl-f5b45a266eaa83477f9c85aa7786323c6b0357d9.tar.gz
meson: abstract edje_cc exec lines
the array is calling the shell etc. this makes cross building easier. Differential Revision: https://phab.enlightenment.org/D7413
-rw-r--r--data/elementary/edje_externals/meson.build2
-rw-r--r--data/elementary/objects/meson.build2
-rw-r--r--data/elementary/themes/meson.build2
-rw-r--r--data/ethumb/frames/meson.build2
-rw-r--r--src/bin/edje/meson.build4
-rw-r--r--src/examples/edje/meson.build4
-rw-r--r--src/modules/ethumb/emotion/meson.build2
-rw-r--r--src/tests/edje/data/meson.build2
-rw-r--r--src/tests/edje/tests/meson.build4
-rw-r--r--src/tests/emotion/data/meson.build4
10 files changed, 16 insertions, 12 deletions
diff --git a/data/elementary/edje_externals/meson.build b/data/elementary/edje_externals/meson.build
index cc24430052..445a673198 100644
--- a/data/elementary/edje_externals/meson.build
+++ b/data/elementary/edje_externals/meson.build
@@ -1,7 +1,7 @@
custom_target('edje_cc_edje_externals',
input : 'icons.edc',
output : '@BASENAME@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-id', join_paths(meson.current_source_dir()),
'-id', elm_themes_image_include,
'@INPUT@', '@OUTPUT@'],
diff --git a/data/elementary/objects/meson.build b/data/elementary/objects/meson.build
index a25a719852..5e262e74d2 100644
--- a/data/elementary/objects/meson.build
+++ b/data/elementary/objects/meson.build
@@ -19,7 +19,7 @@ foreach edc_file : edc_files
elm_themes += custom_target('edje_cc_elm_' + edc_file,
input : edc_file,
output : '@BASENAME@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-sd', join_paths(meson.current_source_dir()),
'-id', elm_themes_image_include,
'-id', join_paths(meson.current_source_dir()),
diff --git a/data/elementary/themes/meson.build b/data/elementary/themes/meson.build
index c8c8816470..b8aa6bb7b3 100644
--- a/data/elementary/themes/meson.build
+++ b/data/elementary/themes/meson.build
@@ -10,7 +10,7 @@ foreach edc_file : edc_files
elm_themes += custom_target('edje_cc_' + edc_file,
input : edc_file,
output : '@BASENAME@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-sd', join_paths(meson.current_source_dir(), 'snd'),
'-id', elm_themes_image_include,
'-id', join_paths(meson.current_source_dir(), 'fdo'),
diff --git a/data/ethumb/frames/meson.build b/data/ethumb/frames/meson.build
index a696af0c41..2031fc4ea9 100644
--- a/data/ethumb/frames/meson.build
+++ b/data/ethumb/frames/meson.build
@@ -3,7 +3,7 @@ ethumb_frame = files('default.edc')
custom_target('edje_cc_ethumb_frame',
input : ethumb_frame,
output : '@BASENAME@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-sd', join_paths(meson.current_source_dir()),
'-id', join_paths(meson.current_source_dir()),
'-fd', join_paths(meson.current_source_dir()),
diff --git a/src/bin/edje/meson.build b/src/bin/edje/meson.build
index c7e5f397c2..83e4cbbde3 100644
--- a/src/bin/edje/meson.build
+++ b/src/bin/edje/meson.build
@@ -30,6 +30,10 @@ edje_cc = executable('edje_cc',
link_args : bin_linker_args
)
+env = find_program('env')
+
+edje_cc_exe = [env, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()]
+
edje_decc_src = [
'edje_decc.c',
'edje_decc.h',
diff --git a/src/examples/edje/meson.build b/src/examples/edje/meson.build
index 49e7e53c73..69b19b0c52 100644
--- a/src/examples/edje/meson.build
+++ b/src/examples/edje/meson.build
@@ -62,7 +62,7 @@ foreach edc_file : edc_files
themes += custom_target('edje_cc_' + edc_file,
input : edc_file,
output : '@BASENAME@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-id', meson.current_source_dir(),
'-fd', meson.current_source_dir(),
'-sd', meson.current_source_dir(),
@@ -77,7 +77,7 @@ endforeach
codegen = custom_target('edje_cc_codegen_edc',
input : 'codegen.edc',
output : '@BASENAME@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-id', meson.current_source_dir(),
'-fd', meson.current_source_dir(),
'-sd', meson.current_source_dir(),
diff --git a/src/modules/ethumb/emotion/meson.build b/src/modules/ethumb/emotion/meson.build
index 52f4b442a6..2acd578103 100644
--- a/src/modules/ethumb/emotion/meson.build
+++ b/src/modules/ethumb/emotion/meson.build
@@ -8,7 +8,7 @@ foreach edc_file : edc_files
themes += custom_target('edje_cc_' + edc_file,
input : edc_file,
output : '@BASENAME@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-id', meson.current_source_dir(),
'-fd', meson.current_source_dir(),
'-sd', meson.current_source_dir(),
diff --git a/src/tests/edje/data/meson.build b/src/tests/edje/data/meson.build
index af7e04bf0e..cf10bd9355 100644
--- a/src/tests/edje/data/meson.build
+++ b/src/tests/edje/data/meson.build
@@ -25,7 +25,7 @@ foreach edc_file : edc_files
themes += custom_target('edje_cc_' + edc_file,
input : edc_file,
output : '@BASENAME@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-id', join_paths(meson.source_root(), 'src', 'tests', 'emotion', 'data'),
'-fd', meson.current_source_dir(),
'-sd', meson.current_source_dir(),
diff --git a/src/tests/edje/tests/meson.build b/src/tests/edje/tests/meson.build
index 4780bcaeba..6b1e43eb58 100644
--- a/src/tests/edje/tests/meson.build
+++ b/src/tests/edje/tests/meson.build
@@ -6,7 +6,7 @@ foreach edc_file : edc_files
themes += custom_target('edje_cc_' + edc_file,
input : edc_file,
output : '@BASENAME@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-id', join_paths(meson.source_root(), 'src', 'tests', 'emotion', 'data'),
'-fd', meson.current_source_dir(),
'-sd', meson.current_source_dir(),
@@ -16,4 +16,4 @@ foreach edc_file : edc_files
'-td', meson.current_source_dir(),
'@INPUT@', '@OUTPUT@'],
depends : edje_cc)
-endforeach \ No newline at end of file
+endforeach
diff --git a/src/tests/emotion/data/meson.build b/src/tests/emotion/data/meson.build
index 82c3c03ad8..7402b3a19b 100644
--- a/src/tests/emotion/data/meson.build
+++ b/src/tests/emotion/data/meson.build
@@ -8,7 +8,7 @@ foreach edc_file : edc_files
themes += custom_target('edje_cc_' + edc_file,
input : edc_file,
output : '@BASENAME@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-id', meson.current_source_dir(),
'-fd', meson.current_source_dir(),
'-sd', meson.current_source_dir(),
@@ -18,4 +18,4 @@ foreach edc_file : edc_files
'-td', meson.current_source_dir(),
'@INPUT@', '@OUTPUT@'],
depends : edje_cc)
-endforeach \ No newline at end of file
+endforeach