From 595c863fed004b279517b76a02da8fae074ae3a3 Mon Sep 17 00:00:00 2001
From: Lauro Moura <lauromoura@expertisesolutions.com.br>
Date: Sat, 2 Mar 2019 15:09:55 +0000
Subject: [PATCH] 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
---
 src/bindings/mono/meson.build  | 38 ++++++++++++++--------------------
 src/tests/efl_mono/meson.build | 18 ++--------------
 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
+    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())
 
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
+    cs_args : runtime_assemblies
 )
-else
-efl_mono_test = library('efl_mono_test',
-    eo_file_targets,
-    link_with : [efl_mono],
-)
-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
+  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.set('MONO_PATH', efl_mono_test_suite_path )