From f4285f350e1acf6ffe10a6dafff4028c0d142924 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Tue, 27 Nov 2018 13:35:28 +0100 Subject: Initial automatic target file generation --- mesonbuild/msetup.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mesonbuild/msetup.py') diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py index 56a0e9a..10eecd8 100644 --- a/mesonbuild/msetup.py +++ b/mesonbuild/msetup.py @@ -23,6 +23,7 @@ import argparse from . import environment, interpreter, mesonlib from . import build from . import mlog, coredata +from . import mintro from .mesonlib import MesonException def add_arguments(parser): @@ -215,6 +216,9 @@ class MesonApp: coredata.write_cmd_line_file(self.build_dir, self.options) else: coredata.update_cmd_line_file(self.build_dir, self.options) + + # Generate an IDE introspection file with the exact same syntax as the introspection API defined in mintro + mintro.generate_introspection_file(b.environment.get_coredata(), b, b.get_tests(), b.get_benchmarks(), intr.backend.create_install_data()) except: if 'cdf' in locals(): old_cdf = cdf + '.prev' -- cgit v1.1 From 111e596200ac613f9e50a05d60410604fdd0ca61 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Tue, 27 Nov 2018 15:11:47 +0100 Subject: Fixed tests and benchmarks --- mesonbuild/msetup.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'mesonbuild/msetup.py') diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py index 10eecd8..d5709f1 100644 --- a/mesonbuild/msetup.py +++ b/mesonbuild/msetup.py @@ -217,8 +217,11 @@ class MesonApp: else: coredata.update_cmd_line_file(self.build_dir, self.options) - # Generate an IDE introspection file with the exact same syntax as the introspection API defined in mintro - mintro.generate_introspection_file(b.environment.get_coredata(), b, b.get_tests(), b.get_benchmarks(), intr.backend.create_install_data()) + # Generate an IDE introspection file with the same syntax as the already existing API + intro_tests = intr.backend.create_test_serialisation(b.get_tests()) + intro_benchmarks = intr.backend.create_test_serialisation(b.get_benchmarks()) + intro_install = intr.backend.create_install_data() + mintro.generate_introspection_file(b.environment.get_coredata(), b, intro_tests, intro_benchmarks, intro_install) except: if 'cdf' in locals(): old_cdf = cdf + '.prev' -- cgit v1.1 From 74274e23ca42260e9be24c3cfaf7550c6c1505d2 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Wed, 28 Nov 2018 16:43:48 +0100 Subject: Moved the source and compiler generation to the backend --- mesonbuild/msetup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/msetup.py') diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py index d5709f1..88c9251 100644 --- a/mesonbuild/msetup.py +++ b/mesonbuild/msetup.py @@ -221,7 +221,7 @@ class MesonApp: intro_tests = intr.backend.create_test_serialisation(b.get_tests()) intro_benchmarks = intr.backend.create_test_serialisation(b.get_benchmarks()) intro_install = intr.backend.create_install_data() - mintro.generate_introspection_file(b.environment.get_coredata(), b, intro_tests, intro_benchmarks, intro_install) + mintro.generate_introspection_file(b, intr.backend) except: if 'cdf' in locals(): old_cdf = cdf + '.prev' -- cgit v1.1 From a5be893b19daf9e1f08eacc5d7f01389f6e40956 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Wed, 28 Nov 2018 19:40:16 +0100 Subject: Some code cleanup --- mesonbuild/msetup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mesonbuild/msetup.py') diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py index 88c9251..491ea2f 100644 --- a/mesonbuild/msetup.py +++ b/mesonbuild/msetup.py @@ -221,7 +221,11 @@ class MesonApp: intro_tests = intr.backend.create_test_serialisation(b.get_tests()) intro_benchmarks = intr.backend.create_test_serialisation(b.get_benchmarks()) intro_install = intr.backend.create_install_data() - mintro.generate_introspection_file(b, intr.backend) + if self.options.profile: + fname = os.path.join(self.build_dir, 'meson-private', 'profile-introspector.log') + profile.runctx('mintro.generate_introspection_file(b, intr.backend)', globals(), locals(), filename=fname) + else: + mintro.generate_introspection_file(b, intr.backend) except: if 'cdf' in locals(): old_cdf = cdf + '.prev' -- cgit v1.1 From c4eb5c79fe89ca49dd9d9f5bd72be99d919dd2a0 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Thu, 29 Nov 2018 12:56:52 +0100 Subject: Added unit test --- mesonbuild/msetup.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'mesonbuild/msetup.py') diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py index 491ea2f..402f756 100644 --- a/mesonbuild/msetup.py +++ b/mesonbuild/msetup.py @@ -218,9 +218,6 @@ class MesonApp: coredata.update_cmd_line_file(self.build_dir, self.options) # Generate an IDE introspection file with the same syntax as the already existing API - intro_tests = intr.backend.create_test_serialisation(b.get_tests()) - intro_benchmarks = intr.backend.create_test_serialisation(b.get_benchmarks()) - intro_install = intr.backend.create_install_data() if self.options.profile: fname = os.path.join(self.build_dir, 'meson-private', 'profile-introspector.log') profile.runctx('mintro.generate_introspection_file(b, intr.backend)', globals(), locals(), filename=fname) -- cgit v1.1