[hippo-canvas] Remove Python bindings
- From: Tomeu Vizoso <tomeuv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [hippo-canvas] Remove Python bindings
- Date: Tue, 12 Oct 2010 11:08:10 +0000 (UTC)
commit 6a7ce58327b42b1fd8bdb70b15e4f1e537671846
Author: Tomeu Vizoso <tomeu vizoso collabora co uk>
Date: Tue Oct 12 13:07:09 2010 +0200
Remove Python bindings
Superseded by gobject-introspection.
Makefile-introspection.am | 2 +-
Makefile-python.am | 47 --
Makefile.am | 4 -
acinclude.m4 | 63 --
configure.ac | 25 -
python/arg-types.py | 40 -
python/canvas-box-child.c | 208 ------
python/canvas-box-child.h | 17 -
python/hippo.defs | 1780 ---------------------------------------------
python/hippo.override | 1109 ----------------------------
python/hippomodule.c | 61 --
11 files changed, 1 insertions(+), 3355 deletions(-)
---
diff --git a/Makefile-introspection.am b/Makefile-introspection.am
index d7e6d12..31e6d44 100644
--- a/Makefile-introspection.am
+++ b/Makefile-introspection.am
@@ -1,7 +1,7 @@
Hippo-1.0.gir: $(libhippocanvas_1_la_SOURCES) $(nodist_libhippocanvas_1_la_SOURCES) libhippocanvas-1.la Makefile
libtool --mode=execute $(INTROSPECTION_SCANNER) -v --namespace Hippo --nsversion=1.0 \
--strip-prefix=Hippo \
- --include=Gtk-2.0 \
+ --include=Gtk-3.0 \
--library=hippocanvas-1 \
--output $@ \
--pkg hippo-canvas-1 \
diff --git a/Makefile.am b/Makefile.am
index 6c9ddd1..fba7497 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,10 +56,6 @@ libhippocanvasinclude_HEADERS=$(COMMON_CANVAS_HEADERFILES) $(LINUX_CANVAS_HEADER
libhippocanvas_1_la_SOURCES=$(COMMON_CANVAS_SOURCEFILES) $(LINUX_CANVAS_SOURCEFILES)
nodist_libhippocanvas_1_la_SOURCES=$(CANVAS_BUILT_SOURCEFILES)
-if HAVE_PYTHON
-include Makefile-python.am
-endif
-
if HAVE_INTROSPECTION
include Makefile-introspection.am
endif
diff --git a/acinclude.m4 b/acinclude.m4
index 1a809f2..222e4b0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,66 +1,3 @@
-## this one is commonly used with AM_PATH_PYTHONDIR ...
-dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
-dnl Check if a module containing a given symbol is visible to python.
-AC_DEFUN([AM_CHECK_PYMOD],
-[AC_REQUIRE([AM_PATH_PYTHON])
-py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
-AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
-AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
-ifelse([$2],[], [prog="
-import sys
-try:
- import $1
-except ImportError:
- sys.exit(1)
-except:
- sys.exit(0)
-sys.exit(0)"], [prog="
-import $1
-$1.$2"])
-if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
- then
- eval "py_cv_mod_$py_mod_var=yes"
- else
- eval "py_cv_mod_$py_mod_var=no"
- fi
-])
-py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
-if test "x$py_val" != xno; then
- AC_MSG_RESULT(yes)
- ifelse([$3], [],, [$3
-])dnl
-else
- AC_MSG_RESULT(no)
- ifelse([$4], [],, [$4
-])dnl
-fi
-])
-
-dnl a macro to check for ability to create python extensions
-dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
-dnl function also defines PYTHON_INCLUDES
-AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
-[AC_REQUIRE([AM_PATH_PYTHON])
-AC_MSG_CHECKING(for headers required to compile python extensions)
-dnl deduce PYTHON_INCLUDES
-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-if test "$py_prefix" != "$py_exec_prefix"; then
- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-fi
-AC_SUBST(PYTHON_INCLUDES)
-dnl check if the headers exist:
-save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-AC_TRY_CPP([#include <Python.h>],dnl
-[AC_MSG_RESULT(found)
-$1],dnl
-[AC_MSG_RESULT(not found)
-$2])
-CPPFLAGS="$save_CPPFLAGS"
-])
-
dnl
dnl JH_ADD_CFLAG(FLAG)
dnl checks whether the C compiler supports the given flag, and if so, adds
diff --git a/configure.ac b/configure.ac
index 7a405f3..3c5ac8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,28 +168,6 @@ AC_SUBST(GLIB_MKENUMS)
GTK_DOC_CHECK([1.6])
-## Python bindings
-AC_ARG_ENABLE(python,
- [AC_HELP_STRING([--enable-python], [Python bindings [default=auto]])])
-if test "x$enable_python" = "xno" ; then
- have_python=no
-else
- have_python=no
- AM_PATH_PYTHON
- if test "x$PYTHON" = "x" ; then
- AC_MSG_WARN([Python not found])
- else
- AM_CHECK_PYTHON_HEADERS([
- AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no)
- PKG_CHECK_MODULES(PYTHON_BINDINGS, pygobject-2.0 > $PYGOBJECT_REQUIRED pygtk-2.0 pycairo, [
- PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
- AC_SUBST(PYGTK_DEFSDIR)
- have_python=yes
- ], [AC_MSG_WARN(could not find pygobject > $PYGOBJECT_REQUIRED, pygtk-2.0 or pycairo)])
- ],[AC_MSG_WARN(could not find Python headers)])
- fi
-fi
-
AC_MSG_CHECKING([for gobject-introspection])
PKG_CHECK_EXISTS(gobject-introspection-1.0, have_introspection=true, have_introspection=false)
AC_MSG_RESULT($have_introspection)
@@ -213,8 +191,6 @@ AC_SUBST(INTROSPECTION_GENERATE)
AC_SUBST(INTROSPECTION_GIRDIR)
AC_SUBST(INTROSPECTION_TYPELIBDIR)
-AM_CONDITIONAL(HAVE_PYTHON, test "x$have_python" = "xyes")
-
AC_OUTPUT([
Makefile
hippo-canvas-1.pc
@@ -230,7 +206,6 @@ echo "
prefix: ${prefix}
compiler: ${CC}
LIBHIPPOCANVAS_CFLAGS: ${LIBHIPPOCANVAS_CFLAGS}
- Python bindings: ${have_python}
Now type 'make' to build $PACKAGE
"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]