orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

efl_csharp: Use cs_args instead of runtime_Assemblies 

This will erase the need of the `runtime_assemblies` kw_arg, allowing ot
use a single invocation without warnings about unsupported parameters.

Reviewed-by: Marcel Hollerbach <marcel-hollerbach@t-online.de>
Differential Revision: https://phab.enlightenment.org/D8092
This commit is contained in:
Lauro Moura 2019-03-02 15:09:55 +00:00 committed by Marcel Hollerbach
parent 7eb60a371e
commit 595c863fed
2 changed files with 18 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/bindings/mono/meson.build
View File

@ -8,20 +8,22 @@ cs_is_dotnet = meson.get_compiler('cs').get_id().contains('dotnet')
if (cs_is_dotnet) if (cs_is_dotnet)
warning('Dotnet support is still not upstream in meson.')
runtime_assemblies += [ runtime_assemblies += [
'System.Console', '-r:System.Console.dll',
'Microsoft.CSharp', '-r:Microsoft.CSharp.dll',
'System.Collections', '-r:System.Collections.dll',
'System.Collections.Concurrent', '-r:System.Collections.Concurrent.dll',
'System.ComponentModel.Primitives', '-r:System.ComponentModel.Primitives.dll',
'System.ComponentModel.Primitives', '-r:System.ComponentModel.Primitives.dll',
'System.Diagnostics.Debug', '-r:System.Diagnostics.Debug.dll',
'System.Diagnostics.TraceSource', '-r:System.Diagnostics.TraceSource.dll',
'System.Dynamic.Runtime', '-r:System.Dynamic.Runtime.dll',
'System.Linq', '-r:System.Linq.dll',
'System.Runtime', '-r:System.Runtime.dll',
'System.Runtime.Extensions', '-r:System.Runtime.Extensions.dll',
'System.Security', '-r:System.Security.dll',
] ]
endif endif
@ -144,20 +146,12 @@ efl_mono_dll_config = configure_file(input : 'efl_mono.dll.config.in',
output : 'efl_mono.dll.config', output : 'efl_mono.dll.config',
configuration : efl_mono_conf_data) configuration : efl_mono_conf_data)
if (cs_is_dotnet)
efl_mono = library('efl_mono', efl_mono = library('efl_mono',
mono_generator_target + mono_files + [efl_src], mono_generator_target + mono_files + [efl_src],
install : true, install : true,
install_dir : join_paths(dir_lib, 'efl-mono-'+version_major), install_dir : join_paths(dir_lib, 'efl-mono-'+version_major),
runtime_assemblies : runtime_assemblies cs_args : runtime_assemblies
) )
else
efl_mono = library('efl_mono',
mono_generator_target + mono_files + [efl_src],
install : true,
install_dir : join_paths(dir_lib, 'efl-mono-'+version_major),
)
endif
efl_mono_test_suite_path=join_paths(meson.current_build_dir()) efl_mono_test_suite_path=join_paths(meson.current_build_dir())

18
src/tests/efl_mono/meson.build
View File

@ -31,18 +31,11 @@ foreach mono_gen_file : eo_files
'@INPUT@']) '@INPUT@'])
endforeach endforeach
if (cs_is_dotnet)
efl_mono_test = library('efl_mono_test', efl_mono_test = library('efl_mono_test',
eo_file_targets, eo_file_targets,
link_with : [efl_mono], link_with : [efl_mono],
runtime_assemblies : runtime_assemblies cs_args : runtime_assemblies
) )
else
efl_mono_test = library('efl_mono_test',
eo_file_targets,
link_with : [efl_mono],
)
endif
efl_mono_src = [ efl_mono_src = [
'Main.cs', 'Main.cs',
@ -68,18 +61,11 @@ efl_mono_src = [
'Inheritance.cs', 'Inheritance.cs',
] ]
if (cs_is_dotnet)
efl_mono_suite = executable('efl-mono-suite', efl_mono_suite = executable('efl-mono-suite',
efl_mono_src, efl_mono_src,
link_with : [efl_mono, efl_mono_test], link_with : [efl_mono, efl_mono_test],
runtime_assemblies : runtime_assemblies cs_args : runtime_assemblies
) )
else
efl_mono_suite = executable('efl-mono-suite',
efl_mono_src,
link_with : [efl_mono, efl_mono_test],
)
endif
env = environment() env = environment()
env.set('MONO_PATH', efl_mono_test_suite_path ) env.set('MONO_PATH', efl_mono_test_suite_path )