Changeset 589

Show
Ignore:
Timestamp:
07/27/06 16:36:08
Author:
pvanhoof
Message:

Fixes for the python bindings

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/autogen.sh

    r492 r589  
    2626# TODO: Put this in a make target (stupid gtk-doc.make doesn't make this possible afaik) 
    2727 
    28 find $srcdir -type f -iname "*.h" -printf "#include <%f>\n" | grep -v "\-priv" | grep -v "\-test" | grep -v "config.h" | grep -v "tny-summary-window.h" | grep -v "tny-msg-folder-list.h" | grep -v camel > docs/devel/reference/libtinymail.types 
     28 
     29find $srcdir -type f -iname "*.h" -printf "#include <%f>\n" | grep -v "\-priv" | grep -v "\-test" | grep -v "config.h" | grep -v "tny-summary-window.h" | grep -v "tny-summary-view.h" | grep -v "tny-msg-folder-list.h" | grep -v "tny-platform-factory.h" | grep -v "tny-account-store.h" | grep -v "tny-device.h" | grep -v "tny-password-dialog.h" | grep -v camel > docs/devel/reference/libtinymail.types 
    2930 
    3031echo >> docs/devel/reference/libtinymail.types 
    3132 
    32 find $srcdir -type f -iname "*.h" -exec grep get_type {} \; | grep -v define | grep -v _test | grep -v tny_summary_window |grep -v tny_msg_folder_list | grep -v camel | cut -d " " -f 2- | cut -d "(" -f 1| sed s/\ //g >> docs/devel/reference/libtinymail.types 
     33find $srcdir -type f -iname "*.h" -exec grep get_type {} \; | grep -v _tny_list_iterator | grep -v tny_summary_view | grep -v define | grep -v _test | grep -v tny_summary_window |grep -v tny_msg_folder_list | grep -v "tny-platform-factory" | grep -v "tny-account-store" | grep -v "tny-device" | grep -v "tny-password-dialog" |grep -v camel | cut -d " " -f 2- | cut -d "(" -f 1| sed s/\ //g >> docs/devel/reference/libtinymail.types 

  • trunk/configure.ac

    r580 r589  
    249249if test x$build_pytinymail = xtrue; then 
    250250  AM_PATH_PYTHON(2.3) 
    251   dnl AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) 
     251  AC_PATH_PROG(PYTHON, python, no) 
     252  if test x$PYTHON = xno; then 
     253       AC_MSG_ERROR(Please install python) 
     254  fi 
     255  changequote(<<, >>)dnl 
     256  PY_VER=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_vars("VERSION")[0];'` 
     257  PY_LIB=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(standard_lib=1);'` 
     258  PY_INC=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_vars("INCLUDEPY")[0];'` 
     259  PY_PREFIX=`$PYTHON -c 'import sys; print sys.prefix'` 
     260  PY_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix'` 
     261  changequote([, ])dnl 
     262  if test -f $PY_INC/Python.h; then 
     263    PYTHON_LIBS="-L$PY_LIB/config -lpython$PY_VER -lpthread -lutil" 
     264    PYTHON_CFLAGS="-I$PY_INC" 
     265  else 
     266    AC_MSG_ERROR([Can't find Python.h]) 
     267  fi 
     268 
    252269  AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no) 
    253270  if test "x$PYGTK_CODEGEN" = xno; then 
    …… 
    256273  AC_MSG_CHECKING(for pygtk defs) 
    257274  PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` 
     275   
    258276  AC_SUBST(PYGTK_DEFSDIR) 
    259277  AC_MSG_RESULT($PYGTK_DEFSDIR) 
    260278 
    261279  PKG_CHECK_MODULES(TINYMAIL_PYTHON, pygobject-2.0 pygtk-2.0 gnome-vfs-2.0) 
     280  TINYMAIL_PYTHON_CFLAGS="$TINYMAIL_PYTHON_CFLAGS $PYTHON_CFLAGS" 
     281  TINYMAIL_PYTHON_LIBS="$TINYMAIL_PYTHON_LIBS $PYTHON_LIBS" 
    262282else 
    263283  TINYMAIL_PYTHON_CFLAGS= 

  • trunk/po/POTFILES.in

    r379 r589  
    11tinymail/tny-main.c 
    2 tinymail/tny-summary-window.c 
    32libtinymail-gnome-desktop/tny-platform-factory.c 
    43libtinymail-gnome-desktop/tny-account-store.c 

  • trunk/tinymail-python/Makefile.am

    r333 r589  
    44tinymail_LTLIBRARIES = tinymail.la tinymail_camel.la 
    55 
    6 tinymail_la_LDFLAGS = -module -avoid-version -export-symbols-regex inittinymail 
     6tinymail_la_LDFLAGS = -module -avoid-version  
     7# -export-symbols-regex inittinymail 
    78tinymail_la_LIBADD = $(LIBTINYMAIL_CAMEL_LIBS) $(TINYMAIL_PYTHON_LIBS) $(top_srcdir)/libtinymail/libtinymail-1.0.la 
    89tinymail_la_SOURCES = \ 
    …… 
    1112nodist_tinymail_la_SOURCES = tinymailmodule.c 
    1213 
    13 tinymail_camel_la_LDFLAGS = -module -avoid-version -export-symbols-regex inittinymail_camel 
     14tinymail_camel_la_LDFLAGS = -module -avoid-version  
     15# -export-symbols-regex inittinymail_camel 
    1416tinymail_camel_la_LIBADD = $(LIBTINYMAIL_CAMEL_LIBS) $(TINYMAIL_PYTHON_LIBS) $(top_srcdir)/libtinymail-camel/libtinymail-camel-1.0.la 
    1517tinymail_camel_la_SOURCES = \ 
    …… 
    2830tinymail-camelmodule.c: tinymail_camel.defs tinymail_camel.override 
    2931 
    30 # 
    31 ## This fails the make distcheck for some reason 
    32 # 
    33 #.defs.c: 
    34 #       (cd $(srcdir) \ 
    35 #        && $(PYGTK_CODEGEN) \ 
    36 #       --override $*.override \ 
    37 #           --prefix py$* $*.defs) > gen-$*.c \ 
    38 #       && cp gen-$*.c $*.c \ 
    39 #       && rm -f gen-$*.c 
     32.defs.c: 
     33        (cd $(srcdir) && $(PYGTK_CODEGEN) --override $*.override --prefix py$* $*.defs) > gen-$*.c && cp gen-$*.c $*.c && rm -f gen-$*.c 
    4034 

  • trunk/tinymail-python/tinymail_camelmodule.c

    r140 r589  
    1313extern PyMethodDef pytinymail_camel_functions[]; 
    1414 
    15 DL_EXPORT(void) 
     15/* DL_EXPORT(void) 
    1616inittinymail_camel(void) 
    1717{ 
    …… 
    2727        if (PyErr_Occurred()) 
    2828        Py_FatalError("could not initialise module tinymail_camel"); 
    29 } 
     29} */ 

  • trunk/tinymail-python/tinymailmodule.c

    r140 r589  
    1313extern PyMethodDef pytinymail_functions[]; 
    1414 
    15 DL_EXPORT(void) 
     15/* DL_EXPORT(void) 
    1616inittinymail(void) 
    1717{ 
    …… 
    2727        if (PyErr_Occurred()) 
    2828        Py_FatalError("could not initialise module tinymail"); 
    29 } 
     29} */