httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From max...@apache.org
Subject svn commit: r366473 - in /httpd/mod_mbox/branches/surgery: ./ src/ src/helpers/
Date Fri, 06 Jan 2006 11:05:38 GMT
Author: maxime
Date: Fri Jan  6 03:05:24 2006
New Revision: 366473

URL: http://svn.apache.org/viewcvs?rev=366473&view=rev
Log:
Fix helpers

Added:
    httpd/mod_mbox/branches/surgery/src/Makefile.am   (with props)
    httpd/mod_mbox/branches/surgery/src/helpers/Makefile.am   (with props)
Removed:
    httpd/mod_mbox/branches/surgery/src/helpers/build-dso
Modified:
    httpd/mod_mbox/branches/surgery/Makefile.am
    httpd/mod_mbox/branches/surgery/STATUS
    httpd/mod_mbox/branches/surgery/configure.ac
    httpd/mod_mbox/branches/surgery/src/helpers/calc_threads.c
    httpd/mod_mbox/branches/surgery/src/helpers/generate_index.c
    httpd/mod_mbox/branches/surgery/src/helpers/load_index.c
    httpd/mod_mbox/branches/surgery/src/helpers/load_msgid.c

Modified: httpd/mod_mbox/branches/surgery/Makefile.am
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/Makefile.am?rev=366473&r1=366472&r2=366473&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/Makefile.am (original)
+++ httpd/mod_mbox/branches/surgery/Makefile.am Fri Jan  6 03:05:24 2006
@@ -8,4 +8,4 @@
              README \
              STATUS
 
-SUBDIRS = src/libmbox src/mod-mbox-util src/module
+SUBDIRS = src

Modified: httpd/mod_mbox/branches/surgery/STATUS
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/STATUS?rev=366473&r1=366472&r2=366473&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/STATUS (original)
+++ httpd/mod_mbox/branches/surgery/STATUS Fri Jan  6 03:05:24 2006
@@ -10,6 +10,8 @@
 
 ToDo:
 
+    * Fix helpers building process
+
     * Documentation
       - For developpers : internals
       - For users       : usage, interface description, ...

Modified: httpd/mod_mbox/branches/surgery/configure.ac
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/configure.ac?rev=366473&r1=366472&r2=366473&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/configure.ac (original)
+++ httpd/mod_mbox/branches/surgery/configure.ac Fri Jan  6 03:05:24 2006
@@ -39,7 +39,7 @@
 BIN_LDFLAGS="${LUCENE4C_LIBS} `${APR_CONFIG} --link-libtool` `${APU_CONFIG} --link-libtool`
`${APU_CONFIG} --ldflags --libs` `${APR_CONFIG} --ldflags --libs`" 
 AC_SUBST(BIN_LDFLAGS)
 
-AC_CONFIG_FILES([Makefile src/module/Makefile src/libmbox/Makefile src/mod-mbox-util/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile src/helpers/Makefile src/libmbox/Makefile src/mod-mbox-util/Makefile
src/module/Makefile])
 AC_OUTPUT
 
 echo "---"

Added: httpd/mod_mbox/branches/surgery/src/Makefile.am
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/src/Makefile.am?rev=366473&view=auto
==============================================================================
--- httpd/mod_mbox/branches/surgery/src/Makefile.am (added)
+++ httpd/mod_mbox/branches/surgery/src/Makefile.am Fri Jan  6 03:05:24 2006
@@ -0,0 +1 @@
+SUBDIRS = libmbox mod-mbox-util helpers module

Propchange: httpd/mod_mbox/branches/surgery/src/Makefile.am
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/mod_mbox/branches/surgery/src/helpers/Makefile.am
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/src/helpers/Makefile.am?rev=366473&view=auto
==============================================================================
--- httpd/mod_mbox/branches/surgery/src/helpers/Makefile.am (added)
+++ httpd/mod_mbox/branches/surgery/src/helpers/Makefile.am Fri Jan  6 03:05:24 2006
@@ -0,0 +1,23 @@
+# helpers
+
+calc_threads_SOURCES = calc_threads.c
+calc_threads_LDADD = $(top_builddir)/src/libmbox/libmbox.la
+calc_threads_CFLAGS = -Wall ${MODULE_CFLAGS}
+calc_threads_LDFLAGS =  -avoid-version ${BIN_LDFLAGS}
+
+#generate_index_SOURCES = generate_index.c
+#generate_index_LDADD = $(top_builddir)/src/libmbox/libmbox.la
+#generate_index_CFLAGS = -Wall ${MODULE_CFLAGS}
+#generate_index_LDFLAGS =  -avoid-version ${BIN_LDFLAGS}
+
+load_index_SOURCES = load_index.c
+load_index_LDADD = $(top_builddir)/src/libmbox/libmbox.la
+load_index_CFLAGS = -Wall ${MODULE_CFLAGS}
+load_index_LDFLAGS =  -avoid-version ${BIN_LDFLAGS}
+
+load_msgid_SOURCES = load_msgid.c
+load_msgid_LDADD = $(top_builddir)/src/libmbox/libmbox.la
+load_msgid_CFLAGS = -Wall ${MODULE_CFLAGS}
+load_msgid_LDFLAGS =  -avoid-version ${BIN_LDFLAGS}
+
+bin_PROGRAMS = calc_threads load_index load_msgid # generate_index

Propchange: httpd/mod_mbox/branches/surgery/src/helpers/Makefile.am
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: httpd/mod_mbox/branches/surgery/src/helpers/calc_threads.c
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/src/helpers/calc_threads.c?rev=366473&r1=366472&r2=366473&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/src/helpers/calc_threads.c (original)
+++ httpd/mod_mbox/branches/surgery/src/helpers/calc_threads.c Fri Jan  6 03:05:24 2006
@@ -20,8 +20,8 @@
 #include "apr_general.h"
 #include "apr_strings.h"
 #include "apr_hash.h"
-#include "mbox_parse.h"
-#include "mbox_thread.h"
+
+#include "libmbox.h"
 
 void print_container(Container *c, int depth)
 {
@@ -54,6 +54,7 @@
     apr_hash_index_t *hashIndex;
     void *hashKey, *hashVal;
     apr_size_t hashLen;
+    int count = 0;
 
     if (argc <= 1)
     {
@@ -77,7 +78,7 @@
                                 r.pool)) != APR_SUCCESS)
         return status;
 
-    l = load_index(&r, f);
+    l = mbox_load_index(&r, f, &count);
 
     c = calculate_threads(r.pool, l);
     print_container(c, 0);

Modified: httpd/mod_mbox/branches/surgery/src/helpers/generate_index.c
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/src/helpers/generate_index.c?rev=366473&r1=366472&r2=366473&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/src/helpers/generate_index.c (original)
+++ httpd/mod_mbox/branches/surgery/src/helpers/generate_index.c Fri Jan  6 03:05:24 2006
@@ -19,7 +19,8 @@
 #include "apr_pools.h"
 #include "apr_general.h"
 #include "apr_strings.h"
-#include "mbox_parse.h"
+
+#include "libmbox.h"
 
 int main(int argc, char** argv)
 {
@@ -51,5 +52,5 @@
                                r.pool)) != APR_SUCCESS)
         return status;
 
-   return generate_index(&r, f);
+   return mbox_generate_index(&r, f);
 }

Modified: httpd/mod_mbox/branches/surgery/src/helpers/load_index.c
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/src/helpers/load_index.c?rev=366473&r1=366472&r2=366473&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/src/helpers/load_index.c (original)
+++ httpd/mod_mbox/branches/surgery/src/helpers/load_index.c Fri Jan  6 03:05:24 2006
@@ -19,7 +19,8 @@
 #include "apr_pools.h"
 #include "apr_general.h"
 #include "apr_strings.h"
-#include "mbox_parse.h"
+
+#include "libmbox.h"
 
 int main(int argc, char** argv)
 {
@@ -29,6 +30,7 @@
     apr_status_t status;
     MBOX_LIST *l;
     Message *m;
+    int count = 0;
 
     if (argc <= 1)
     {
@@ -52,7 +54,7 @@
                                 r.pool)) != APR_SUCCESS)
         return status;
 
-    l = load_index(&r, f);
+    l = mbox_load_index(&r, f, &count);
     while (l)
     {
         m = (Message*)l->value;

Modified: httpd/mod_mbox/branches/surgery/src/helpers/load_msgid.c
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/src/helpers/load_msgid.c?rev=366473&r1=366472&r2=366473&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/src/helpers/load_msgid.c (original)
+++ httpd/mod_mbox/branches/surgery/src/helpers/load_msgid.c Fri Jan  6 03:05:24 2006
@@ -19,7 +19,8 @@
 #include "apr_pools.h"
 #include "apr_general.h"
 #include "apr_strings.h"
-#include "mbox_parse.h"
+
+#include "libmbox.h"
 
 int main(int argc, char** argv)
 {
@@ -29,6 +30,7 @@
     apr_status_t status;
     MBOX_LIST *l;
     Message *m;
+    int count = 0;
 
     if (argc <= 1)
     {
@@ -52,7 +54,7 @@
                                 r.pool)) != APR_SUCCESS)
         return status;
 
-    l = load_index(&r, f);
+    l = mbox_load_index(&r, f, &count);
     while (l)
     {
         m = (Message*)l->value;



Mime
View raw message