summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2018-12-04 17:43:10 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2018-12-06 15:13:34 +0100
commit5b98ebab4a990bf943de2db726f9086553187350 (patch)
tree538742ea60707c2b4ae7aee373c00df0454c283d
parent29c388a35be1b216a4af8f4aa8727060e7edd1d7 (diff)
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 @@
1custom_target('edje_cc_edje_externals', 1custom_target('edje_cc_edje_externals',
2 input : 'icons.edc', 2 input : 'icons.edc',
3 output : '@BASENAME@.edj', 3 output : '@BASENAME@.edj',
4 command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta', 4 command : edje_cc_exe + [ '-beta',
5 '-id', join_paths(meson.current_source_dir()), 5 '-id', join_paths(meson.current_source_dir()),
6 '-id', elm_themes_image_include, 6 '-id', elm_themes_image_include,
7 '@INPUT@', '@OUTPUT@'], 7 '@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
19 elm_themes += custom_target('edje_cc_elm_' + edc_file, 19 elm_themes += custom_target('edje_cc_elm_' + edc_file,
20 input : edc_file, 20 input : edc_file,
21 output : '@BASENAME@.edj', 21 output : '@BASENAME@.edj',
22 command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta', 22 command : edje_cc_exe + [ '-beta',
23 '-sd', join_paths(meson.current_source_dir()), 23 '-sd', join_paths(meson.current_source_dir()),
24 '-id', elm_themes_image_include, 24 '-id', elm_themes_image_include,
25 '-id', join_paths(meson.current_source_dir()), 25 '-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
10 elm_themes += custom_target('edje_cc_' + edc_file, 10 elm_themes += custom_target('edje_cc_' + edc_file,
11 input : edc_file, 11 input : edc_file,
12 output : '@BASENAME@.edj', 12 output : '@BASENAME@.edj',
13 command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta', 13 command : edje_cc_exe + [ '-beta',
14 '-sd', join_paths(meson.current_source_dir(), 'snd'), 14 '-sd', join_paths(meson.current_source_dir(), 'snd'),
15 '-id', elm_themes_image_include, 15 '-id', elm_themes_image_include,
16 '-id', join_paths(meson.current_source_dir(), 'fdo'), 16 '-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')
3custom_target('edje_cc_ethumb_frame', 3custom_target('edje_cc_ethumb_frame',
4 input : ethumb_frame, 4 input : ethumb_frame,
5 output : '@BASENAME@.edj', 5 output : '@BASENAME@.edj',
6 command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta', 6 command : edje_cc_exe + [ '-beta',
7 '-sd', join_paths(meson.current_source_dir()), 7 '-sd', join_paths(meson.current_source_dir()),
8 '-id', join_paths(meson.current_source_dir()), 8 '-id', join_paths(meson.current_source_dir()),
9 '-fd', join_paths(meson.current_source_dir()), 9 '-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',
30 link_args : bin_linker_args 30 link_args : bin_linker_args
31) 31)
32 32
33env = find_program('env')
34
35edje_cc_exe = [env, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()]
36
33edje_decc_src = [ 37edje_decc_src = [
34 'edje_decc.c', 38 'edje_decc.c',
35 'edje_decc.h', 39 '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
62 themes += custom_target('edje_cc_' + edc_file, 62 themes += custom_target('edje_cc_' + edc_file,
63 input : edc_file, 63 input : edc_file,
64 output : '@BASENAME@.edj', 64 output : '@BASENAME@.edj',
65 command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta', 65 command : edje_cc_exe + [ '-beta',
66 '-id', meson.current_source_dir(), 66 '-id', meson.current_source_dir(),
67 '-fd', meson.current_source_dir(), 67 '-fd', meson.current_source_dir(),
68 '-sd', meson.current_source_dir(), 68 '-sd', meson.current_source_dir(),
@@ -77,7 +77,7 @@ endforeach
77codegen = custom_target('edje_cc_codegen_edc', 77codegen = custom_target('edje_cc_codegen_edc',
78 input : 'codegen.edc', 78 input : 'codegen.edc',
79 output : '@BASENAME@.edj', 79 output : '@BASENAME@.edj',
80 command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta', 80 command : edje_cc_exe + [ '-beta',
81 '-id', meson.current_source_dir(), 81 '-id', meson.current_source_dir(),
82 '-fd', meson.current_source_dir(), 82 '-fd', meson.current_source_dir(),
83 '-sd', meson.current_source_dir(), 83 '-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
8 themes += custom_target('edje_cc_' + edc_file, 8 themes += custom_target('edje_cc_' + edc_file,
9 input : edc_file, 9 input : edc_file,
10 output : '@BASENAME@.edj', 10 output : '@BASENAME@.edj',
11 command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta', 11 command : edje_cc_exe + [ '-beta',
12 '-id', meson.current_source_dir(), 12 '-id', meson.current_source_dir(),
13 '-fd', meson.current_source_dir(), 13 '-fd', meson.current_source_dir(),
14 '-sd', meson.current_source_dir(), 14 '-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
25 themes += custom_target('edje_cc_' + edc_file, 25 themes += custom_target('edje_cc_' + edc_file,
26 input : edc_file, 26 input : edc_file,
27 output : '@BASENAME@.edj', 27 output : '@BASENAME@.edj',
28 command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta', 28 command : edje_cc_exe + [ '-beta',
29 '-id', join_paths(meson.source_root(), 'src', 'tests', 'emotion', 'data'), 29 '-id', join_paths(meson.source_root(), 'src', 'tests', 'emotion', 'data'),
30 '-fd', meson.current_source_dir(), 30 '-fd', meson.current_source_dir(),
31 '-sd', meson.current_source_dir(), 31 '-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
6 themes += custom_target('edje_cc_' + edc_file, 6 themes += custom_target('edje_cc_' + edc_file,
7 input : edc_file, 7 input : edc_file,
8 output : '@BASENAME@.edj', 8 output : '@BASENAME@.edj',
9 command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta', 9 command : edje_cc_exe + [ '-beta',
10 '-id', join_paths(meson.source_root(), 'src', 'tests', 'emotion', 'data'), 10 '-id', join_paths(meson.source_root(), 'src', 'tests', 'emotion', 'data'),
11 '-fd', meson.current_source_dir(), 11 '-fd', meson.current_source_dir(),
12 '-sd', meson.current_source_dir(), 12 '-sd', meson.current_source_dir(),
@@ -16,4 +16,4 @@ foreach edc_file : edc_files
16 '-td', meson.current_source_dir(), 16 '-td', meson.current_source_dir(),
17 '@INPUT@', '@OUTPUT@'], 17 '@INPUT@', '@OUTPUT@'],
18 depends : edje_cc) 18 depends : edje_cc)
19endforeach \ No newline at end of file 19endforeach
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
8 themes += custom_target('edje_cc_' + edc_file, 8 themes += custom_target('edje_cc_' + edc_file,
9 input : edc_file, 9 input : edc_file,
10 output : '@BASENAME@.edj', 10 output : '@BASENAME@.edj',
11 command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta', 11 command : edje_cc_exe + [ '-beta',
12 '-id', meson.current_source_dir(), 12 '-id', meson.current_source_dir(),
13 '-fd', meson.current_source_dir(), 13 '-fd', meson.current_source_dir(),
14 '-sd', meson.current_source_dir(), 14 '-sd', meson.current_source_dir(),
@@ -18,4 +18,4 @@ foreach edc_file : edc_files
18 '-td', meson.current_source_dir(), 18 '-td', meson.current_source_dir(),
19 '@INPUT@', '@OUTPUT@'], 19 '@INPUT@', '@OUTPUT@'],
20 depends : edje_cc) 20 depends : edje_cc)
21endforeach \ No newline at end of file 21endforeach