Commit d0121822 authored by Christian Hergert's avatar Christian Hergert
Browse files

build: reorganize libide

The libide/ directory was getting a bit out of control. The number of files
in the directory was simply too much to make it easy for newcomers to
find what they are looking for.

This breaks things up into a bunch of, somewhat logical, directories.

We no longer use a bunch of crazy include paths with -I, and instead
include the directory name when including as such:

  #include "buffers/ide-buffer.h"

This will hopefully make it easier to navigate, and basically the same to
open files if you use fuzzy search to open files.
parent 32573cca
...@@ -448,11 +448,6 @@ PLUGIN_CFLAGS="$PLUGIN_CFLAGS -I\$(top_srcdir)/contrib/rg" ...@@ -448,11 +448,6 @@ PLUGIN_CFLAGS="$PLUGIN_CFLAGS -I\$(top_srcdir)/contrib/rg"
PLUGIN_CFLAGS="$PLUGIN_CFLAGS -I\$(top_srcdir)/contrib/search" PLUGIN_CFLAGS="$PLUGIN_CFLAGS -I\$(top_srcdir)/contrib/search"
PLUGIN_CFLAGS="$PLUGIN_CFLAGS -I\$(top_srcdir)/contrib/xml" PLUGIN_CFLAGS="$PLUGIN_CFLAGS -I\$(top_srcdir)/contrib/xml"
PLUGIN_CFLAGS="$PLUGIN_CFLAGS -I\$(top_srcdir)/libide" PLUGIN_CFLAGS="$PLUGIN_CFLAGS -I\$(top_srcdir)/libide"
PLUGIN_CFLAGS="$PLUGIN_CFLAGS -I\$(top_srcdir)/libide/editor"
PLUGIN_CFLAGS="$PLUGIN_CFLAGS -I\$(top_srcdir)/libide/genesis"
PLUGIN_CFLAGS="$PLUGIN_CFLAGS -I\$(top_srcdir)/libide/greeter"
PLUGIN_CFLAGS="$PLUGIN_CFLAGS -I\$(top_srcdir)/libide/preferences"
PLUGIN_CFLAGS="$PLUGIN_CFLAGS -I\$(top_srcdir)/libide/util"
PLUGIN_CFLAGS="$PLUGIN_CFLAGS $LIBIDE_CFLAGS" PLUGIN_CFLAGS="$PLUGIN_CFLAGS $LIBIDE_CFLAGS"
PLUGIN_CFLAGS="$PLUGIN_CFLAGS $DEBUG_CFLAGS" PLUGIN_CFLAGS="$PLUGIN_CFLAGS $DEBUG_CFLAGS"
PLUGIN_CFLAGS="$PLUGIN_CFLAGS $OPTIMIZE_CFLAGS" PLUGIN_CFLAGS="$PLUGIN_CFLAGS $OPTIMIZE_CFLAGS"
...@@ -497,8 +492,8 @@ AC_CONFIG_FILES([ ...@@ -497,8 +492,8 @@ AC_CONFIG_FILES([
contrib/tmpl/tmpl-debug.h contrib/tmpl/tmpl-debug.h
contrib/xml/Makefile contrib/xml/Makefile
libide/ide-debug.h
libide/Makefile libide/Makefile
libide/ide-debug.h
plugins/Makefile plugins/Makefile
......
This diff is collapsed.
...@@ -22,13 +22,14 @@ ...@@ -22,13 +22,14 @@
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include "ide-application.h"
#include "ide-application-actions.h"
#include "ide-application-credits.h"
#include "ide-application-private.h"
#include "ide-debug.h" #include "ide-debug.h"
#include "ide-shortcuts-window.h"
#include "ide-workbench.h" #include "application/ide-application.h"
#include "application/ide-application-actions.h"
#include "application/ide-application-credits.h"
#include "application/ide-application-private.h"
#include "keybindings/ide-shortcuts-window.h"
#include "workbench/ide-workbench.h"
static void static void
ide_application_actions_preferences (GSimpleAction *action, ide_application_actions_preferences (GSimpleAction *action,
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H #define G_LOG_DOMAIN "ide-application-command-line"
# include "config.h"
#endif #include "config.h"
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <girepository.h> #include <girepository.h>
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "ide-application.h" #include "application/ide-application.h"
#include "ide-application-private.h" #include "application/ide-application-private.h"
#include "ide-log.h" #include "logging/ide-log.h"
static PeasPluginInfo * static PeasPluginInfo *
ide_application_locate_tool (IdeApplication *self, ide_application_locate_tool (IdeApplication *self,
......
...@@ -21,12 +21,13 @@ ...@@ -21,12 +21,13 @@
#include <libpeas/peas.h> #include <libpeas/peas.h>
#include <girepository.h> #include <girepository.h>
#include "ide-application.h"
#include "ide-application-addin.h"
#include "ide-application-private.h"
#include "ide-css-provider.h"
#include "ide-macros.h" #include "ide-macros.h"
#include "application/ide-application.h"
#include "application/ide-application-addin.h"
#include "application/ide-application-private.h"
#include "theming/ide-css-provider.h"
static gboolean static gboolean
ide_application_can_load_plugin (IdeApplication *self, ide_application_can_load_plugin (IdeApplication *self,
PeasPluginInfo *plugin_info) PeasPluginInfo *plugin_info)
......
...@@ -19,16 +19,15 @@ ...@@ -19,16 +19,15 @@
#ifndef IDE_APPLICATION_PRIVATE_H #ifndef IDE_APPLICATION_PRIVATE_H
#define IDE_APPLICATION_PRIVATE_H #define IDE_APPLICATION_PRIVATE_H
#include <egg-menu-manager.h>
#include <gio/gio.h> #include <gio/gio.h>
#include <libpeas/peas.h> #include <libpeas/peas.h>
#include "egg-menu-manager.h" #include "application/ide-application.h"
#include "keybindings/ide-keybindings.h"
#include "ide-application.h" #include "projects/ide-recent-projects.h"
#include "ide-keybindings.h" #include "theming/ide-theme-manager.h"
#include "ide-recent-projects.h" #include "workers/ide-worker-manager.h"
#include "ide-theme-manager.h"
#include "ide-worker-manager.h"
G_BEGIN_DECLS G_BEGIN_DECLS
......
...@@ -21,10 +21,11 @@ ...@@ -21,10 +21,11 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "ide-application-private.h"
#include "ide-application-tests.h"
#include "ide-debug.h" #include "ide-debug.h"
#include "application/ide-application-private.h"
#include "application/ide-application-tests.h"
typedef struct typedef struct
{ {
IdeApplication *self; IdeApplication *self;
......
...@@ -18,36 +18,34 @@ ...@@ -18,36 +18,34 @@
#define G_LOG_DOMAIN "ide-application" #define G_LOG_DOMAIN "ide-application"
#ifdef HAVE_CONFIG_H #include "config.h"
# include "config.h"
#endif
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <girepository.h> #include <girepository.h>
#include <gtksourceview/gtksource.h> #include <gtksourceview/gtksource.h>
#include <ide-icons-resources.h>
#include <locale.h> #include <locale.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef __linux #ifdef __linux
# include <sys/prctl.h> # include <sys/prctl.h>
#endif #endif
#include "ide-application.h"
#include "ide-application-actions.h"
#include "ide-application-private.h"
#include "ide-application-tests.h"
#include "ide-application-tool.h"
#include "ide-css-provider.h"
#include "ide-debug.h" #include "ide-debug.h"
#include "ide-global.h" #include "ide-global.h"
#include "ide-icons-resources.h"
#include "ide-internal.h" #include "ide-internal.h"
#include "ide-macros.h" #include "ide-macros.h"
#include "ide-resources.h"
#include "ide-theme-manager.h"
#include "ide-workbench.h"
#include "ide-worker.h"
#include "modeline-parser.h" #include "application/ide-application.h"
#include "application/ide-application-actions.h"
#include "application/ide-application-private.h"
#include "application/ide-application-tests.h"
#include "application/ide-application-tool.h"
#include "modelines/modeline-parser.h"
#include "resources/ide-resources.h"
#include "theming/ide-css-provider.h"
#include "theming/ide-theme-manager.h"
#include "workbench/ide-workbench.h"
#include "workers/ide-worker.h"
G_DEFINE_TYPE (IdeApplication, ide_application, GTK_TYPE_APPLICATION) G_DEFINE_TYPE (IdeApplication, ide_application, GTK_TYPE_APPLICATION)
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "ide-recent-projects.h" #include "projects/ide-recent-projects.h"
G_BEGIN_DECLS G_BEGIN_DECLS
......
...@@ -18,27 +18,27 @@ ...@@ -18,27 +18,27 @@
#define G_LOG_DOMAIN "ide-buffer-manager" #define G_LOG_DOMAIN "ide-buffer-manager"
#include <egg-counter.h>
#include <gtksourceview/gtksource.h> #include <gtksourceview/gtksource.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include "egg-counter.h"
#include "ide-back-forward-item.h"
#include "ide-back-forward-list.h"
#include "ide-back-forward-list-private.h"
#include "ide-buffer.h"
#include "ide-buffer-manager.h"
#include "ide-context.h" #include "ide-context.h"
#include "ide-debug.h" #include "ide-debug.h"
#include "ide-doc-seq.h"
#include "ide-file.h"
#include "ide-file-settings.h"
#include "ide-global.h" #include "ide-global.h"
#include "ide-internal.h" #include "ide-internal.h"
#include "ide-progress.h"
#include "ide-source-location.h" #include "buffers/ide-buffer-manager.h"
#include "ide-unsaved-files.h" #include "buffers/ide-buffer.h"
#include "ide-vcs.h" #include "buffers/ide-unsaved-files.h"
#include "diagnostics/ide-source-location.h"
#include "files/ide-file-settings.h"
#include "files/ide-file.h"
#include "history/ide-back-forward-item.h"
#include "history/ide-back-forward-list-private.h"
#include "history/ide-back-forward-list.h"
#include "util/ide-doc-seq.h"
#include "util/ide-progress.h"
#include "vcs/ide-vcs.h"
#define AUTO_SAVE_TIMEOUT_DEFAULT 60 #define AUTO_SAVE_TIMEOUT_DEFAULT 60
#define MAX_FILE_SIZE_BYTES_DEFAULT (1024UL * 1024UL * 10UL) #define MAX_FILE_SIZE_BYTES_DEFAULT (1024UL * 1024UL * 10UL)
......
...@@ -22,9 +22,10 @@ ...@@ -22,9 +22,10 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gtksourceview/completion-providers/words/gtksourcecompletionwords.h> #include <gtksourceview/completion-providers/words/gtksourcecompletionwords.h>
#include "ide-file.h"
#include "ide-object.h" #include "ide-object.h"
#include "files/ide-file.h"
G_BEGIN_DECLS G_BEGIN_DECLS
#define IDE_TYPE_BUFFER_MANAGER (ide_buffer_manager_get_type()) #define IDE_TYPE_BUFFER_MANAGER (ide_buffer_manager_get_type())
......
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