aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauro Moura <lauromoura@expertisesolutions.com.br>2019-08-22 20:44:08 -0300
committerLauro Moura <lauromoura@expertisesolutions.com.br>2019-08-22 20:44:08 -0300
commitc0de5529d93f9ad4f81e410c471904e7c5f719ea (patch)
tree410a23d548a2e7a8eb854c7d5f6d56c4e6855890
parentcsharp: Only build extension methods for beta (diff)
downloadefl-devs/lauromoura/dotnet-upstream.tar.gz
-rw-r--r--src/bindings/mono/efl_sharp.csproj.in8
-rw-r--r--src/bindings/mono/meson.build6
-rw-r--r--src/tests/efl_mono/meson.build18
3 files changed, 22 insertions, 10 deletions
diff --git a/src/bindings/mono/efl_sharp.csproj.in b/src/bindings/mono/efl_sharp.csproj.in
index ffc9615a09..4286c5666d 100644
--- a/src/bindings/mono/efl_sharp.csproj.in
+++ b/src/bindings/mono/efl_sharp.csproj.in
@@ -28,4 +28,12 @@
<Compile Include="@BINDING_SRC@/eldbus_mono/*.cs" />
</ItemGroup>
+ <!-- Calling `dotnet build` from a different folder seems to mess up the automatic source file discovery.
+ But we want them to be included only when building the lib itself.
+ -->
+ <ItemGroup Condition="'$(BuildingLib)'=='Yes'">
+ <Compile Include="./efl_mono/*.cs" />
+ <Compile Include="./*.cs" />
+ </ItemGroup>
+
</Project>
diff --git a/src/bindings/mono/meson.build b/src/bindings/mono/meson.build
index af1818bfda..b539953322 100644
--- a/src/bindings/mono/meson.build
+++ b/src/bindings/mono/meson.build
@@ -147,7 +147,11 @@ if (get_option('dotnet'))
#output: 'Efl.Csharp.' + meson.project_version() + '.nupkg',
output: 'efl_sharp.dll',
build_by_default: true,
- command: [dotnet, 'build', '-o', meson.current_build_dir(), lib_csproj],
+ command: [dotnet,
+ 'build',
+ '-o', meson.current_build_dir(),
+ '-p:BuildingLib=Yes',
+ lib_csproj],
#install: true,
#install_dir: efl_mono_install_dir,
)
diff --git a/src/tests/efl_mono/meson.build b/src/tests/efl_mono/meson.build
index 8af5073164..546f8a8f22 100644
--- a/src/tests/efl_mono/meson.build
+++ b/src/tests/efl_mono/meson.build
@@ -75,19 +75,19 @@ if get_option('dotnet')
configuration: dotnet_test_conf_data,
)
- efl_mono_restore = custom_target('efl_mono_test_restore',
- input: dotnet_test_csproj,
- depends: [efl_mono],
- output: 'test_restore.txt',
- #output: 'packages.lock.json',
- #command: [dotnet, 'restore', '-f', '--no-cache', '--use-lock-file', dotnet_test_csproj],
- command: [dotnet, 'restore', '-f', '--no-cache', dotnet_test_csproj],
- )
+ #efl_mono_restore = custom_target('efl_mono_test_restore',
+ # input: dotnet_test_csproj,
+ # depends: [efl_mono],
+ # output: 'test_restore.txt',
+ # #output: 'packages.lock.json',
+ # #command: [dotnet, 'restore', '-f', '--no-cache', '--use-lock-file', dotnet_test_csproj],
+ # command: [dotnet, 'restore', '-f', '--no-cache', dotnet_test_csproj],
+ #)
efl_mono_suite = custom_target('efl_mono_test',
input: eo_file_targets + [dotnet_test_csproj],
output: 'efl_sharp_test_suite.dll',
- depends: [efl_mono, efl_mono_restore],
+ depends: [efl_mono],
build_by_default: true,
command: [dotnet,
'build',