[gnome-builder] libide: move fallback plugin into libide



commit e715b3fc3dd4b15b034bcaa47be68eec1573f814
Author: Christian Hergert <christian hergert me>
Date:   Fri Nov 20 02:13:20 2015 -0800

    libide: move fallback plugin into libide
    
    We need these implemented as a plugin so that they fit into
    IdeExtensionAdapter and IdeExtensionAdapterSet. Once we make vcs
    implementations pluggable, we can move DirectoryVcs into the
    fallback embedded plugin as well.

 libide/Makefile.am                                 |    3 ++
 {plugins => libide}/fallback/fallback.plugin       |    1 +
 .../fallback/ide-directory-build-system.c          |    2 +-
 .../fallback/ide-directory-build-system.h          |    0
 .../fallback/ide-fallback-plugin.c                 |    8 ++++--
 libide/resources/libide.gresource.xml              |    4 +++
 plugins/Makefile.am                                |    7 ++++-
 plugins/fallback/Makefile.am                       |   25 --------------------
 8 files changed, 19 insertions(+), 31 deletions(-)
---
diff --git a/libide/Makefile.am b/libide/Makefile.am
index be51f3e..d0fd1fe 100644
--- a/libide/Makefile.am
+++ b/libide/Makefile.am
@@ -19,6 +19,9 @@ libide_1_0_la_public_sources = \
        editor/ide-editor-view-addin.h \
        editor/ide-editor-view.c \
        editor/ide-editor-view.h \
+       fallback/ide-directory-build-system.c \
+       fallback/ide-directory-build-system.h \
+       fallback/ide-fallback-plugin.c \
        git/ide-git-remote-callbacks.c \
        git/ide-git-remote-callbacks.h \
        git/ide-git-vcs.c \
diff --git a/plugins/fallback/fallback.plugin b/libide/fallback/fallback.plugin
similarity index 87%
rename from plugins/fallback/fallback.plugin
rename to libide/fallback/fallback.plugin
index c733bee..ea693cb 100644
--- a/plugins/fallback/fallback.plugin
+++ b/libide/fallback/fallback.plugin
@@ -7,3 +7,4 @@ Copyright=Copyright © 2015 Christian Hergert
 Builtin=true
 Hidden=true
 X-Build-System-Priority=10000000
+Embedded=ide_fallback_register_types
diff --git a/plugins/fallback/ide-directory-build-system.c b/libide/fallback/ide-directory-build-system.c
similarity index 98%
rename from plugins/fallback/ide-directory-build-system.c
rename to libide/fallback/ide-directory-build-system.c
index be60dfe..53e17a7 100644
--- a/plugins/fallback/ide-directory-build-system.c
+++ b/libide/fallback/ide-directory-build-system.c
@@ -116,7 +116,7 @@ ide_directory_build_system_class_init (IdeDirectoryBuildSystemClass *klass)
                          "Project File",
                          "The path of the project file.",
                          G_TYPE_FILE,
-                         (G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
+                         (G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_properties (object_class, LAST_PROP, properties);
 }
diff --git a/plugins/fallback/ide-directory-build-system.h b/libide/fallback/ide-directory-build-system.h
similarity index 100%
rename from plugins/fallback/ide-directory-build-system.h
rename to libide/fallback/ide-directory-build-system.h
diff --git a/plugins/fallback/fallback-plugin.c b/libide/fallback/ide-fallback-plugin.c
similarity index 73%
rename from plugins/fallback/fallback-plugin.c
rename to libide/fallback/ide-fallback-plugin.c
index 126c1f1..44ce574 100644
--- a/plugins/fallback/fallback-plugin.c
+++ b/libide/fallback/ide-fallback-plugin.c
@@ -17,12 +17,14 @@
  */
 
 #include <libpeas/peas.h>
-#include <ide.h>
 
+#include "ide-build-system.h"
 #include "ide-directory-build-system.h"
 
 void
-peas_register_types (PeasObjectModule *module)
+ide_fallback_register_types (PeasObjectModule *module)
 {
-  peas_object_module_register_extension_type (module, IDE_TYPE_BUILD_SYSTEM, 
IDE_TYPE_DIRECTORY_BUILD_SYSTEM);
+  peas_object_module_register_extension_type (module,
+                                              IDE_TYPE_BUILD_SYSTEM,
+                                              IDE_TYPE_DIRECTORY_BUILD_SYSTEM);
 }
diff --git a/libide/resources/libide.gresource.xml b/libide/resources/libide.gresource.xml
index 8ac76b6..3a66cc6 100644
--- a/libide/resources/libide.gresource.xml
+++ b/libide/resources/libide.gresource.xml
@@ -65,4 +65,8 @@
   <gresource prefix="/org/gnome/builder/plugins/editor">
     <file alias="editor.plugin">../editor/editor.plugin</file>
   </gresource>
+
+  <gresource prefix="/org/gnome/builder/plugins/fallback">
+    <file alias="editor.plugin">../fallback/fallback.plugin</file>
+  </gresource>
 </gresources>
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index cd47b23..65f9479 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -5,8 +5,6 @@ SUBDIRS = \
        c-pack \
        ctags \
        devhelp \
-       device-manager \
-       fallback \
        file-search \
        gnome-code-assistance \
        html-completion \
@@ -23,6 +21,11 @@ SUBDIRS = \
        xml-pack \
        $(NULL)
 
+# XXX: device-manager
+# device-manager is disabled because it didn't do anything yet and
+# we want to write it as a perspective with device management such
+# as listing apps, deploying, etc.
+
 EXTRA_DIST = Makefile.plugin
 
 -include $(top_srcdir)/git.mk


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]