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
devs/larrylira/viewtree
Marcel Hollerbach 4 years ago committed by Stefan Schmidt
parent 29c388a35b
commit 5b98ebab4a
  1. 2
      data/elementary/edje_externals/meson.build
  2. 2
      data/elementary/objects/meson.build
  3. 2
      data/elementary/themes/meson.build
  4. 2
      data/ethumb/frames/meson.build
  5. 4
      src/bin/edje/meson.build
  6. 4
      src/examples/edje/meson.build
  7. 2
      src/modules/ethumb/emotion/meson.build
  8. 2
      src/tests/edje/data/meson.build
  9. 4
      src/tests/edje/tests/meson.build
  10. 4
      src/tests/emotion/data/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@'],

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

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

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

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

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

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

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

@ -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
endforeach

@ -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
endforeach

Loading…
Cancel
Save