[gedit] Disabled python plugin support
- From: Garrett Regier <gregier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] Disabled python plugin support
- Date: Sun, 13 Jun 2010 16:30:24 +0000 (UTC)
commit 48a36b0c456e9704a2253d33f3a7dfded86af2ef
Author: Garrett Regier <alias301 gmail com>
Date: Sun Jun 13 09:29:25 2010 -0700
Disabled python plugin support
configure.ac | 156 +--
data/gedit.pc.in | 2 +-
docs/reference/Makefile.am | 14 +-
plugin-loaders/Makefile.am | 4 -
plugin-loaders/python/Makefile.am | 35 -
plugin-loaders/python/bindings/Makefile.am | 117 --
plugin-loaders/python/bindings/gedit.defs | 1480 --------------------
plugin-loaders/python/bindings/gedit.override | 461 ------
plugin-loaders/python/bindings/geditcommands.defs | 47 -
.../python/bindings/geditcommands.override | 150 --
.../python/bindings/geditmessage.override | 556 --------
.../python/bindings/geditplugin.override | 193 ---
plugin-loaders/python/bindings/geditutils.defs | 67 -
plugin-loaders/python/bindings/geditutils.override | 86 --
plugin-loaders/python/gedit-plugin-loader-python.c | 764 ----------
plugin-loaders/python/gedit-plugin-loader-python.h | 62 -
plugin-loaders/python/gedit-plugin-python.c | 282 ----
plugin-loaders/python/gedit-plugin-python.h | 89 --
plugins/Makefile.am | 22 +-
19 files changed, 27 insertions(+), 4560 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2d85c1c..f08f608 100644
--- a/configure.ac
+++ b/configure.ac
@@ -323,129 +323,6 @@ dnl ================================================================
GLIB_GSETTINGS
dnl ================================================================
-dnl Python
-dnl ================================================================
-
-AC_MSG_CHECKING([whether Python support is requested])
-AC_ARG_ENABLE([python],
- AS_HELP_STRING([--enable-python],[Enable python support]),
- [enable_python=$enableval have_python=$enableval],
- [enable_python=autodetect have_python=yes])
-AC_MSG_RESULT([$enable_python])
-
-if test "x$have_python" != "xno"; then
- AM_PATH_PYTHON([2.5],[],[no])
- if test "x$PYTHON" = "x:"; then
- have_python=no
- fi
-fi
-
-if test "x$have_python" != "xno"; then
- AM_CHECK_PYTHON_HEADERS([],[have_python=no])
-fi
-
-if test "x$have_python" != "xno"; then
- PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'`
- PYTHON_LIBS="-lpython$PYTHON_VERSION"
-
- if test "$os_win32" = yes; then
- PYTHON_LIBS=`echo $PYTHON_LIBS | sed 's/\.//g'`
- PYTHON_LIB_LOC="-I$PY_EXEC_PREFIX/libs"
- PYTHON_CFLAGS="-I$PY_EXEC_PREFIX/include"
- PYTHON_EXTRA_LIBS=
- else
- PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'`
- PYTHON_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config"
- PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION"
- PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile"
- PYTHON_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
- PYTHON_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
- PYTHON_EXTRA_LIBS="$PYTHON_BASEMODLIBS $PYTHON_OTHER_LIBS"
- fi
- AC_SUBST([PYTHON_LIBS])
- AC_SUBST([PYTHON_LIB_LOC])
- AC_SUBST([PYTHON_CFLAGS])
- AC_SUBST([PYTHON_EXTRA_LIBS])
-fi
-
-if test "x$have_python" != "xyes"; then
- if test "x$enable_python" = "xyes"; then
- AC_MSG_ERROR([Python not found])
- elif test "x$enable_python" = "xautodetect"; then
- enable_python=no
- AC_MSG_WARN([Python not found, disabling python support])
- fi
-fi
-
-if test "x$have_python" != "xno"; then
- PYGOBJECT_REQUIRED=2.15.4
- PYGTK_REQUIRED=2.12.0
- PYGTKSOURCEVIEW_REQUIRED=2.9.2
-
- PKG_CHECK_MODULES([PYGTK], [
- pygobject-2.0 >= $PYGOBJECT_REQUIRED
- pygtk-2.0 >= $PYGTK_REQUIRED
- pygtksourceview-2.0 >= $PYGTKSOURCEVIEW_REQUIRED],
- [],
- [
- have_python=no
- if test "x$enable_python" = "xyes"; then
- AC_MSG_ERROR([$PYGTK_PKG_ERRORS])
- elif test "x$enable_python" = "xautodetect"; then
- enable_python=no
- AC_MSG_WARN([$PYGTK_PKG_ERRORS])
- AC_MSG_WARN([Disabling python support])
- fi
- ])
-fi
-
-if test "x$have_python" != "xno"; then
- AC_MSG_CHECKING([for pygtk defs])
- PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
- AC_MSG_RESULT([$PYGTK_DEFSDIR])
-
- AC_MSG_CHECKING([for pygobject defs])
- PYGOBJECT_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygobject-2.0`
- AC_MSG_RESULT([$PYGOBJECT_DEFSDIR])
-
- AC_MSG_CHECKING([for pygtk codegen])
- PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
- AC_MSG_RESULT([$PYGTK_CODEGEN])
-
- AC_MSG_CHECKING([for pygtk h2def])
- PYGTK_H2DEF="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/h2def.py"
- AC_MSG_RESULT([$PYGTK_H2DEF])
-
- AC_SUBST([PYGTK_DEFSDIR])
- AC_SUBST([PYGOBJECT_DEFSDIR])
- AC_SUBST([PYGTK_CODEGEN])
- AC_SUBST([PYGTK_H2DEF])
-
- dnl Check for -fno-strict-aliasing
- FLAGS="-fno-strict-aliasing"
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $FLAGS"
- AC_MSG_CHECKING([whether [$]CC understands $FLAGS])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[compiler_has_option=yes],[compiler_has_option=no])
- CFLAGS="$save_CFLAGS"
- AC_MSG_RESULT($compiler_has_option)
- if test $compiler_has_option = yes; then
- NO_STRICT_ALIASING_CFLAGS="$FLAGS"
- fi
- AC_SUBST([NO_STRICT_ALIASING_CFLAGS])
-fi
-
-if test "x$have_python" != "xno" -a "x$enable_python" != "xno"; then
- enable_python=yes
- AC_DEFINE([ENABLE_PYTHON],[1],[Define to compile with python support])
-fi
-
-AM_CONDITIONAL([ENABLE_PYTHON],[test "x$enable_python" = "xyes"])
-
-dnl This allows the bug-report script to know whether python has been enabled
-AC_SUBST(enable_python)
-
-dnl ================================================================
dnl Misc
dnl ================================================================
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
@@ -466,16 +343,13 @@ AC_ARG_ENABLE(deprecations,
if test "$enable_deprecations" = "yes"; then
DISABLE_DEPRECATED_CFLAGS="\
+-DGSEAL_ENABLE \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED"
- if $PKG_CONFIG --atleast-version 2.90 $GTK_REQUIRED; then
- DISABLE_DEPRECATED_CFLAGS="$DISABLE_DEPRECATED_CFLAGS -DGSEAL_ENABLE"
- fi
-
AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
fi
@@ -523,28 +397,14 @@ help/Makefile
pixmaps/Makefile
plugin-loaders/Makefile
plugin-loaders/c/Makefile
-plugin-loaders/python/Makefile
-plugin-loaders/python/bindings/Makefile
plugins/Makefile
plugins/changecase/Makefile
plugins/checkupdate/org.gnome.gedit.checkupdate.gschema.xml.in
plugins/checkupdate/Makefile
plugins/docinfo/Makefile
-plugins/externaltools/data/Makefile
-plugins/externaltools/Makefile
-plugins/externaltools/scripts/Makefile
-plugins/externaltools/tools/Makefile
plugins/filebrowser/org.gnome.gedit.file-browser.gschema.xml.in
plugins/filebrowser/Makefile
plugins/modelines/Makefile
-plugins/pythonconsole/Makefile
-plugins/pythonconsole/pythonconsole/Makefile
-plugins/quickopen/Makefile
-plugins/quickopen/quickopen/Makefile
-plugins/snippets/data/lang/Makefile
-plugins/snippets/data/Makefile
-plugins/snippets/Makefile
-plugins/snippets/snippets/Makefile
plugins/sort/Makefile
plugins/spell/Makefile
plugins/taglist/Makefile
@@ -557,6 +417,19 @@ win32/Makefile
osx/Info.plist
osx/Makefile])
+#plugins/externaltools/data/Makefile
+#plugins/externaltools/Makefile
+#plugins/externaltools/scripts/Makefile
+#plugins/externaltools/tools/Makefile
+#plugins/pythonconsole/Makefile
+#plugins/pythonconsole/pythonconsole/Makefile
+#plugins/quickopen/Makefile
+#plugins/quickopen/quickopen/Makefile
+#plugins/snippets/data/lang/Makefile
+#plugins/snippets/data/Makefile
+#plugins/snippets/Makefile
+#plugins/snippets/snippets/Makefile
+
AC_OUTPUT
echo "
@@ -565,7 +438,6 @@ Configuration:
Source code location: ${srcdir}
Compiler: ${CC}
- Python Plugins Support: $enable_python
Spell Plugin enabled: $enable_enchant
Gvfs metadata enabled: $enable_gvfs_metadata
Deprecations enabled: $enable_deprecations
diff --git a/data/gedit.pc.in b/data/gedit.pc.in
index 78a3f1e..1d8f707 100644
--- a/data/gedit.pc.in
+++ b/data/gedit.pc.in
@@ -5,7 +5,7 @@ includedir= includedir@
Name: gedit
Description: gedit
-Requires: gtksourceview-2.0
+Requires: gtksourceview-3.0 libpeas-1.0 libpeasui-1.0
Version: @VERSION@
Cflags: -I${includedir}/gedit- GEDIT_API_VERSION@
Libs: -L${libdir} @GEDIT_IMPLIB@
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index f23162e..5f50830 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -67,9 +67,7 @@ IGNORE_HFILES= \
# These files are not part of gedit but were copied into it for some reason.
# Do not parse them to make the docs.
IGNORE_HFILES += \
- bacon-message-connection.h \
- gedittextregion.h \
- sexy-icon-entry.h
+ gedittextregion.h
# Images to copy into HTML directory.
HTML_IMAGES=
@@ -97,16 +95,6 @@ GTKDOC_LIBS= \
$(top_builddir)/gedit/libgedit.la \
$(GEDIT_LIBS)
-if ENABLE_PYTHON
-GTKDOC_CFLAGS += \
- $(NO_STRICT_ALIASING_CFLAGS) \
- $(PYGTK_CFLAGS) \
- $(PYTHON_CFLAGS) \
- $(AM_CFLAGS)
-GTKDOC_LIBS += \
- $(top_builddir)/plugin-loaders/python/bindings/gedit.la
-endif
-
# This includes the standard gtk-doc make rules, copied by gtkdocize.
include $(top_srcdir)/gtk-doc.make
diff --git a/plugin-loaders/Makefile.am b/plugin-loaders/Makefile.am
index bf1e964..2573ec3 100644
--- a/plugin-loaders/Makefile.am
+++ b/plugin-loaders/Makefile.am
@@ -1,7 +1,3 @@
SUBDIRS = c
-if ENABLE_PYTHON
-SUBDIRS += python
-endif
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index ba80e09..ec1df43 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -2,17 +2,18 @@ DIST_SUBDIRS = \
changecase \
checkupdate \
docinfo \
- externaltools \
filebrowser \
modelines \
- pythonconsole \
- quickopen \
- snippets \
sort \
spell \
taglist \
time
+# externaltools
+# pythonconsole
+# quickopen
+# snippets
+
SUBDIRS = \
changecase \
docinfo \
@@ -22,14 +23,13 @@ SUBDIRS = \
taglist \
time
-if ENABLE_PYTHON
-SUBDIRS += pythonconsole snippets quickopen
-
-if !OS_WIN32
-SUBDIRS += externaltools
-endif
+# pythonconsole
+# quickopen
+# snippets
-endif
+#if !OS_WIN32
+#SUBDIRS += externaltools
+#endif
if ENABLE_ENCHANT
SUBDIRS += spell
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]