Commit 9d8f41a3 authored by Christian Hergert's avatar Christian Hergert

foundry: rename IdeBuildPipeline and IdeBuildStage

This renames IdeBuildPipeline to IdePipeline and IdeBuildStage to
IdePipelineStage. Additionally, IdeBuildPhase is now IdePipelinePhase.

This should help in contributors understanding the difference between
the IdeBuildSystem components and the production pipeline and it's
components.

I didn't try very hard to keep whitespace nice, because we'll probably
do a large round of that with automation tools later and I'd rather do
that as a single pass.

Also, I renamed the execute APIs to build since execute didn't really
make sense in the concepts of a build pipeline that can
build/rebuild/clean.

I would not be surprised if there is a bit of fallout from this, so better
to get it in now than later.
parent 4b491943
......@@ -5,7 +5,7 @@ Extending the Build Pipeline
Builder uses the concept of a "Build Pipeline" to build a project. The build
pipeline consistes of multiple "phases" and build "stages" run in a given phase.
For example, in the ``Ide.BuildPhase.DOWNLAODS`` phase, you might have a stage
For example, in the ``Ide.PipelinePhase.DOWNLAODS`` phase, you might have a stage
that downloads and installs the dependencies for your project. The Flatpak
extension does this when building Flatpak-based project configurations.
......@@ -15,21 +15,21 @@ executed in exactly this sequence up to the requested phase.
Build Phases
============
- ``Ide.BuildPhase.PREPARE`` is the first phase of the build pipeline. Use this to create necessary directories and other preparation steps.
- ``Ide.BuildPhase.DOWNLOADS`` should be used to download and cache any build artifacts that are needed during the build.
- ``Ide.BuildPhase.DEPENDENCIES`` should build any dependencies that are needed to successfully build the project.
- ``Ide.BuildPhase.AUTOGEN`` should generate any necessary project files. Contrast this with the ``Ide.BuildPhase.CONFIGURE`` phase which runs the configuration scripts.
- ``Ide.BuildPhase.CONFIGURE`` should run configuration scripts such as ``./configure``, ``meson``, or ``cmake``.
- ``Ide.BuildPhase.BUILD`` should perform the incremental build process such as ``make`` or ``ninja``.
- ``Ide.BuildPhase.INSTALL`` should install the project to the configured prefix.
- ``Ide.BuildPhase.EXPORT`` should be used to attach export hooks such as buliding a Flatpak bundle, Debian, or RPM package.
- ``Ide.PipelinePhase.PREPARE`` is the first phase of the build pipeline. Use this to create necessary directories and other preparation steps.
- ``Ide.PipelinePhase.DOWNLOADS`` should be used to download and cache any build artifacts that are needed during the build.
- ``Ide.PipelinePhase.DEPENDENCIES`` should build any dependencies that are needed to successfully build the project.
- ``Ide.PipelinePhase.AUTOGEN`` should generate any necessary project files. Contrast this with the ``Ide.PipelinePhase.CONFIGURE`` phase which runs the configuration scripts.
- ``Ide.PipelinePhase.CONFIGURE`` should run configuration scripts such as ``./configure``, ``meson``, or ``cmake``.
- ``Ide.PipelinePhase.BUILD`` should perform the incremental build process such as ``make`` or ``ninja``.
- ``Ide.PipelinePhase.INSTALL`` should install the project to the configured prefix.
- ``Ide.PipelinePhase.EXPORT`` should be used to attach export hooks such as buliding a Flatpak bundle, Debian, or RPM package.
Additionally, there are phases which have special meaning.
- ``Ide.BuildPhase.BEFORE`` can be XOR'd with any previous phase to indicate it should run as part of the phase, but before the phase has started.
- ``Ide.BuildPhase.AFTER`` can be XOR'd with any previous phase to indicate it should run as part of the phase, but after the phase has completed.
- ``Ide.BuildPhase.FINISHED`` indicates that a previous build request has finished.
- ``Ide.BuildPhase.FAILED`` indicates that a previous build request has failed.
- ``Ide.PipelinePhase.BEFORE`` can be XOR'd with any previous phase to indicate it should run as part of the phase, but before the phase has started.
- ``Ide.PipelinePhase.AFTER`` can be XOR'd with any previous phase to indicate it should run as part of the phase, but after the phase has completed.
- ``Ide.PipelinePhase.FINISHED`` indicates that a previous build request has finished.
- ``Ide.PipelinePhase.FAILED`` indicates that a previous build request has failed.
Creating a Build Stage
======================
......@@ -104,7 +104,7 @@ loads we will register our stage in the appropriate phase.
def do_load(self, pipeline):
stage = MyBuildStage()
phase = Ide.BuildPhase.BUILD | Ide.BuildPhase.AFTER
phase = Ide.PipelinePhase.BUILD | Ide.PipelinePhase.AFTER
stage_id = pipeline.connect(phase, 100, stage)
# track() can be used to auto-unregister the phase when
......
This diff is collapsed.
......@@ -26,7 +26,7 @@
#include <libide-core.h>
#include "ide-build-pipeline.h"
#include "ide-pipeline.h"
G_BEGIN_DECLS
......@@ -58,12 +58,12 @@ void ide_build_manager_invalidate (IdeBuildManager *s
IDE_AVAILABLE_IN_3_32
void ide_build_manager_cancel (IdeBuildManager *self);
IDE_AVAILABLE_IN_3_32
IdeBuildPipeline *ide_build_manager_get_pipeline (IdeBuildManager *self);
IdePipeline *ide_build_manager_get_pipeline (IdeBuildManager *self);
IDE_AVAILABLE_IN_3_32
IdeBuildPipeline *ide_build_manager_ref_pipeline (IdeBuildManager *self);
IdePipeline *ide_build_manager_ref_pipeline (IdeBuildManager *self);
IDE_AVAILABLE_IN_3_32
void ide_build_manager_rebuild_async (IdeBuildManager *self,
IdeBuildPhase phase,
IdePipelinePhase phase,
GPtrArray *targets,
GCancellable *cancellable,
GAsyncReadyCallback callback,
......@@ -74,7 +74,7 @@ gboolean ide_build_manager_rebuild_finish (IdeBuildManager *s
GError **error);
IDE_AVAILABLE_IN_3_32
void ide_build_manager_execute_async (IdeBuildManager *self,
IdeBuildPhase phase,
IdePipelinePhase phase,
GPtrArray *targets,
GCancellable *cancellable,
GAsyncReadyCallback callback,
......@@ -85,7 +85,7 @@ gboolean ide_build_manager_execute_finish (IdeBuildManager *s
GError **error);
IDE_AVAILABLE_IN_3_32
void ide_build_manager_clean_async (IdeBuildManager *self,
IdeBuildPhase phase,
IdePipelinePhase phase,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
......
/* ide-build-pipeline.h
*
* Copyright 2016-2019 Christian Hergert <chergert@redhat.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
#pragma once
#if !defined (IDE_FOUNDRY_INSIDE) && !defined (IDE_FOUNDRY_COMPILATION)
# error "Only <libide-foundry.h> can be included directly."
#endif
#include <libide-core.h>
#include <libide-code.h>
#include <libide-threading.h>
#include <vte/vte.h>
#include "ide-foundry-types.h"
#include "ide-build-log.h"
#include "ide-build-stage.h"
#include "ide-config.h"
#include "ide-runtime.h"
#include "ide-triplet.h"
G_BEGIN_DECLS
#define IDE_TYPE_BUILD_PIPELINE (ide_build_pipeline_get_type())
#define IDE_BUILD_PHASE_MASK (0xFFFFFF)
#define IDE_BUILD_PHASE_WHENCE_MASK (IDE_BUILD_PHASE_BEFORE | IDE_BUILD_PHASE_AFTER)
#define IDE_BUILD_ERROR (ide_build_error_quark())
typedef enum
{
IDE_BUILD_PHASE_NONE = 0,
IDE_BUILD_PHASE_PREPARE = 1 << 0,
IDE_BUILD_PHASE_DOWNLOADS = 1 << 1,
IDE_BUILD_PHASE_DEPENDENCIES = 1 << 2,
IDE_BUILD_PHASE_AUTOGEN = 1 << 3,
IDE_BUILD_PHASE_CONFIGURE = 1 << 4,
IDE_BUILD_PHASE_BUILD = 1 << 6,
IDE_BUILD_PHASE_INSTALL = 1 << 7,
IDE_BUILD_PHASE_COMMIT = 1 << 8,
IDE_BUILD_PHASE_EXPORT = 1 << 9,
IDE_BUILD_PHASE_FINAL = 1 << 10,
IDE_BUILD_PHASE_BEFORE = 1 << 28,
IDE_BUILD_PHASE_AFTER = 1 << 29,
IDE_BUILD_PHASE_FINISHED = 1 << 30,
IDE_BUILD_PHASE_FAILED = 1 << 31,
} IdeBuildPhase;
typedef enum
{
IDE_BUILD_ERROR_UNKNOWN = 0,
IDE_BUILD_ERROR_BROKEN,
IDE_BUILD_ERROR_NOT_LOADED,
IDE_BUILD_ERROR_NEEDS_REBUILD,
} IdeBuildError;
IDE_AVAILABLE_IN_3_32
G_DECLARE_FINAL_TYPE (IdeBuildPipeline, ide_build_pipeline, IDE, BUILD_PIPELINE, IdeObject)
IDE_AVAILABLE_IN_3_32
GQuark ide_build_error_quark (void) G_GNUC_CONST;
IDE_AVAILABLE_IN_3_32
gboolean ide_build_pipeline_is_native (IdeBuildPipeline *self);
IDE_AVAILABLE_IN_3_32
gboolean ide_build_pipeline_is_ready (IdeBuildPipeline *self);
IDE_AVAILABLE_IN_3_32
gboolean ide_build_pipeline_get_busy (IdeBuildPipeline *self);
IDE_AVAILABLE_IN_3_32
IdeConfig *ide_build_pipeline_get_config (IdeBuildPipeline *self);
IDE_AVAILABLE_IN_3_32
IdeDevice *ide_build_pipeline_get_device (IdeBuildPipeline *self);
IDE_AVAILABLE_IN_3_32
IdeTriplet *ide_build_pipeline_get_host_triplet (IdeBuildPipeline *self);
IDE_AVAILABLE_IN_3_32
IdeRuntime *ide_build_pipeline_get_runtime (IdeBuildPipeline *self);
IDE_AVAILABLE_IN_3_32
IdeToolchain *ide_build_pipeline_get_toolchain (IdeBuildPipeline *self);
IDE_AVAILABLE_IN_3_32
IdeToolchain *ide_build_pipeline_ref_toolchain (IdeBuildPipeline *self);
IDE_AVAILABLE_IN_3_32
const gchar *ide_build_pipeline_get_builddir (IdeBuildPipeline *self);
IDE_AVAILABLE_IN_3_32
const gchar *ide_build_pipeline_get_srcdir (IdeBuildPipeline *self);
IDE_AVAILABLE_IN_3_32
gchar *ide_build_pipeline_get_message (IdeBuildPipeline *self);
IDE_AVAILABLE_IN_3_32
IdeBuildPhase ide_build_pipeline_get_phase (IdeBuildPipeline *self);
IDE_AVAILABLE_IN_3_32
gboolean ide_build_pipeline_get_can_export (IdeBuildPipeline *self);
IDE_AVAILABLE_IN_3_32
VtePty *ide_build_pipeline_get_pty (IdeBuildPipeline *self);
IDE_AVAILABLE_IN_3_32
IdeSubprocessLauncher *ide_build_pipeline_create_launcher (IdeBuildPipeline *self,
GError **error);
IDE_AVAILABLE_IN_3_32
gchar *ide_build_pipeline_build_srcdir_path (IdeBuildPipeline *self,
const gchar *first_part,
...) G_GNUC_NULL_TERMINATED;
IDE_AVAILABLE_IN_3_32
gchar *ide_build_pipeline_build_builddir_path (IdeBuildPipeline *self,
const gchar *first_part,
...) G_GNUC_NULL_TERMINATED;
IDE_AVAILABLE_IN_3_32
void ide_build_pipeline_invalidate_phase (IdeBuildPipeline *self,
IdeBuildPhase phases);
IDE_AVAILABLE_IN_3_32
gboolean ide_build_pipeline_request_phase (IdeBuildPipeline *self,
IdeBuildPhase phase);
IDE_AVAILABLE_IN_3_32
guint ide_build_pipeline_attach (IdeBuildPipeline *self,
IdeBuildPhase phase,
gint priority,
IdeBuildStage *stage);
IDE_AVAILABLE_IN_3_32
guint ide_build_pipeline_attach_launcher (IdeBuildPipeline *self,
IdeBuildPhase phase,
gint priority,
IdeSubprocessLauncher *launcher);
IDE_AVAILABLE_IN_3_32
void ide_build_pipeline_detach (IdeBuildPipeline *self,
guint stage_id);
IDE_AVAILABLE_IN_3_32
IdeBuildStage *ide_build_pipeline_get_stage_by_id (IdeBuildPipeline *self,
guint stage_id);
IDE_AVAILABLE_IN_3_32
guint ide_build_pipeline_add_log_observer (IdeBuildPipeline *self,
IdeBuildLogObserver observer,
gpointer observer_data,
GDestroyNotify observer_data_destroy);
IDE_AVAILABLE_IN_3_32
gboolean ide_build_pipeline_remove_log_observer (IdeBuildPipeline *self,
guint observer_id);
IDE_AVAILABLE_IN_3_32
void ide_build_pipeline_emit_diagnostic (IdeBuildPipeline *self,
IdeDiagnostic *diagnostic);
IDE_AVAILABLE_IN_3_32
guint ide_build_pipeline_add_error_format (IdeBuildPipeline *self,
const gchar *regex,
GRegexCompileFlags flags);
IDE_AVAILABLE_IN_3_32
gboolean ide_build_pipeline_remove_error_format (IdeBuildPipeline *self,
guint error_format_id);
IDE_AVAILABLE_IN_3_32
void ide_build_pipeline_build_async (IdeBuildPipeline *self,
IdeBuildPhase phase,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
IDE_AVAILABLE_IN_3_32
gboolean ide_build_pipeline_build_finish (IdeBuildPipeline *self,
GAsyncResult *result,
GError **error);
IDE_AVAILABLE_IN_3_32
void ide_build_pipeline_build_targets_async (IdeBuildPipeline *self,
IdeBuildPhase phase,
GPtrArray *targets,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
IDE_AVAILABLE_IN_3_32
gboolean ide_build_pipeline_build_targets_finish (IdeBuildPipeline *self,
GAsyncResult *result,
GError **error);
IDE_AVAILABLE_IN_3_32
void ide_build_pipeline_execute_async (IdeBuildPipeline *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
IDE_AVAILABLE_IN_3_32
gboolean ide_build_pipeline_execute_finish (IdeBuildPipeline *self,
GAsyncResult *result,
GError **error);
IDE_AVAILABLE_IN_3_32
void ide_build_pipeline_foreach_stage (IdeBuildPipeline *self,
GFunc stage_callback,
gpointer user_data);
IDE_AVAILABLE_IN_3_32
void ide_build_pipeline_clean_async (IdeBuildPipeline *self,
IdeBuildPhase phase,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
IDE_AVAILABLE_IN_3_32
gboolean ide_build_pipeline_clean_finish (IdeBuildPipeline *self,
GAsyncResult *result,
GError **error);
IDE_AVAILABLE_IN_3_32
void ide_build_pipeline_rebuild_async (IdeBuildPipeline *self,
IdeBuildPhase phase,
GPtrArray *targets,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
IDE_AVAILABLE_IN_3_32
gboolean ide_build_pipeline_rebuild_finish (IdeBuildPipeline *self,
GAsyncResult *result,
GError **error);
IDE_AVAILABLE_IN_3_32
void ide_build_pipeline_attach_pty (IdeBuildPipeline *self,
IdeSubprocessLauncher *launcher);
IDE_AVAILABLE_IN_3_32
gboolean ide_build_pipeline_has_configured (IdeBuildPipeline *self);
IDE_AVAILABLE_IN_3_32
IdeBuildPhase ide_build_pipeline_get_requested_phase (IdeBuildPipeline *self);
G_END_DECLS
......@@ -26,21 +26,21 @@
G_BEGIN_DECLS
guint8 *_ide_build_utils_filter_color_codes (const guint8 *data,
gsize len,
gsize *out_len);
void _ide_build_pipeline_cancel (IdeBuildPipeline *self);
void _ide_build_pipeline_set_runtime (IdeBuildPipeline *self,
IdeRuntime *runtime);
void _ide_build_pipeline_set_toolchain (IdeBuildPipeline *self,
IdeToolchain *toolchain);
void _ide_build_pipeline_set_message (IdeBuildPipeline *self,
const gchar *message);
void _ide_build_pipeline_mark_broken (IdeBuildPipeline *self);
void _ide_build_pipeline_check_toolchain (IdeBuildPipeline *self,
IdeDeviceInfo *info);
void _ide_build_pipeline_set_pty_size (IdeBuildPipeline *self,
guint rows,
guint columns);
guint8 *_ide_build_utils_filter_color_codes (const guint8 *data,
gsize len,
gsize *out_len);
void _ide_pipeline_cancel (IdePipeline *self);
void _ide_pipeline_set_runtime (IdePipeline *self,
IdeRuntime *runtime);
void _ide_pipeline_set_toolchain (IdePipeline *self,
IdeToolchain *toolchain);
void _ide_pipeline_set_message (IdePipeline *self,
const gchar *message);
void _ide_pipeline_mark_broken (IdePipeline *self);
void _ide_pipeline_check_toolchain (IdePipeline *self,
IdeDeviceInfo *info);
void _ide_pipeline_set_pty_size (IdePipeline *self,
guint rows,
guint columns);
G_END_DECLS
......@@ -29,7 +29,7 @@
#include <string.h>
#include "ide-build-manager.h"
#include "ide-build-pipeline.h"
#include "ide-pipeline.h"
#include "ide-build-system.h"
#include "ide-config.h"
#include "ide-device.h"
......@@ -245,7 +245,7 @@ ide_build_system_default_init (IdeBuildSystemInterface *iface)
static gchar *
ide_build_system_translate (IdeBuildSystem *self,
IdeBuildPipeline *pipeline,
IdePipeline *pipeline,
const gchar *prefix,
const gchar *path)
{
......@@ -256,16 +256,16 @@ ide_build_system_translate (IdeBuildSystem *self,
IdeRuntime *runtime;
g_assert (IDE_IS_BUILD_SYSTEM (self));
g_assert (!pipeline || IDE_IS_BUILD_PIPELINE (pipeline));
g_assert (!pipeline || IDE_IS_PIPELINE (pipeline));
g_assert (prefix != NULL);
g_assert (path != NULL);
if (NULL == pipeline ||
NULL == (runtime = ide_build_pipeline_get_runtime (pipeline)))
NULL == (runtime = ide_pipeline_get_runtime (pipeline)))
return g_strdup_printf ("%s%s", prefix, path);
if (!g_path_is_absolute (path))
path = freeme = ide_build_pipeline_build_builddir_path (pipeline, path, NULL);
path = freeme = ide_pipeline_build_builddir_path (pipeline, path, NULL);
file = g_file_new_for_path (path);
translated = ide_runtime_translate_file (runtime, file);
......@@ -278,7 +278,7 @@ static void
ide_build_system_post_process_build_flags (IdeBuildSystem *self,
gchar **flags)
{
IdeBuildPipeline *pipeline;
IdePipeline *pipeline;
IdeBuildManager *build_manager;
IdeContext *context;
......@@ -449,14 +449,14 @@ ide_build_system_get_build_flags_for_files_finish (IdeBuildSystem *self,
gchar *
ide_build_system_get_builddir (IdeBuildSystem *self,
IdeBuildPipeline *pipeline)
IdePipeline *pipeline)
{
gchar *ret = NULL;
IDE_ENTRY;
g_return_val_if_fail (IDE_IS_BUILD_SYSTEM (self), NULL);
g_return_val_if_fail (IDE_IS_BUILD_PIPELINE (pipeline), NULL);
g_return_val_if_fail (IDE_IS_PIPELINE (pipeline), NULL);
if (IDE_BUILD_SYSTEM_GET_IFACE (self)->get_builddir)
ret = IDE_BUILD_SYSTEM_GET_IFACE (self)->get_builddir (self, pipeline);
......@@ -474,9 +474,9 @@ ide_build_system_get_builddir (IdeBuildSystem *self,
context = ide_object_get_context (IDE_OBJECT (self));
vcs = ide_vcs_from_context (context);
config = ide_build_pipeline_get_config (pipeline);
config = ide_pipeline_get_config (pipeline);
config_id = ide_config_get_id (config);
runtime = ide_build_pipeline_get_runtime (pipeline);
runtime = ide_pipeline_get_runtime (pipeline);
runtime_id = ide_runtime_get_id (runtime);
branch = ide_vcs_get_branch_name (vcs);
......
......@@ -58,7 +58,7 @@ struct _IdeBuildSystemInterface
GAsyncResult *result,
GError **error);
gchar *(*get_builddir) (IdeBuildSystem *self,
IdeBuildPipeline *pipeline);
IdePipeline *pipeline);
gchar *(*get_id) (IdeBuildSystem *self);
gchar *(*get_display_name) (IdeBuildSystem *self);
gboolean (*supports_toolchain) (IdeBuildSystem *self,
......@@ -76,7 +76,7 @@ IDE_AVAILABLE_IN_3_32
gint ide_build_system_get_priority (IdeBuildSystem *self);
IDE_AVAILABLE_IN_3_32
gchar *ide_build_system_get_builddir (IdeBuildSystem *self,
IdeBuildPipeline *pipeline);
IdePipeline *pipeline);
IDE_AVAILABLE_IN_3_32
gchar *ide_build_system_get_project_version (IdeBuildSystem *self);
IDE_AVAILABLE_IN_3_32
......
......@@ -24,14 +24,14 @@
#include "ide-debug.h"
#include "ide-build-pipeline.h"
#include "ide-pipeline.h"
#include "ide-deploy-strategy.h"
G_DEFINE_ABSTRACT_TYPE (IdeDeployStrategy, ide_deploy_strategy, IDE_TYPE_OBJECT)
static void
ide_deploy_strategy_real_load_async (IdeDeployStrategy *self,
IdeBuildPipeline *pipeline,
IdePipeline *pipeline,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
......@@ -58,7 +58,7 @@ ide_deploy_strategy_real_load_finish (IdeDeployStrategy *self,
static void
ide_deploy_strategy_real_deploy_async (IdeDeployStrategy *self,
IdeBuildPipeline *pipeline,
IdePipeline *pipeline,
GFileProgressCallback progress,
gpointer progress_data,
GDestroyNotify progress_data_destroy,
......@@ -103,7 +103,7 @@ ide_deploy_strategy_init (IdeDeployStrategy *self)
/**
* ide_deploy_strategy_load_async:
* @self: an #IdeDeployStrategy
* @pipeline: an #IdeBuildPipeline
* @pipeline: an #IdePipeline
* @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: a callback to execute upon completion
* @user_data: closure data for @callback
......@@ -123,7 +123,7 @@ ide_deploy_strategy_init (IdeDeployStrategy *self)
*/
void
ide_deploy_strategy_load_async (IdeDeployStrategy *self,
IdeBuildPipeline *pipeline,
IdePipeline *pipeline,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
......@@ -131,7 +131,7 @@ ide_deploy_strategy_load_async (IdeDeployStrategy *self,
IDE_ENTRY;
g_assert (IDE_IS_DEPLOY_STRATEGY (self));
g_assert (IDE_IS_BUILD_PIPELINE (pipeline));
g_assert (IDE_IS_PIPELINE (pipeline));
g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
IDE_DEPLOY_STRATEGY_GET_CLASS (self)->load_async (self, pipeline, cancellable, callback, user_data);
......@@ -172,7 +172,7 @@ ide_deploy_strategy_load_finish (IdeDeployStrategy *self,
/**
* ide_deploy_strategy_deploy_async:
* @self: a #IdeDeployStrategy
* @pipeline: an #IdeBuildPipeline
* @pipeline: an #IdePipeline
* @progress: (nullable) (closure progress_data) (scope notified):
* a #GFileProgressCallback or %NULL
* @progress_data: (nullable): closure data for @progress or %NULL
......@@ -191,7 +191,7 @@ ide_deploy_strategy_load_finish (IdeDeployStrategy *self,
*/
void
ide_deploy_strategy_deploy_async (IdeDeployStrategy *self,
IdeBuildPipeline *pipeline,
IdePipeline *pipeline,
GFileProgressCallback progress,
gpointer progress_data,
GDestroyNotify progress_data_destroy,
......@@ -202,7 +202,7 @@ ide_deploy_strategy_deploy_async (IdeDeployStrategy *self,
IDE_ENTRY;
g_assert (IDE_IS_DEPLOY_STRATEGY (self));
g_assert (IDE_IS_BUILD_PIPELINE (pipeline));
g_assert (IDE_IS_PIPELINE (pipeline));
g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
IDE_DEPLOY_STRATEGY_GET_CLASS (self)->deploy_async (self,
......
......@@ -38,7 +38,7 @@ struct _IdeDeployStrategyClass
IdeObjectClass parent;
void (*load_async) (IdeDeployStrategy *self,
IdeBuildPipeline *pipeline,
IdePipeline *pipeline,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
......@@ -46,7 +46,7 @@ struct _IdeDeployStrategyClass
GAsyncResult *result,
GError **error);
void (*deploy_async) (IdeDeployStrategy *self,
IdeBuildPipeline *pipeline,
IdePipeline *pipeline,
GFileProgressCallback progress,
gpointer progress_data,
GDestroyNotify progress_data_destroy,
......@@ -62,7 +62,7 @@ struct _IdeDeployStrategyClass
IDE_AVAILABLE_IN_3_32
void ide_deploy_strategy_load_async (IdeDeployStrategy *self,
IdeBuildPipeline *pipeline,
IdePipeline *pipeline,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
......@@ -72,7 +72,7 @@ gboolean ide_deploy_strategy_load_finish (IdeDeployStrategy *self,
GError **error);
IDE_AVAILABLE_IN_3_32
void ide_deploy_strategy_deploy_async (IdeDeployStrategy *self,
IdeBuildPipeline *pipeline,
IdePipeline *pipeline,
GFileProgressCallback progress,
gpointer progress_data,
GDestroyNotify progress_data_destroy,
......
......@@ -28,7 +28,7 @@
#include <libpeas/peas.h>
#include "ide-build-manager.h"
#include "ide-build-pipeline.h"
#include "ide-pipeline.h"
#include "ide-deploy-strategy.h"
#include "ide-device-manager.h"
#include "ide-device-private.h"
......@@ -78,7 +78,7 @@ struct _IdeDeviceManager
typedef struct
{
IdeObjectArray *strategies;
IdeBuildPipeline *pipeline;
IdePipeline *pipeline;
} DeployState;
typedef struct
......@@ -689,7 +689,7 @@ static void
ide_device_manager_action_deploy (IdeDeviceManager *self,