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
This commit is contained in:
Marcel Hollerbach 2018-12-04 17:43:10 +01:00 committed by Christopher Michael
parent b985a3b0f9
commit f5b45a266e
10 changed files with 16 additions and 12 deletions

View File

@ -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@'],

View File

@ -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()),

View File

@ -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'),

View File

@ -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()),

View File

@ -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',

View File

@ -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(),

View File

@ -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(),

View File

@ -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(),

View File

@ -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(),

View File

@ -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(),