[gnome-builder] build: drop support for GJS scripting



commit e279e953d2b6d6ed4db806b2a364598a1ebb9bc5
Author: Christian Hergert <christian hergert me>
Date:   Mon Dec 21 18:11:35 2015 -0800

    build: drop support for GJS scripting
    
    Managing multiple language runtimes is a recipe for disaster. We can get
    into situations where we have reference counting leaks between the
    runtimes. So for now, we will use Python since we are relying on Python
    plugins.

 configure.ac                            |    7 -
 doc/examples/scripts/README.md          |   14 +-
 doc/examples/scripts/search-provider.js |   38 -----
 libide/Makefile.am                      |   10 --
 libide/gjs/ide-gjs-script.cpp           |  250 -------------------------------
 libide/gjs/ide-gjs-script.h             |   32 ----
 libide/ide.c                            |   11 --
 po/POTFILES.in                          |    1 -
 8 files changed, 8 insertions(+), 355 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 190447e..4b27e47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,7 +156,6 @@ m4_define([gtk_required_version], [3.19.1])
 m4_define([glib_required_version], [2.47.1])
 m4_define([gtksourceview_required_version], [3.19.0])
 m4_define([ggit_required_version], [0.23.4])
-m4_define([gjs_required_version], [1.42.0])
 m4_define([pygobject_required_version], [3.0.0])
 m4_define([libxml_required_version], [2.9.0])
 m4_define([peas_required_version], [1.16.0])
@@ -166,10 +165,6 @@ PKG_CHECK_MODULES(EGG,      [glib-2.0 >= glib_required_version
 PKG_CHECK_MODULES(GD,       [gtk+-3.0 >= gtk_required_version])
 PKG_CHECK_MODULES(GEDIT,    [glib-2.0 >= glib_required_version
                              gtk+-3.0 >= gtk_required_version])
-PKG_CHECK_MODULES(GJS,      [gjs-1.0 >= gjs_required_version
-                             gjs-internals-1.0 >= gjs_required_version],
-                            [enable_gjs_scripting=yes],
-                            [enable_gjs_scripting=no])
 PKG_CHECK_MODULES(ICONS,    [gio-2.0 >= glib_required_version])
 PKG_CHECK_MODULES(LIBGITG,  [libgit2-glib-1.0 >= ggit_required_version])
 PKG_CHECK_MODULES(LIBIDE,   [gio-2.0 >= glib_required_version
@@ -279,7 +274,6 @@ dnl ***********************************************************************
 dnl Define automake conditionals based on what we found
 dnl ***********************************************************************
 AM_CONDITIONAL(ENABLE_PYTHON_SCRIPTING, test x$enable_python_scripting != xno)
-AM_CONDITIONAL(ENABLE_GJS_SCRIPTING, test x$enable_gjs_scripting != xno)
 
 
 dnl ***********************************************************************
@@ -479,7 +473,6 @@ echo ""
 echo " Scripting"
 echo ""
 echo "  Python ............................... : ${enable_python_scripting}"
-echo "  GJS .................................. : ${enable_gjs_scripting}"
 echo ""
 echo " Plugins"
 echo ""
diff --git a/doc/examples/scripts/README.md b/doc/examples/scripts/README.md
index 8840790..e67fe85 100644
--- a/doc/examples/scripts/README.md
+++ b/doc/examples/scripts/README.md
@@ -1,11 +1,13 @@
 # IDE Scripting Examples
 
 This directory contains various examples you can take inspiration from when
-writing your own IDE extensions.
+writing a simple script for GNOME Builder.
 
-Extensions are placed in ~/.config/gnome-builder/scripts/. Currently,
-JavaScript and Python 3 are supported. However, more languages may be
-added in the future based on demands.
+Scripting is different from plugins in that scripting allows the user to
+write short, one-off extensions to their workflow that does not warrant
+a full plugin.
 
-Simply place a `*.js` or `*.py` file in the proper directory, and it will
-be loaded when the `Ide.Context` is initialized.
+Such an example might be updating ane external resource when a file is saved.
+
+Simply place your `*.py` file in the proper directory, and it will be loaded
+when the `Ide.Context` is initialized.
diff --git a/libide/Makefile.am b/libide/Makefile.am
index f2d2503..86ba1cf 100644
--- a/libide/Makefile.am
+++ b/libide/Makefile.am
@@ -464,16 +464,6 @@ libide_1_0_la_built_sources = \
        resources/ide-resources.h \
        $(NULL)
 
-if ENABLE_GJS_SCRIPTING
-libide_1_0_la_includes += -I$(srcdir)/gjs
-libide_1_0_la_SOURCES += \
-       gjs/ide-gjs-script.cpp \
-       gjs/ide-gjs-script.h
-libide_1_0_la_CXXFLAGS += \
-       $(GJS_CFLAGS) \
-       -DENABLE_GJS_SCRIPTING
-libide_1_0_la_LIBADD += $(GJS_LIBS)
-endif
 
 if ENABLE_PYTHON_SCRIPTING
 libide_1_0_la_includes += -I$(srcdir)/pygobject
diff --git a/libide/ide.c b/libide/ide.c
index ba9d2b8..5e2534d 100644
--- a/libide/ide.c
+++ b/libide/ide.c
@@ -28,10 +28,6 @@
 #include "ide-gsettings-file-settings.h"
 #include "ide-modelines-file-settings.h"
 
-#ifdef ENABLE_GJS_SCRIPTING
-# include "ide-gjs-script.h"
-#endif
-
 #ifdef ENABLE_PYTHON_SCRIPTING
 # include "ide-pygobject-script.h"
 #endif
@@ -86,13 +82,6 @@ ide_init_ctor (void)
                                   IDE_FILE_SETTINGS_EXTENSION_POINT".gsettings",
                                   -300);
 
-#ifdef ENABLE_GJS_SCRIPTING
-  g_io_extension_point_implement (IDE_SCRIPT_EXTENSION_POINT,
-                                  IDE_TYPE_GJS_SCRIPT,
-                                  IDE_SCRIPT_EXTENSION_POINT".gjs",
-                                  -100);
-#endif
-
 #ifdef ENABLE_PYTHON_SCRIPTING
   g_io_extension_point_implement (IDE_SCRIPT_EXTENSION_POINT,
                                   IDE_TYPE_PYGOBJECT_SCRIPT,
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1ebad80..8fc0740 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -22,7 +22,6 @@ libide/editor/ide-editor-perspective.c
 libide/editor/ide-editor-view-actions.c
 libide/editor/ide-editor-view.c
 libide/genesis/ide-genesis-perspective.c
-libide/gjs/ide-gjs-script.cpp
 libide/greeter/ide-greeter-perspective.c
 libide/gsettings/ide-language-defaults.c
 libide/ide-application-actions.c


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