summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLauro Moura <lauromoura@expertisesolutions.com.br>2019-03-02 15:09:55 +0000
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-03-06 19:05:50 +0100
commit595c863fed004b279517b76a02da8fae074ae3a3 (patch)
tree31274ce520d50a0e2e4104e32e31d2c6621ca6fe /src
parent7eb60a371ece859f18bdc146b68d75067691ef1b (diff)
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
Diffstat (limited to 'src')
-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')
8 8
9if (cs_is_dotnet) 9if (cs_is_dotnet)
10 10
11warning('Dotnet support is still not upstream in meson.')
12
11runtime_assemblies += [ 13runtime_assemblies += [
12 'System.Console', 14 '-r:System.Console.dll',
13 'Microsoft.CSharp', 15 '-r:Microsoft.CSharp.dll',
14 'System.Collections', 16 '-r:System.Collections.dll',
15 'System.Collections.Concurrent', 17 '-r:System.Collections.Concurrent.dll',
16 'System.ComponentModel.Primitives', 18 '-r:System.ComponentModel.Primitives.dll',
17 'System.ComponentModel.Primitives', 19 '-r:System.ComponentModel.Primitives.dll',
18 'System.Diagnostics.Debug', 20 '-r:System.Diagnostics.Debug.dll',
19 'System.Diagnostics.TraceSource', 21 '-r:System.Diagnostics.TraceSource.dll',
20 'System.Dynamic.Runtime', 22 '-r:System.Dynamic.Runtime.dll',
21 'System.Linq', 23 '-r:System.Linq.dll',
22 'System.Runtime', 24 '-r:System.Runtime.dll',
23 'System.Runtime.Extensions', 25 '-r:System.Runtime.Extensions.dll',
24 'System.Security', 26 '-r:System.Security.dll',
25] 27]
26 28
27endif 29endif
@@ -144,20 +146,12 @@ efl_mono_dll_config = configure_file(input : 'efl_mono.dll.config.in',
144 output : 'efl_mono.dll.config', 146 output : 'efl_mono.dll.config',
145 configuration : efl_mono_conf_data) 147 configuration : efl_mono_conf_data)
146 148
147if (cs_is_dotnet)
148efl_mono = library('efl_mono',
149 mono_generator_target + mono_files + [efl_src],
150 install : true,
151 install_dir : join_paths(dir_lib, 'efl-mono-'+version_major),
152 runtime_assemblies : runtime_assemblies
153)
154else
155efl_mono = library('efl_mono', 149efl_mono = library('efl_mono',
156 mono_generator_target + mono_files + [efl_src], 150 mono_generator_target + mono_files + [efl_src],
157 install : true, 151 install : true,
158 install_dir : join_paths(dir_lib, 'efl-mono-'+version_major), 152 install_dir : join_paths(dir_lib, 'efl-mono-'+version_major),
153 cs_args : runtime_assemblies
159) 154)
160endif
161 155
162efl_mono_test_suite_path=join_paths(meson.current_build_dir()) 156efl_mono_test_suite_path=join_paths(meson.current_build_dir())
163 157
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
31 '@INPUT@']) 31 '@INPUT@'])
32endforeach 32endforeach
33 33
34if (cs_is_dotnet)
35efl_mono_test = library('efl_mono_test',
36 eo_file_targets,
37 link_with : [efl_mono],
38 runtime_assemblies : runtime_assemblies
39)
40else
41efl_mono_test = library('efl_mono_test', 34efl_mono_test = library('efl_mono_test',
42 eo_file_targets, 35 eo_file_targets,
43 link_with : [efl_mono], 36 link_with : [efl_mono],
37 cs_args : runtime_assemblies
44) 38)
45endif
46 39
47efl_mono_src = [ 40efl_mono_src = [
48 'Main.cs', 41 'Main.cs',
@@ -68,18 +61,11 @@ efl_mono_src = [
68 'Inheritance.cs', 61 'Inheritance.cs',
69] 62]
70 63
71if (cs_is_dotnet)
72efl_mono_suite = executable('efl-mono-suite',
73 efl_mono_src,
74 link_with : [efl_mono, efl_mono_test],
75 runtime_assemblies : runtime_assemblies
76)
77else
78efl_mono_suite = executable('efl-mono-suite', 64efl_mono_suite = executable('efl-mono-suite',
79 efl_mono_src, 65 efl_mono_src,
80 link_with : [efl_mono, efl_mono_test], 66 link_with : [efl_mono, efl_mono_test],
67 cs_args : runtime_assemblies
81) 68)
82endif
83 69
84env = environment() 70env = environment()
85env.set('MONO_PATH', efl_mono_test_suite_path ) 71env.set('MONO_PATH', efl_mono_test_suite_path )