[gnome-builder] waf: add --prefix= and config options from build config
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] waf: add --prefix= and config options from build config
- Date: Thu, 21 Feb 2019 20:37:01 +0000 (UTC)
commit c87233c900bfeba77dbceb46093e901ec83fe7c8
Author: Christian Hergert <chergert redhat com>
Date: Thu Feb 21 12:34:40 2019 -0800
waf: add --prefix= and config options from build config
src/plugins/waf/waf_plugin.py | 5 +++++
1 file changed, 5 insertions(+)
---
diff --git a/src/plugins/waf/waf_plugin.py b/src/plugins/waf/waf_plugin.py
index 80fd1dbea..f4d9ab66d 100644
--- a/src/plugins/waf/waf_plugin.py
+++ b/src/plugins/waf/waf_plugin.py
@@ -71,6 +71,8 @@ class WafPipelineAddin(Ide.Object, Ide.PipelineAddin):
context = self.get_context()
build_system = Ide.BuildSystem.from_context(context)
srcdir = pipeline.get_srcdir()
+ config = pipeline.get_config()
+ config_opts = config.get_config_opts()
# Ignore pipeline unless this is a waf project
if type(build_system) != WafBuildSystem:
@@ -86,6 +88,9 @@ class WafPipelineAddin(Ide.Object, Ide.PipelineAddin):
config_launcher.push_argv(python)
config_launcher.push_argv('waf')
config_launcher.push_argv('configure')
+ config_launcher.push_argv('--prefix=%s' % config.get_prefix())
+ if config_opts:
+ config_launcher.push_args(config_opts)
self.track(pipeline.attach_launcher(Ide.PipelinePhase.CONFIGURE, 0, config_launcher))
# Now create our launcher to build the project
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]