[gnome-builder] meson: Fix overriding configuration of Ide.Builder
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] meson: Fix overriding configuration of Ide.Builder
- Date: Wed, 14 Dec 2016 22:45:50 +0000 (UTC)
commit 533e1cc7d86892fa9b0b0fe2c68a4fe5eb614d35
Author: Patrick Griffis <tingping tingping se>
Date: Wed Dec 14 17:45:16 2016 -0500
meson: Fix overriding configuration of Ide.Builder
plugins/meson/meson_plugin/__init__.py | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/plugins/meson/meson_plugin/__init__.py b/plugins/meson/meson_plugin/__init__.py
index 4565e12..19f8494 100644
--- a/plugins/meson/meson_plugin/__init__.py
+++ b/plugins/meson/meson_plugin/__init__.py
@@ -65,11 +65,6 @@ class MesonBuildSystem(Ide.Object, Ide.BuildSystem, Gio.AsyncInitable):
class MesonBuilder(Ide.Builder):
- configuration = GObject.Property(type=Ide.Configuration)
-
- def __init__(self, **kwargs):
- super().__init__(**kwargs)
-
def _get_build_dir(self) -> Gio.File:
context = self.get_context()
@@ -102,7 +97,7 @@ class MesonBuilder(Ide.Builder):
def do_build_async(self, flags, cancellable, callback, data=None):
task = Gio.Task.new(self, cancellable, callback)
- task.build_result = MesonBuildResult(self.configuration,
+ task.build_result = MesonBuildResult(self.props.configuration,
self._get_build_dir(),
self._get_source_dir(),
cancellable,
@@ -138,7 +133,7 @@ class MesonBuilder(Ide.Builder):
def do_install_async(self, cancellable, callback, data=None):
task = Gio.Task.new(self, cancellable, callback)
- task.build_result = MesonBuildResult(self.configuration,
+ task.build_result = MesonBuildResult(self.props.configuration,
self._get_build_dir(),
self._get_source_dir(),
cancellable)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]