From f7d58d7b6f433f71d6832fb0fa318dd91971f5fd Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Fri, 18 Jul 2014 23:18:26 +0300 Subject: Some fixes. --- ninjabackend.py | 7 ++++++- test cases/csharp/1 basic/installed_files.txt | 1 + test cases/csharp/1 basic/meson.build | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 test cases/csharp/1 basic/installed_files.txt diff --git a/ninjabackend.py b/ninjabackend.py index a58f6c3aa..21dfd351c 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -438,11 +438,16 @@ class NinjaBackend(backends.Backend): subdir = target.get_subdir() outname_rel = os.path.join(subdir, fname) src_list = target.get_sources() - class_list = [] compiler = self.get_compiler_for_source(src_list[0]) assert(compiler.get_language() == 'cs') rel_srcs = [os.path.join(self.build_to_src, s) for s in src_list] commands = [] + if isinstance(target, build.Executable): + commands.append('-target:exe') + elif isinstance(target, build.SharedLibrary): + commands.append('-target:library') + else: + raise MesonException('Unknown C# target type.') commands += compiler.get_output_args(outname_rel) elem = NinjaBuildElement(outname_rel, 'cs_COMPILER', rel_srcs) elem.add_item('ARGS', commands) diff --git a/test cases/csharp/1 basic/installed_files.txt b/test cases/csharp/1 basic/installed_files.txt new file mode 100644 index 000000000..3e9301715 --- /dev/null +++ b/test cases/csharp/1 basic/installed_files.txt @@ -0,0 +1 @@ +bin/prog.exe diff --git a/test cases/csharp/1 basic/meson.build b/test cases/csharp/1 basic/meson.build index 5a1b7b3ee..2ee6a4a93 100644 --- a/test cases/csharp/1 basic/meson.build +++ b/test cases/csharp/1 basic/meson.build @@ -1,4 +1,4 @@ project('simple c#', 'cs') -e = executable('prog', 'prog.cs') +e = executable('prog', 'prog.cs', install : true) test('basic', e) -- cgit v1.2.3