Skip to content

Commit

Permalink
Remove support for gjs-based Javascript plugins
Browse files Browse the repository at this point in the history
There have been changes to the gjs bindings and as the issue
has only recently been noticed it is assumed that support for
them is not highly desired.

https://bugzilla.gnome.org/show_bug.cgi?id=711356
  • Loading branch information
gregier committed Nov 13, 2013
1 parent 8596030 commit 730edb6
Show file tree
Hide file tree
Showing 24 changed files with 25 additions and 1,194 deletions.
7 changes: 0 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,11 @@ Makefile.in
/tests/*/vgdump-*
/tests/libpeas/engine
/tests/libpeas/extension-c
/tests/libpeas/extension-gjs
/tests/libpeas/extension-python
/tests/libpeas/extension-python3
/tests/libpeas/extension-seed
/tests/libpeas/extension-set
/tests/libpeas/plugin-info
/tests/libpeas/plugins/extension-js/extension-gjs.gschema.xml
/tests/libpeas/plugins/extension-js/extension-gjs.js
/tests/libpeas/plugins/extension-js/extension-gjs.plugin
/tests/libpeas/plugins/extension-js/extension-seed.gschema.xml
/tests/libpeas/plugins/extension-js/extension-seed.js
/tests/libpeas/plugins/extension-js/extension-seed.plugin
/tests/libpeas/plugins/extension-python/extension-python.gschema.xml
/tests/libpeas/plugins/extension-python/extension-python.plugin
/tests/libpeas/plugins/extension-python/extension-python.py
Expand Down
44 changes: 2 additions & 42 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -267,43 +267,6 @@ fi

AM_CONDITIONAL([ENABLE_SEED],[test "x$found_seed" = "xyes"])

dnl ================================================================
dnl GJS Javascript Engine
dnl ================================================================

GJS_REQUIRED=1.37.1

AC_ARG_ENABLE(gjs,
AS_HELP_STRING([--enable-gjs],[Enable GJS support]),
[enable_gjs=$enableval],
[enable_gjs=auto])

AC_MSG_CHECKING([for GJS JS availability.])

if test "x$enable_gjs" = "xno"; then
found_gjs="no (disabled, use --enable-gjs to enable)"
else
PKG_CHECK_EXISTS([gjs-internals-1.0 >= $GJS_REQUIRED],
[found_gjs=yes],
[found_gjs=no])
fi

if test "$enable_gjs" = "yes" -a "$found_gjs" = "no"; then
AC_MSG_ERROR([You need to have gjs-internals-1.0 >= $GJS_REQUIRED installed to build libpeas])
fi
AC_MSG_RESULT([$found_gjs])

if test "$found_gjs" = "yes"; then
GJS_CFLAGS=`$PKG_CONFIG --cflags gjs-internals-1.0`
GJS_LIBS=`$PKG_CONFIG --libs gjs-internals-1.0`
AC_SUBST(GJS_CFLAGS)
AC_SUBST(GJS_LIBS)

AC_DEFINE(ENABLE_GJS,1,[Define to compile with GJS support])
fi

AM_CONDITIONAL([ENABLE_GJS],[test "x$found_gjs" = "xyes"])

dnl ================================================================
dnl Python
dnl ================================================================
Expand Down Expand Up @@ -474,7 +437,6 @@ docs/reference/version.xml
libpeas/Makefile
libpeas-gtk/Makefile
loaders/Makefile
loaders/gjs/Makefile
loaders/python/Makefile
loaders/python3/Makefile
loaders/seed/Makefile
Expand All @@ -485,7 +447,6 @@ data/libpeas-1.0.pc
data/libpeas-gtk-1.0.pc
peas-demo/Makefile
peas-demo/plugins/Makefile
peas-demo/plugins/gjshello/Makefile
peas-demo/plugins/helloworld/Makefile
peas-demo/plugins/pythonhello/Makefile
peas-demo/plugins/secondtime/Makefile
Expand All @@ -495,8 +456,8 @@ tests/Makefile
tests/libpeas/Makefile
tests/libpeas/plugins/Makefile
tests/libpeas/plugins/extension-c/Makefile
tests/libpeas/plugins/extension-js/Makefile
tests/libpeas/plugins/extension-python/Makefile
tests/libpeas/plugins/extension-seed/Makefile
tests/libpeas/introspection/Makefile
tests/libpeas/testing/Makefile
tests/libpeas-gtk/Makefile
Expand Down Expand Up @@ -531,6 +492,5 @@ Languages support:

Python 2 support : ${found_python2}
Python 3 support : ${found_python3}
Javascript support (Seed) : ${found_seed}
Javascript support (GJS) : ${found_gjs}
Seed Javascript support : ${found_seed}
"
4 changes: 2 additions & 2 deletions libpeas/peas-extension-base.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
* access the related #PeasPluginInfo, and especially the location where all
* the data of your plugin lives.
*
* Non-C extensions will usually not inherit from this class: Python, Seed
* and GJS plugins automatically get a "plugin_info" attribute that serves
* Non-C extensions will usually not inherit from this class: Python and
* Seed plugins automatically get a "plugin_info" attribute that serves
* the same purpose.
**/

Expand Down
4 changes: 0 additions & 4 deletions loaders/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
SUBDIRS =

if ENABLE_GJS
SUBDIRS += gjs
endif

if ENABLE_PYTHON2
SUBDIRS += python
endif
Expand Down
25 changes: 0 additions & 25 deletions loaders/gjs/Makefile.am

This file was deleted.

Loading

0 comments on commit 730edb6

Please sign in to comment.