Changeset 4398 for libcaca/trunkTweet

Timestamp:

May 21, 2010, 1:32:35 AM (9 years ago)

Author:

Sam Hocevar

Message:

New improved ctypes-based Python bindings, by Alex Foulon <​alxf@lavabit.com>.

Location:

libcaca/trunk

Files:

• AUTHORS (modified) (2 diffs)
• configure.ac (modified) (2 diffs)
• python/Makefile.am (modified) (1 diff)
• python/README (deleted)
• python/caca (added)
• python/caca.txt (deleted)
• python/caca/__init__.py (added)
• python/caca/canvas.py (added)
• python/caca/common.py (added)
• python/caca/display.py (added)
• python/caca/dither.py (added)
• python/caca/font.py (added)
• python/examples (added)
• python/examples/cacainfo.py (added)
• python/examples/drawing.py (added)
• python/examples/gol.py (added)
• python/pypycaca.c (deleted)
• python/pypycaca.h (deleted)
• python/setup.py (added)
• python/snake.py (deleted)
• python/test1.py (deleted)
• python/test2.py (deleted)

libcaca/trunk/AUTHORS

@@ -7 +7 @@
  - cacaball
  - OpenGL driver
- - Pypycaca Python wrapper
  - exporters
  - network driver
@@ -30 +29 @@
  - Java bindings
 
+Alex Foulon <alxf@lavabit.com>
+ - Python bindings
+
 */

libcaca/trunk/configure.ac

@@ -86 +86 @@
 AC_ARG_ENABLE(cxx,
   [  --enable-cxx            C++ bindings (autodetected)])
+AC_ARG_ENABLE(python,
+  [  --enable-python         Python bindings (autodetected)])
 AC_ARG_ENABLE(ruby,
   [  --enable-ruby           Ruby bindings (autodetected)])
@@ -465 +467 @@
 AM_CONDITIONAL(USE_JAVA, test "${ac_cv_my_have_java}" = "yes")
 
+# Build the Python bindings?
+ac_cv_my_have_python="no"
+if test "${enable_python}" != "no"; then
+  AM_PATH_PYTHON(2.2, ac_cv_my_have_python="yes", :)
+fi
+AM_CONDITIONAL(USE_PYTHON, test "${ac_cv_my_have_python}" = "yes")
+
 # Build the Ruby bindings?
 ac_cv_my_have_ruby="no"

libcaca/trunk/python/Makefile.am

@@ -1 +1 @@
 
-EXTRA_DIST = caca.txt pypycaca.c pypycaca.h snake.py test1.py test2.py
+if USE_PYTHON
+python_PYTHON = \
+    caca/__init__.py \
+    caca/canvas.py \
+    caca/common.py \
+    caca/display.py \
+    caca/dither.py \
+    caca/font.py
+endif
 
-CC = gcc
-RM = rm -f
-CACAFLAGS = `caca-config --cflags`
-CACALIBS  = `caca-config --libs`
+EXTRA_DIST = \
+    setup.py \
+    examples/cacainfo.py \
+    examples/drawing.py \
+    examples/gol.py
 
-PYTHONFLAGS = -I/usr/include/python2.4
-PYTHONLIBS = -lpython2.4
-
-NAME = caca.so
-
-all:
-
-python:
-        $(CC) pypycaca.c -c $(CACAFLAGS) $(PYTHONFLAGS) -Wall
-        $(LD) pypycaca.o -o $(NAME) $(CACALIBS) $(PYTHONLIBS) -shared
-
-
-clean:
-        $(RM) *.o $(NAME)