[eog] Remove old python binding code and build configuration
- From: Felix Riemann <friemann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [eog] Remove old python binding code and build configuration
- Date: Fri, 14 Jan 2011 15:57:25 +0000 (UTC)
commit 032e169d7d6e4645a10af5291d1badc38e682089
Author: Felix Riemann <friemann gnome org>
Date: Fri Jan 14 16:53:15 2011 +0100
Remove old python binding code and build configuration
Although python plugins are not yet supported with the new libpeas-based
API, the old binding don't work either and aren't needed any more.
Makefile.am | 2 +-
README | 5 +-
bindings/Makefile.am | 7 -
bindings/python/Makefile.am | 77 ---
bindings/python/eog.defs | 1230 ------------------------------------------
bindings/python/eog.override | 126 -----
configure.ac | 116 ----
doc/reference/Makefile.am | 4 +-
src/Makefile.am | 25 -
src/eog-python-module.c | 527 ------------------
src/eog-python-module.h | 72 ---
src/eog-python-plugin.c | 282 ----------
src/eog-python-plugin.h | 55 --
13 files changed, 4 insertions(+), 2524 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 2a08764..97a09d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ if ENABLE_JPEG
jpeg_DIRS = jpegutils
endif
-SUBDIRS = $(jpeg_DIRS) cut-n-paste bindings src plugins po help data doc
+SUBDIRS = $(jpeg_DIRS) cut-n-paste src plugins po help data doc
EXTRA_DIST = \
HACKING \
diff --git a/README b/README
index cd74f08..a37b7c1 100644
--- a/README
+++ b/README
@@ -41,9 +41,8 @@ In order to make 'Eye of GNOME' work as a single instance application you'll
need D-Bus installed in your system. You can get it from
http://www.freedesktop.org/wiki/Software/dbus .
-Other optional dependencies include Little cms for color management,
-Python, pygtk, and gnome-python for python plugins support, and
-Exempi for XMP metadata reading.
+Other optional dependencies include Little cms for color management
+and Exempi for XMP metadata reading.
Availability
------------
diff --git a/configure.ac b/configure.ac
index 4b09279..6080c4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -349,119 +349,6 @@ GLIB_GSETTINGS
AC_CHECK_HEADERS(X11/Sunkeysym.h, AC_DEFINE(HAVE_SUNKEYSYM_H, 1, [Sun Keyboard Support]))
-# **************
-# Python Support
-# **************
-
-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])
-
-# Disable Python plugins as they don't work with GTK+-3 yet
-have_python=no
-
-AC_MSG_RESULT([$enable_python])
-
-if test "x$have_python" != "xno"; then
- AM_PATH_PYTHON([2.3],[],[no])
- if test "x$PYTHON" = "x:"; then
- have_python=no
- fi
-fi
-
-if test "x$have_python" != "xno"; then
- PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'`
- PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'`
- PYTHON_LIBS="-lpython$PYTHON_VERSION"
- 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"
- 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.1
- PYGTK_REQUIRED=2.13.0
-
- PKG_CHECK_MODULES([PYGTK], [
- pygobject-2.0 >= $PYGOBJECT_REQUIRED
- pygtk-2.0 >= $PYGTK_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
- ])
-
- AC_SUBST([PYGTK_CFLAGS])
- AC_SUBST([PYGTK_LIBS])
-fi
-
-if test "x$have_python" != "xno"; then
- 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 defs])
- PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
- AC_MSG_RESULT([$PYGTK_DEFSDIR])
-
- AC_MSG_CHECKING([for pygobject codegen])
- PYGOBJECT_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygobject-2.0`/codegen.py"
- AC_MSG_RESULT([$PYGOBJECT_CODEGEN])
-
- AC_MSG_CHECKING([for pygobject h2def])
- PYGOBJECT_H2DEF="$PYTHON `$PKG_CONFIG --variable=codegendir pygobject-2.0`/h2def.py"
- AC_MSG_RESULT([$PYGOBJECT_H2DEF])
-
- AC_SUBST([PYGOBJECT_DEFSDIR])
- AC_SUBST([PYGTK_DEFSDIR])
- AC_SUBST([PYGOBJECT_CODEGEN])
- AC_SUBST([PYGOBJECT_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_TRY_COMPILE([], [], [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"])
AC_CONFIG_FILES([
Makefile
@@ -490,8 +377,6 @@ doc/reference/Makefile
doc/reference/version.xml
doc/reference/eog-docs.sgml
plugins/Makefile
-bindings/Makefile
-bindings/python/Makefile
])
AC_OUTPUT
@@ -503,7 +388,6 @@ Configure summary:
Compiler ...................: ${CC}
Extra Compiler Warnings ....: ${WARN_CFLAGS}
- Python support .............: ${have_python}
EXIF support ...............: ${have_exif}
XMP support ................: ${have_exempi}
JPEG support ...............: ${have_jpeg}
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index b46c39e..d899c95 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -48,14 +48,12 @@ CFILE_GLOB=$(top_srcdir)/src/*.c
# Header files to ignore when scanning.
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
IGNORE_HFILES= \
- eog-python-plugin.h \
eog-image-private.h \
eog-image-jpeg.h \
eog-marshal.h \
eog-application-service.h \
eog-enum-types.h \
- eog-module.h \
- eog-python-module.h
+ eog-module.h
if !HAVE_EXIF
if !HAVE_EXEMPI
diff --git a/src/Makefile.am b/src/Makefile.am
index a515d81..40c89e8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,12 +39,6 @@ NOINST_H_FILES = \
eog-clipboard-handler.h \
zoom.h
-if ENABLE_PYTHON
-NOINST_H_FILES += \
- eog-python-module.h \
- eog-python-plugin.h
-endif
-
INST_H_FILES = \
eog-application.h \
eog-debug.h \
@@ -123,14 +117,6 @@ libeog_c_files += \
eog-exif-details.c
endif
-if ENABLE_PYTHON
-libeog_la_SOURCES += \
- eog-python-module.c \
- eog-python-module.h \
- eog-python-plugin.c \
- eog-python-plugin.h
-endif
-
if HAVE_EXEMPI
# We need to make sure eog-exif-details.h
# is only listed once in INST_H_FILES
@@ -170,17 +156,6 @@ libeog_la_LIBADD += \
$(X11_LIBS)
endif
-if ENABLE_PYTHON
-libeog_la_CFLAGS += \
- $(NO_STRICT_ALIASING_CFLAGS) \
- $(PYGTK_CFLAGS) \
- $(PYTHON_CFLAGS) \
- $(AM_CFLAGS)
-
-libeog_la_LIBADD += \
- $(top_builddir)/bindings/python/eog.la
-endif
-
libeog_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
eog_SOURCES = main.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]