Commit 304bf9e1 authored by Christian Hergert's avatar Christian Hergert

config: move build configuration types to src/libide/config/

This code has expanded a bit, so it would be nice to have it
compartmentalized before we do some more refactoring.
parent ada0b34f
......@@ -26,9 +26,9 @@
#include "buildconfig/ide-buildconfig-configuration.h"
#include "buildconfig/ide-buildconfig-configuration-provider.h"
#include "buildsystem/ide-configuration-manager.h"
#include "buildsystem/ide-configuration-provider.h"
#include "buildsystem/ide-configuration.h"
#include "config/ide-configuration-manager.h"
#include "config/ide-configuration-provider.h"
#include "config/ide-configuration.h"
#include "buildsystem/ide-environment.h"
#include "vcs/ide-vcs.h"
......
......@@ -20,7 +20,7 @@
#include "ide-version-macros.h"
#include "buildsystem/ide-configuration.h"
#include "config/ide-configuration.h"
G_BEGIN_DECLS
......
......@@ -23,7 +23,7 @@
#include "buildconfig/ide-buildconfig-configuration-provider.h"
#include "buildconfig/ide-buildconfig-pipeline-addin.h"
#include "buildsystem/ide-build-pipeline-addin.h"
#include "buildsystem/ide-configuration-provider.h"
#include "config/ide-configuration-provider.h"
void
ide_buildconfig_register_types (PeasObjectModule *module)
......
......@@ -29,8 +29,8 @@
#include "buildsystem/ide-build-manager.h"
#include "buildsystem/ide-build-pipeline.h"
#include "buildsystem/ide-build-private.h"
#include "buildsystem/ide-configuration-manager.h"
#include "buildsystem/ide-configuration.h"
#include "config/ide-configuration-manager.h"
#include "config/ide-configuration.h"
#include "diagnostics/ide-diagnostic.h"
#include "diagnostics/ide-diagnostics-manager.h"
#include "runtimes/ide-runtime.h"
......
......@@ -27,7 +27,7 @@
#include "buildsystem/ide-build-log.h"
#include "buildsystem/ide-build-stage.h"
#include "buildsystem/ide-configuration.h"
#include "config/ide-configuration.h"
#include "runtimes/ide-runtime.h"
#include "subprocess/ide-subprocess-launcher.h"
......
......@@ -27,7 +27,7 @@
#include "buildsystem/ide-build-manager.h"
#include "buildsystem/ide-build-pipeline.h"
#include "buildsystem/ide-build-system.h"
#include "buildsystem/ide-configuration.h"
#include "config/ide-configuration.h"
#include "files/ide-file.h"
#include "projects/ide-project.h"
#include "util/ide-glib.h"
......
......@@ -13,9 +13,6 @@ buildsystem_headers = [
'ide-build-target-provider.h',
'ide-build-utils.h',
'ide-compile-commands.h',
'ide-configuration-manager.h',
'ide-configuration-provider.h',
'ide-configuration.h',
'ide-dependency-updater.h',
'ide-environment-variable.h',
'ide-environment.h',
......@@ -35,9 +32,6 @@ buildsystem_sources = [
'ide-build-target-provider.c',
'ide-build-utils.c',
'ide-compile-commands.c',
'ide-configuration-manager.c',
'ide-configuration-provider.c',
'ide-configuration.c',
'ide-dependency-updater.c',
'ide-environment-variable.c',
'ide-environment.c',
......@@ -52,7 +46,6 @@ buildsystem_private_sources = [
buildsystem_enums = [
'ide-build-log.h',
'ide-build-pipeline.h',
'ide-configuration.h',
]
libide_enum_headers += files(buildsystem_enums)
......
......@@ -24,9 +24,9 @@
#include "ide-context.h"
#include "ide-debug.h"
#include "buildsystem/ide-configuration-manager.h"
#include "buildsystem/ide-configuration.h"
#include "buildsystem/ide-configuration-provider.h"
#include "config/ide-configuration-manager.h"
#include "config/ide-configuration.h"
#include "config/ide-configuration-provider.h"
#include "buildconfig/ide-buildconfig-configuration.h"
#include "buildconfig/ide-buildconfig-configuration-provider.h"
......
......@@ -19,8 +19,8 @@
#define G_LOG_DOMAIN "ide-configuration-provider"
#include "application/ide-application.h"
#include "buildsystem/ide-configuration-manager.h"
#include "buildsystem/ide-configuration-provider.h"
#include "config/ide-configuration-manager.h"
#include "config/ide-configuration-provider.h"
G_DEFINE_INTERFACE (IdeConfigurationProvider, ide_configuration_provider, IDE_TYPE_OBJECT)
......
......@@ -24,8 +24,8 @@
#include "ide-debug.h"
#include "ide-enums.h"
#include "buildsystem/ide-configuration.h"
#include "buildsystem/ide-configuration-manager.h"
#include "config/ide-configuration.h"
#include "config/ide-configuration-manager.h"
#include "buildsystem/ide-environment.h"
#include "devices/ide-device-manager.h"
#include "devices/ide-device.h"
......
config_headers = [
'ide-configuration-manager.h',
'ide-configuration-provider.h',
'ide-configuration.h',
]
config_sources = [
'ide-configuration-manager.c',
'ide-configuration-provider.c',
'ide-configuration.c',
]
config_enums = [
'ide-configuration.h',
]
libide_enum_headers += files(config_enums)
libide_public_headers += files(config_headers)
libide_public_sources += files(config_sources)
install_headers(config_headers, subdir: join_paths(libide_header_subdir, 'config'))
......@@ -20,7 +20,7 @@
#include <glib/gi18n.h>
#include "buildsystem/ide-configuration.h"
#include "config/ide-configuration.h"
#include "devices/ide-device.h"
typedef struct
......
......@@ -37,7 +37,7 @@
#include "buildsystem/ide-build-manager.h"
#include "buildsystem/ide-build-system.h"
#include "buildsystem/ide-build-system-discovery.h"
#include "buildsystem/ide-configuration-manager.h"
#include "config/ide-configuration-manager.h"
#include "diagnostics/ide-diagnostics-manager.h"
#include "debugger/ide-debug-manager.h"
#include "devices/ide-device-manager.h"
......
......@@ -7,7 +7,7 @@
#include "buffers/ide-buffer.h"
#include "buildsystem/ide-build-log.h"
#include "buildsystem/ide-build-pipeline.h"
#include "buildsystem/ide-configuration.h"
#include "config/ide-configuration.h"
#include "devices/ide-device.h"
#include "diagnostics/ide-diagnostic.h"
#include "doap/ide-doap.h"
......
......@@ -59,12 +59,12 @@ G_BEGIN_DECLS
#include "buildsystem/ide-build-target.h"
#include "buildsystem/ide-build-target-provider.h"
#include "buildsystem/ide-compile-commands.h"
#include "buildsystem/ide-configuration-manager.h"
#include "buildsystem/ide-configuration.h"
#include "buildsystem/ide-configuration-provider.h"
#include "buildsystem/ide-dependency-updater.h"
#include "buildsystem/ide-environment-variable.h"
#include "buildsystem/ide-environment.h"
#include "config/ide-configuration.h"
#include "config/ide-configuration-manager.h"
#include "config/ide-configuration-provider.h"
#include "debugger/ide-debug-manager.h"
#include "debugger/ide-debugger-breakpoint.h"
#include "debugger/ide-debugger-breakpoints.h"
......
......@@ -55,6 +55,7 @@ subdir('buildconfig')
subdir('buildui')
subdir('buildsystem')
subdir('buffers')
subdir('config')
subdir('debugger')
subdir('devices')
subdir('diagnostics')
......
......@@ -29,8 +29,8 @@
#include "buildsystem/ide-build-system.h"
#include "buildsystem/ide-build-target.h"
#include "buildsystem/ide-build-target-provider.h"
#include "buildsystem/ide-configuration.h"
#include "buildsystem/ide-configuration-manager.h"
#include "config/ide-configuration.h"
#include "config/ide-configuration-manager.h"
#include "buildsystem/ide-environment.h"
#include "runner/ide-run-manager.h"
#include "runner/ide-run-manager-private.h"
......
......@@ -28,8 +28,8 @@
#include "ide-context.h"
#include "ide-debug.h"
#include "buildsystem/ide-configuration.h"
#include "buildsystem/ide-configuration-manager.h"
#include "config/ide-configuration.h"
#include "config/ide-configuration-manager.h"
#include "runner/ide-runner.h"
#include "runner/ide-runner-addin.h"
#include "runtimes/ide-runtime.h"
......
......@@ -24,7 +24,7 @@
#include "ide-context.h"
#include "ide-debug.h"
#include "buildsystem/ide-configuration.h"
#include "config/ide-configuration.h"
#include "runtimes/ide-runtime.h"
#include "runtimes/ide-runtime-manager.h"
#include "runtimes/ide-runtime-provider.h"
......
......@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-runtime-provider"
#include "buildsystem/ide-configuration.h"
#include "config/ide-configuration.h"
#include "runtimes/ide-runtime-manager.h"
#include "runtimes/ide-runtime-provider.h"
......
......@@ -24,7 +24,7 @@
#include "ide-context.h"
#include "ide-debug.h"
#include "buildsystem/ide-configuration.h"
#include "config/ide-configuration.h"
#include "projects/ide-project.h"
#include "runtimes/ide-runtime.h"
#include "subprocess/ide-subprocess.h"
......
......@@ -27,8 +27,8 @@
#include "buildsystem/ide-build-manager.h"
#include "buildsystem/ide-build-pipeline.h"
#include "buildsystem/ide-build-system.h"
#include "buildsystem/ide-configuration.h"
#include "buildsystem/ide-configuration-manager.h"
#include "config/ide-configuration.h"
#include "config/ide-configuration-manager.h"
#include "projects/ide-project.h"
#include "runtimes/ide-runtime.h"
#include "util/ide-gtk.h"
......
......@@ -18,17 +18,12 @@
#define G_LOG_DOMAIN "gbp-flatpak-configuration-provider"
#include <string.h>
#include <flatpak.h>
#include <json-glib/json-glib.h>
#include <string.h>
#include "util/ide-posix.h"
#include "buildsystem/ide-environment.h"
#include "buildsystem/ide-configuration.h"
#include "buildsystem/ide-configuration-provider.h"
#include "gbp-flatpak-configuration-provider.h"
#include "gbp-flatpak-configuration.h"
#include "gbp-flatpak-configuration-provider.h"
#define WRITEBACK_TIMEOUT_SECS 2
#define DISCOVERY_MAX_DEPTH 3
......
Markdown is supported
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