Changeset 3187

Show
Ignore:
Timestamp:
12/23/07 17:37:08
Author:
pvanhoof
Message:

2007-12-22 Philip Van Hoof <pvanhoof@gnome.org>

        • Removed libtinymail-queues and libtinymail-asyncworker since those

two libs are not going to be supported in Tinymail 1.0

        • Improvements to the NAMESPACE, LIST and LSUB things
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/ChangeLog

    r3177 r3187  
     12007-12-22  Philip Van Hoof <pvanhoof@gnome.org> 
     2 
     3        * Removed libtinymail-queues and libtinymail-asyncworker since those 
     4        two libs are not going to be supported in Tinymail 1.0 
     5        * Improvements to the NAMESPACE, LIST and LSUB things 
     6 
    172007-12-22  Philip Van Hoof <pvanhoof@gnome.org> 
    28 
  • trunk/Makefile.am

    r2573 r3187  
    3535endif 
    3636 
    37 if BUILD_QUEUES 
    38 SUBDIRS += libtinymail-queues 
    39 endif 
    40  
    41 if BUILD_ASYNCWORKER 
    42 SUBDIRS += libtinymail-asyncworker 
    43 endif 
    4437 
    4538SUBDIRS += tests bindings po  
  • trunk/configure.ac

    r3092 r3187  
    5858 
    5959dnl ### default values (will get overwritten) 
    60 build_queues=false 
    61 build_asyncworker=false 
    6260build_acap=false 
    6361build_gnome=true 
     
    214212AM_CONDITIONAL(BUILD_ACAP, test x$build_acap = xtrue) 
    215213 
    216 dnl ### Enable queues ## 
    217 AC_ARG_ENABLE(queues, 
    218 AC_HELP_STRING([--enable-queues], 
    219   [Build using queues]), 
    220 [case "${enableval}" in 
    221   yes) build_queues=true ;; 
    222   no)  build_queues=false ;; 
    223   *) AC_MSG_ERROR(bad value ${enableval} for --enable-queues) ;; 
    224 esac],[build_queues=$build_queues]) 
    225  
    226 dnl ### Enable asyncworker ## 
    227 AC_ARG_ENABLE(asyncworker, 
    228 AC_HELP_STRING([--enable-asyncworker], 
    229   [Build using asyncworker]), 
    230 [case "${enableval}" in 
    231   yes) 
    232         build_queues=true 
    233         build_asyncworker=true 
    234   ;; 
    235   no)   
    236         build_asyncworker=false  
    237         build_queues=false 
    238   ;; 
    239   *) AC_MSG_ERROR(bad value ${enableval} for --enable-asyncworker) ;; 
    240 esac],[build_asyncworker=$build_asyncworker]) 
    241  
    242 AM_CONDITIONAL(BUILD_ASYNCWORKER, test x$build_asyncworker = xtrue) 
    243 AM_CONDITIONAL(BUILD_QUEUES, test x$build_queues = xtrue) 
    244  
    245214 
    246215dnl ### Enable building the unit tests ## 
     
    341310AC_SUBST(LIBTINYMAIL_CFLAGS) 
    342311AC_SUBST(LIBTINYMAIL_LIBS) 
    343  
    344 if test x$build_queues = xtrue; then 
    345 PKG_CHECK_MODULES(LIBTINYMAIL_QUEUES, glib-2.0 >= 2.8 gobject-2.0) 
    346 AC_SUBST(LIBTINYMAIL_QUEUES_CFLAGS) 
    347 AC_SUBST(LIBTINYMAIL_QUEUES_LIBS) 
    348  if test x$build_asyncworker = xtrue; then 
    349   PKG_CHECK_MODULES(LIBTINYMAIL_ASYNCWORKER, oasyncworker-1.0 glib-2.0 >= 2.8 gobject-2.0) 
    350   AC_SUBST(LIBTINYMAIL_ASYNCWORKER_CFLAGS) 
    351   AC_SUBST(LIBTINYMAIL_ASYNCWORKER_LIBS) 
    352  fi 
    353 fi 
    354312 
    355313dnl ### libtinymailui, the ui abstraction library ## 
     
    565523libtinymail-acap/Makefile 
    566524libtinymail-acap/libtinymail-acap.pc 
    567 libtinymail-queues/Makefile 
    568 libtinymail-queues/libtinymail-queues.pc 
    569 libtinymail-asyncworker/Makefile 
    570 libtinymail-asyncworker/libtinymail-asyncworker.pc 
    571525tests/Makefile 
    572526tests/c-demo/Makefile 
     
    585539echo "  Enable ACAP features:        $build_acap" 
    586540echo "  Enable Telepathy features:   $build_tp" 
    587 echo "  Build the queues library:    $build_queues" 
    588 echo "   Build the asyncworker impl: $build_asyncworker" 
    589541echo "  HTML component:              ${with_html_component}" 
    590542echo "  Python language bindings:    $build_pytinymail" 
  • trunk/docs/devel/reference/Makefile.am

    r3143 r3187  
    3030        --source-dir=$(top_srcdir)/libtinymail-gnomevfs \ 
    3131        --source-dir=$(top_srcdir)/libtinymail-gnome-desktop \ 
    32         --source-dir=$(top_srcdir)/libtinymail-camel \ 
    33         --source-dir=$(top_srcdir)/libtinymail-queues  
     32        --source-dir=$(top_srcdir)/libtinymail-camel  
    3433 
    3534# Extra options to supply to gtkdoc-scan. 
     
    5554# e.g. HFILE_GLOB=$(top_srcdir)/*.h 
    5655# e.g. CFILE_GLOB=$(top_srcdir)/*.c 
    57 HFILE_GLOB=$(top_srcdir)/libtinymail/*.h $(top_srcdir)/libtinymailui/*.h $(top_srcdir)/libtinymailui-gtk/*.h $(top_srcdir)/libtinymail-gnomevfs/*.h $(top_srcdir)/libtinymail-camel/*.h $(top_srcdir)/libtinymailui-mozembed/*.h $(top_srcdir)/tests/shared/*.h $(top_srcdir)/libtinymail-queues/*.h 
     56HFILE_GLOB=$(top_srcdir)/libtinymail/*.h $(top_srcdir)/libtinymailui/*.h $(top_srcdir)/libtinymailui-gtk/*.h $(top_srcdir)/libtinymail-gnomevfs/*.h $(top_srcdir)/libtinymail-camel/*.h $(top_srcdir)/libtinymailui-mozembed/*.h $(top_srcdir)/tests/shared/*.h 
    5857 
    59 CFILE_GLOB=$(top_srcdir)/libtinymail/*.c $(top_srcdir)/libtinymailui/*.c $(top_srcdir)/libtinymailui-gtk/*.c $(top_srcdir)/libtinymail-gnomevfs/*.c $(top_srcdir)/libtinymail-camel/*.c $(top_srcdir)/libtinymailui-mozembed/*.c $(top_srcdir)/tests/shared/*.c $(top_srcdir)/libtinymail-queues/*.c 
     58CFILE_GLOB=$(top_srcdir)/libtinymail/*.c $(top_srcdir)/libtinymailui/*.c $(top_srcdir)/libtinymailui-gtk/*.c $(top_srcdir)/libtinymail-gnomevfs/*.c $(top_srcdir)/libtinymail-camel/*.c $(top_srcdir)/libtinymailui-mozembed/*.c $(top_srcdir)/tests/shared/*.c 
    6059 
    6160# Header files to ignore when scanning. 
     
    9594        -I$(top_srcdir)/libtinymail-gnomevfs                            \ 
    9695        -I$(top_srcdir)/tinymail                                        \ 
    97         -I$(top_srcdir)/tests/shared                                    \ 
    98         -I$(top_srcdir)/libtinymail-queues                              \ 
    99         $(LIBTINYMAIL_ASYNCWORKER_CFLAGS) 
     96        -I$(top_srcdir)/tests/shared                                     
    10097 
    10198GTKDOC_LIBS= $(LIBTINYMAIL_LIBS) $(LIBTINYMAILUI_LIBS)                                          \ 
     
    103100        $(LIBTINYMAILUI_GTK_LIBS) $(LIBTINYMAILUI_MOZEMBED_LIBS)                                \ 
    104101        $(LIBTINYMAIL_GNOME_DESKTOP_LIBS) $(LIBTINYMAIL_TEST_LIBS)                              \ 
    105         $(TINYMAIL_LIBS) $(LIBTINYMAIL_ASYNCWORKER_LIBS)                                      \ 
     102        $(TINYMAIL_LIBS)                                                                      \ 
    106103        $(LIBTINYMAILUI_WEBKIT_LIBS)                                                            \ 
    107104        $(top_builddir)/libtinymail/libtinymail-$(API_VERSION).la                               \ 
     
    112109        $(top_builddir)/libtinymail-gnome-desktop/libtinymail-gnome-desktop-$(API_VERSION).la   \ 
    113110        $(top_builddir)/libtinymail-gnomevfs/libtinymail-gnomevfs-$(API_VERSION).la             \ 
    114         $(top_builddir)/libtinymail-queues/libtinymail-queues-$(API_VERSION).la                 \ 
    115111        $(top_builddir)/tests/shared/libtestsshared.la 
    116112 
  • trunk/docs/devel/reference/libtinymail-docs.sgml

    r3151 r3187  
    102102<!ENTITY libtinymail-gnome-desktop-TnyGnomeAccountStore SYSTEM "xml/tny-gnome-account-store.xml"> 
    103103<!ENTITY libtinymail-gnome-desktop-TnyGnomeDevice SYSTEM "xml/tny-gnome-device.xml"> 
    104  
    105 <!ENTITY libtinymail-asyncworker-TnyAsyncWorkerQueueTask SYSTEM "xml/tny-async-worker-queue-task.xml"> 
    106 <!ENTITY libtinymail-asyncworker-TnyAsyncWorkerQueue SYSTEM "xml/tny-async-worker-queue.xml"> 
    107  
    108 <!-- !ENTITY libtinymail-queues-TnyQueue SYSTEM "xml/tny-queue.xml" //--> 
    109 <!-- !ENTITY libtinymail-queues-TnyQueueTask SYSTEM "xml/tny-queue-task.xml" //--> 
    110 <!-- !ENTITY libtinymail-queues-TnyGenericSendQueue SYSTEM "xml/tny-generic-send-queue.xml" //--> 
    111 <!-- !ENTITY libtinymail-queues-TnyGetMsgQueue SYSTEM "xml/tny-get-msg-queue.xml" //--> 
    112104 
    113105<!ENTITY index-Object-Tree SYSTEM "xml/tree_index.sgml"> 
     
    232224        </chapter> 
    233225 
    234         <!-- chapter id="libtinymail-queues"> 
    235                 <title>A queue library</title> 
    236                 &libtinymail-queues-TnyQueue; 
    237                 &libtinymail-queues-TnyQueueTask; 
    238                 &libtinymail-queues-TnyGenericSendQueue; 
    239                 &libtinymail-queues-TnyGetMsgQueue; 
    240         </chapter //--> 
    241  
    242         <!-- chapter id="libtinymail-asyncworker"> 
    243                 <title>A library that implements TnyQueue</title> 
    244                 &libtinymail-asyncworker-TnyAsyncWorkerQueueTask; 
    245                 &libtinymail-asyncworker-TnyAsyncWorkerQueue; 
    246         </chapter //--> 
    247  
    248226        <chapter id="libtinymail-camel"> 
    249227                <title>libtinymail-camel - implementation of the main library</title> 
  • trunk/tests/c-demo/Makefile.am

    r2837 r3187  
    1111if BUILD_GNOME 
    1212INCLUDES += -DGNOME 
    13 endif 
    14  
    15 if BUILD_QUEUES 
    16 INCLUDES += -DQUEUES -I$(top_srcdir)/libtinymail-queues 
    17 endif 
    18  
    19 if BUILD_ASYNCWORKER 
    20 INCLUDES += -DASYNCWORKER -I$(top_srcdir)/libtinymail-asyncworker $(LIBTINYMAIL_ASYNCWORKER_CFLAGS) 
    2113endif 
    2214 
     
    4133        $(top_builddir)/$(PLATFORMDIR)/$(PLATFORMDIR)-$(API_VERSION).la 
    4234 
    43 if BUILD_QUEUES 
    44 tny_demoui_LDADD +=  $(top_builddir)/libtinymail-queues/libtinymail-queues-$(API_VERSION).la 
    45 endif 
    46  
    47 if BUILD_ASYNCWORKER 
    48 tny_demoui_LDADD +=  $(top_builddir)/libtinymail-asyncworker/libtinymail-asyncworker-$(API_VERSION).la \ 
    49         $(LIBTINYMAIL_ASYNCWORKER_LIBS) 
    50 endif 
    5135 
    5236if BUILD_MOZEMBED