Commit 5f35b191 authored by Christian Hergert's avatar Christian Hergert
Browse files

make: add support for "make run" when running project

This uses a fairly common convention to use a "run" target in the Makefile
to run the project. We still require that there is an install target
because the run manager requires that the project is installed before it
can be run.
parent 6134beb9
......@@ -19,17 +19,17 @@ import gi
gi.require_version('Ide', '1.0')
from gi.repository import (
from gi.repository import GObject
from gi.repository import Gio
from gi.repository import GLib
from gi.repository import Ide
_ = Ide.gettext
class MakeBuildSystem(Ide.Object, Ide.BuildSystem, Gio.AsyncInitable):
project_file = GObject.Property(type=Gio.File)
make_dir = GObject.Property(type=Gio.File)
run_args = None
def do_get_id(self):
return 'make'
......@@ -132,6 +132,60 @@ class MakePipelineAddin(Ide.Object, Ide.BuildPipelineAddin):
install_stage.set_name(_("Install project"))
self.track(pipeline.connect(Ide.BuildPhase.INSTALL, 0, install_stage))
# Determine what it will take to "make run" for this pipeline
# and stash it on the build_system for use by the build target.
# This allows us to run Make projects as long as the makefile
# has a "run" target.
build_system.run_args = [make, '-C', build_system.get_make_dir().get_path(), 'run']
def _query(self, stage, pipeline, cancellable):
class MakeBuildTarget(Ide.Object, Ide.BuildTarget):
def do_get_install_directory(self):
return None
def do_get_name(self):
return 'make-run'
def do_get_language(self):
# Not meaningful, since we have an indirect process.
return 'make'
def do_get_argv(self):
context = self.get_context()
build_system = context.get_build_system()
assert type(build_system) == MakeBuildSystem
return build_system.run_args
def do_get_priority(self):
return 0
class MakeBuildTargetProvider(Ide.Object, Ide.BuildTargetProvider):
The MakeBuildTargetProvider just wraps a "make run" command. If the
Makefile doesn't have a run target, we'll just fail to execute and the user
should get the warning in their application output (and can update their
Makefile appropriately).
def do_get_targets_async(self, cancellable, callback, data):
task =, cancellable, callback)
context = self.get_context()
build_system = context.get_build_system()
if type(build_system) != MakeBuildSystem:
task.return_error(GLib.Error('Not a make build system',
task.targets = [MakeBuildTarget(context=self.get_context())]
def do_get_targets_finish(self, result):
if result.propagate_boolean():
return result.targets
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment