GNOME.org
 

[gnome-builder] config: move build configuration types to src/libide/config/

commit 304bf9e1db963431057a4c07657016e5158ef99a
Author: Christian Hergert <chergert redhat com>
Date:   Tue Jan 23 15:57:34 2018 -0800

    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.

 .../ide-buildconfig-configuration-provider.c        |  6 +++---
 .../buildconfig/ide-buildconfig-configuration.h     |  2 +-
 src/libide/buildconfig/ide-buildconfig-plugin.c     |  2 +-
 src/libide/buildsystem/ide-build-manager.c          |  4 ++--
 src/libide/buildsystem/ide-build-pipeline.h         |  2 +-
 src/libide/buildsystem/ide-build-system.c           |  2 +-
 src/libide/buildsystem/meson.build                  |  7 -------
 .../ide-configuration-manager.c                     |  6 +++---
 .../ide-configuration-manager.h                     |  0
 .../ide-configuration-provider.c                    |  4 ++--
 .../ide-configuration-provider.h                    |  0
 .../{buildsystem => config}/ide-configuration.c     |  4 ++--
 .../{buildsystem => config}/ide-configuration.h     |  0
 src/libide/config/meson.build                       | 21 +++++++++++++++++++++
 src/libide/devices/ide-device.c                     |  2 +-
 src/libide/ide-context.c                            |  2 +-
 src/libide/ide-enums.c.in                           |  2 +-
 src/libide/ide.h                                    |  6 +++---
 src/libide/meson.build                              |  1 +
 src/libide/runner/ide-run-manager.c                 |  4 ++--
 src/libide/runner/ide-runner.c                      |  4 ++--
 src/libide/runtimes/ide-runtime-manager.c           |  2 +-
 src/libide/runtimes/ide-runtime-provider.c          |  2 +-
 src/libide/runtimes/ide-runtime.c                   |  2 +-
 src/libide/workbench/ide-omni-bar.c                 |  4 ++--
 .../flatpak/gbp-flatpak-configuration-provider.c    |  9 ++-------
 26 files changed, 55 insertions(+), 45 deletions(-)
---
diff --git a/src/libide/buildconfig/ide-buildconfig-configuration-provider.c 
b/src/libide/buildconfig/ide-buildconfig-configuration-provider.c
index 56724bd73..13d535d63 100644
--- a/src/libide/buildconfig/ide-buildconfig-configuration-provider.c
+++ b/src/libide/buildconfig/ide-buildconfig-configuration-provider.c
@@ -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"
 
diff --git a/src/libide/buildconfig/ide-buildconfig-configuration.h 
b/src/libide/buildconfig/ide-buildconfig-configuration.h
index 99d5f8b01..8a8018d58 100644
--- a/src/libide/buildconfig/ide-buildconfig-configuration.h
+++ b/src/libide/buildconfig/ide-buildconfig-configuration.h
@@ -20,7 +20,7 @@
 
 #include "ide-version-macros.h"
 
-#include "buildsystem/ide-configuration.h"
+#include "config/ide-configuration.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/libide/buildconfig/ide-buildconfig-plugin.c b/src/libide/buildconfig/ide-buildconfig-plugin.c
index 05a19582a..4a2316313 100644
--- a/src/libide/buildconfig/ide-buildconfig-plugin.c
+++ b/src/libide/buildconfig/ide-buildconfig-plugin.c
@@ -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)
diff --git a/src/libide/buildsystem/ide-build-manager.c b/src/libide/buildsystem/ide-build-manager.c
index 5211224a1..e3e9dd463 100644
--- a/src/libide/buildsystem/ide-build-manager.c
+++ b/src/libide/buildsystem/ide-build-manager.c
@@ -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"
diff --git a/src/libide/buildsystem/ide-build-pipeline.h b/src/libide/buildsystem/ide-build-pipeline.h
index 87c908e61..364a8eef2 100644
--- a/src/libide/buildsystem/ide-build-pipeline.h
+++ b/src/libide/buildsystem/ide-build-pipeline.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"
 
diff --git a/src/libide/buildsystem/ide-build-system.c b/src/libide/buildsystem/ide-build-system.c
index dcf0ee47f..aee64fb98 100644
--- a/src/libide/buildsystem/ide-build-system.c
+++ b/src/libide/buildsystem/ide-build-system.c
@@ -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"
diff --git a/src/libide/buildsystem/meson.build b/src/libide/buildsystem/meson.build
index 72cf254b9..29a6c8eb7 100644
--- a/src/libide/buildsystem/meson.build
+++ b/src/libide/buildsystem/meson.build
@@ -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)
diff --git a/src/libide/buildsystem/ide-configuration-manager.c 
b/src/libide/config/ide-configuration-manager.c
similarity index 99%
rename from src/libide/buildsystem/ide-configuration-manager.c
rename to src/libide/config/ide-configuration-manager.c
index 454bc7cf2..89baafa75 100644
--- a/src/libide/buildsystem/ide-configuration-manager.c
+++ b/src/libide/config/ide-configuration-manager.c
@@ -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"
diff --git a/src/libide/buildsystem/ide-configuration-manager.h 
b/src/libide/config/ide-configuration-manager.h
similarity index 100%
rename from src/libide/buildsystem/ide-configuration-manager.h
rename to src/libide/config/ide-configuration-manager.h
diff --git a/src/libide/buildsystem/ide-configuration-provider.c 
b/src/libide/config/ide-configuration-provider.c
similarity index 98%
rename from src/libide/buildsystem/ide-configuration-provider.c
rename to src/libide/config/ide-configuration-provider.c
index 6ef6c40c5..ed70947a1 100644
--- a/src/libide/buildsystem/ide-configuration-provider.c
+++ b/src/libide/config/ide-configuration-provider.c
@@ -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)
 
diff --git a/src/libide/buildsystem/ide-configuration-provider.h 
b/src/libide/config/ide-configuration-provider.h
similarity index 100%
rename from src/libide/buildsystem/ide-configuration-provider.h
rename to src/libide/config/ide-configuration-provider.h
diff --git a/src/libide/buildsystem/ide-configuration.c b/src/libide/config/ide-configuration.c
similarity index 99%
rename from src/libide/buildsystem/ide-configuration.c
rename to src/libide/config/ide-configuration.c
index 3cba6ea41..ccb144475 100644
--- a/src/libide/buildsystem/ide-configuration.c
+++ b/src/libide/config/ide-configuration.c
@@ -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"
diff --git a/src/libide/buildsystem/ide-configuration.h b/src/libide/config/ide-configuration.h
similarity index 100%
rename from src/libide/buildsystem/ide-configuration.h
rename to src/libide/config/ide-configuration.h
diff --git a/src/libide/config/meson.build b/src/libide/config/meson.build
new file mode 100644
index 000000000..85a3a9e71
--- /dev/null
+++ b/src/libide/config/meson.build
@@ -0,0 +1,21 @@
+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'))
diff --git a/src/libide/devices/ide-device.c b/src/libide/devices/ide-device.c
index 64299d24d..d1ade5bb8 100644
--- a/src/libide/devices/ide-device.c
+++ b/src/libide/devices/ide-device.c
@@ -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
diff --git a/src/libide/ide-context.c b/src/libide/ide-context.c
index 64f2ea85e..58838c458 100644
--- a/src/libide/ide-context.c
+++ b/src/libide/ide-context.c
@@ -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"
diff --git a/src/libide/ide-enums.c.in b/src/libide/ide-enums.c.in
index 42394ae51..096864179 100644
--- a/src/libide/ide-enums.c.in
+++ b/src/libide/ide-enums.c.in
@@ -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"
diff --git a/src/libide/ide.h b/src/libide/ide.h
index 1b25742d2..859bdc637 100644
--- a/src/libide/ide.h
+++ b/src/libide/ide.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"
diff --git a/src/libide/meson.build b/src/libide/meson.build
index fec2e9f34..34d08e0c1 100644
--- a/src/libide/meson.build
+++ b/src/libide/meson.build
@@ -55,6 +55,7 @@ subdir('buildconfig')
 subdir('buildui')
 subdir('buildsystem')
 subdir('buffers')
+subdir('config')
 subdir('debugger')
 subdir('devices')
 subdir('diagnostics')
diff --git a/src/libide/runner/ide-run-manager.c b/src/libide/runner/ide-run-manager.c
index bcc6528b1..469fead5d 100644
--- a/src/libide/runner/ide-run-manager.c
+++ b/src/libide/runner/ide-run-manager.c
@@ -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"
diff --git a/src/libide/runner/ide-runner.c b/src/libide/runner/ide-runner.c
index d6b86327c..9da1f21c6 100644
--- a/src/libide/runner/ide-runner.c
+++ b/src/libide/runner/ide-runner.c
@@ -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"
diff --git a/src/libide/runtimes/ide-runtime-manager.c b/src/libide/runtimes/ide-runtime-manager.c
index ed9b3b482..992f7b70f 100644
--- a/src/libide/runtimes/ide-runtime-manager.c
+++ b/src/libide/runtimes/ide-runtime-manager.c
@@ -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"
diff --git a/src/libide/runtimes/ide-runtime-provider.c b/src/libide/runtimes/ide-runtime-provider.c
index 38d31fe50..8a227f820 100644
--- a/src/libide/runtimes/ide-runtime-provider.c
+++ b/src/libide/runtimes/ide-runtime-provider.c
@@ -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"
 
diff --git a/src/libide/runtimes/ide-runtime.c b/src/libide/runtimes/ide-runtime.c
index 710927650..fb098711d 100644
--- a/src/libide/runtimes/ide-runtime.c
+++ b/src/libide/runtimes/ide-runtime.c
@@ -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"
diff --git a/src/libide/workbench/ide-omni-bar.c b/src/libide/workbench/ide-omni-bar.c
index 8b10d5bd6..ad5ddfaeb 100644
--- a/src/libide/workbench/ide-omni-bar.c
+++ b/src/libide/workbench/ide-omni-bar.c
@@ -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"
diff --git a/src/plugins/flatpak/gbp-flatpak-configuration-provider.c 
b/src/plugins/flatpak/gbp-flatpak-configuration-provider.c
index 48390f1d2..06174abfb 100644
--- a/src/plugins/flatpak/gbp-flatpak-configuration-provider.c
+++ b/src/plugins/flatpak/gbp-flatpak-configuration-provider.c
@@ -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
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]