aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauro Moura <lauromoura@expertisesolutions.com.br>2019-03-02 11:28:53 -0300
committerLauro Moura <lauromoura@expertisesolutions.com.br>2019-03-02 12:09:55 -0300
commitcd756de66430511048d6fdba4dec88cc90bb59fb (patch)
tree8c102afbc57f1466979b4e0f8f53a207adc9154d
parentefl-mono: Add support for dotnet core (diff)
downloadefl-devs/lauromoura/dotnet.tar.gz
efl_csharp: Use cs_args instead of runtime_Assembliesdevs/lauromoura/dotnet
Summary: This will erase the need of the `runtime_assemblies` kw_arg, allowing ot use a single invocation without warnings about unsupported parameters. Reviewers: bu5hm4n Subscribers: cedric, vitor.sousa, #reviewers, felipealmeida, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8092
-rw-r--r--src/bindings/mono/meson.build38
-rw-r--r--src/tests/efl_mono/meson.build18
2 files changed, 18 insertions, 38 deletions
diff --git a/src/bindings/mono/meson.build b/src/bindings/mono/meson.build
index d14d5ad50d..7582fc2723 100644
--- a/src/bindings/mono/meson.build
+++ b/src/bindings/mono/meson.build
@@ -8,20 +8,22 @@ cs_is_dotnet = meson.get_compiler('cs').get_id().contains('dotnet')
if (cs_is_dotnet)
+warning('Dotnet support is still not upstream in meson.')
+
runtime_assemblies += [
- 'System.Console',
- 'Microsoft.CSharp',
- 'System.Collections',
- 'System.Collections.Concurrent',
- 'System.ComponentModel.Primitives',
- 'System.ComponentModel.Primitives',
- 'System.Diagnostics.Debug',
- 'System.Diagnostics.TraceSource',
- 'System.Dynamic.Runtime',
- 'System.Linq',
- 'System.Runtime',
- 'System.Runtime.Extensions',
- 'System.Security',
+ '-r:System.Console.dll',
+ '-r:Microsoft.CSharp.dll',
+ '-r:System.Collections.dll',
+ '-r:System.Collections.Concurrent.dll',
+ '-r:System.ComponentModel.Primitives.dll',
+ '-r:System.ComponentModel.Primitives.dll',
+ '-r:System.Diagnostics.Debug.dll',
+ '-r:System.Diagnostics.TraceSource.dll',
+ '-r:System.Dynamic.Runtime.dll',
+ '-r:System.Linq.dll',
+ '-r:System.Runtime.dll',
+ '-r:System.Runtime.Extensions.dll',
+ '-r:System.Security.dll',
]
endif
@@ -144,20 +146,12 @@ efl_mono_dll_config = configure_file(input : 'efl_mono.dll.config.in',
output : 'efl_mono.dll.config',
configuration : efl_mono_conf_data)
-if (cs_is_dotnet)
-efl_mono = library('efl_mono',
- mono_generator_target + mono_files + [efl_src],
- install : true,
- install_dir : join_paths(dir_lib, 'efl-mono-'+version_major),
- runtime_assemblies : 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),
+ cs_args : runtime_assemblies
)
-endif
efl_mono_test_suite_path=join_paths(meson.current_build_dir())
diff --git a/src/tests/efl_mono/meson.build b/src/tests/efl_mono/meson.build
index c07e38fa3f..ae1d76f167 100644
--- a/src/tests/efl_mono/meson.build
+++ b/src/tests/efl_mono/meson.build
@@ -31,18 +31,11 @@ foreach mono_gen_file : eo_files
'@INPUT@'])
endforeach
-if (cs_is_dotnet)
-efl_mono_test = library('efl_mono_test',
- eo_file_targets,
- link_with : [efl_mono],
- runtime_assemblies : runtime_assemblies
-)
-else
efl_mono_test = library('efl_mono_test',
eo_file_targets,
link_with : [efl_mono],
+ cs_args : runtime_assemblies
)
-endif
efl_mono_src = [
'Main.cs',
@@ -68,18 +61,11 @@ efl_mono_src = [
'Inheritance.cs',
]
-if (cs_is_dotnet)
-efl_mono_suite = executable('efl-mono-suite',
- efl_mono_src,
- link_with : [efl_mono, efl_mono_test],
- runtime_assemblies : runtime_assemblies
-)
-else
efl_mono_suite = executable('efl-mono-suite',
efl_mono_src,
link_with : [efl_mono, efl_mono_test],
+ cs_args : runtime_assemblies
)
-endif
env = environment()
env.set('MONO_PATH', efl_mono_test_suite_path )