Hi. Attached are two patches to cleanup some of the code from previous releases. The first one removes most of the last traces of mysql things. In addition to the patch, there are 3 files which should be removed data/mysql-*.sql .
The second patch is for the sqlite setup. Since sqlite is the only database backend in use, it drops the use of USING_SQLITE. It further more, pulls in the header from the system if an external sqlite is selected. Thanks. Saleem Abdulrasool compnerd (at) gentoo (dot) org
diff -burN tracker-0.5.3/data/Makefile.am tracker-0.5.3-clean/data/Makefile.am
--- tracker-0.5.3/data/Makefile.am 2006-11-29 18:55:12.000000000 -0600
+++ tracker-0.5.3/data/Makefile.am 2007-01-09 23:47:04.000000000 -0600
@@ -3,11 +3,8 @@
configdir = $(datadir)/tracker
config_DATA = tracker-introspect.xml \
- mysql-tracker.sql \
sqlite-tracker.sql \
- mysql-stored-procs.sql \
- sqlite-stored-procs.sql \
- mysql-system.sql
+ sqlite-stored-procs.sql
servicedir = $(prefix)/share/dbus-1/services
service_in_files = tracker.service.in
diff -burN tracker-0.5.3/src/trackerd/Makefile.am
tracker-0.5.3-clean/src/trackerd/Makefile.am
--- tracker-0.5.3/src/trackerd/Makefile.am 2006-12-05 17:28:34.000000000
-0600
+++ tracker-0.5.3/src/trackerd/Makefile.am 2007-01-09 23:48:52.000000000
-0600
@@ -139,7 +139,6 @@
trackerd_LDADD = $(GLIB2_LIBS) \
$(FAM_LIBS) \
$(DBUS_LIBS) \
- $(MYSQL_LIBS) \
$(PANGO_LIBS) \
$(GMIME_LIBS) \
$(additional_libs) \
diff -burN tracker-0.5.3/src/trackerd/tracker-db.h
tracker-0.5.3-clean/src/trackerd/tracker-db.h
--- tracker-0.5.3/src/trackerd/tracker-db.h 2006-12-23 17:26:08.000000000
-0600
+++ tracker-0.5.3/src/trackerd/tracker-db.h 2007-01-09 23:48:39.000000000
-0600
@@ -31,8 +31,6 @@
#ifdef USING_SQLITE
#include "tracker-db-sqlite.h"
-#else
-#include "tracker-db-mysql.h"
#endif
gboolean tracker_db_is_file_up_to_date (DBConnection *db_con, const
char *uri, guint32 *id);
diff -burN tracker-0.5.3/src/trackerd/tracker-mbox-evolution.h
tracker-0.5.3-clean/src/trackerd/tracker-mbox-evolution.h
--- tracker-0.5.3/src/trackerd/tracker-mbox-evolution.h 2006-12-23
17:26:07.000000000 -0600
+++ tracker-0.5.3/src/trackerd/tracker-mbox-evolution.h 2007-01-09
23:48:16.000000000 -0600
@@ -32,8 +32,6 @@
#ifdef USING_SQLITE
# include "tracker-db-sqlite.h"
-#else
-# include "tracker-db-mysql.h"
#endif
diff -burN tracker-0.5.3/src/trackerd/tracker-mbox.h
tracker-0.5.3-clean/src/trackerd/tracker-mbox.h
--- tracker-0.5.3/src/trackerd/tracker-mbox.h 2006-12-23 17:26:07.000000000
-0600
+++ tracker-0.5.3/src/trackerd/tracker-mbox.h 2007-01-09 23:49:11.000000000
-0600
@@ -32,8 +32,6 @@
#ifdef USING_SQLITE
# include "tracker-db-sqlite.h"
-#else
-# include "tracker-db-mysql.h"
#endif
diff -burN tracker-0.5.3/src/trackerd/tracker-mbox-kmail.h
tracker-0.5.3-clean/src/trackerd/tracker-mbox-kmail.h
--- tracker-0.5.3/src/trackerd/tracker-mbox-kmail.h 2006-12-23
17:26:07.000000000 -0600
+++ tracker-0.5.3/src/trackerd/tracker-mbox-kmail.h 2007-01-09
23:48:02.000000000 -0600
@@ -31,8 +31,6 @@
#ifdef USING_SQLITE
# include "tracker-db-sqlite.h"
-#else
-# include "tracker-db-mysql.h"
#endif
diff -burN tracker-0.5.3/src/trackerd/tracker-mbox-thunderbird.h
tracker-0.5.3-clean/src/trackerd/tracker-mbox-thunderbird.h
--- tracker-0.5.3/src/trackerd/tracker-mbox-thunderbird.h 2006-12-23
17:26:07.000000000 -0600
+++ tracker-0.5.3/src/trackerd/tracker-mbox-thunderbird.h 2007-01-09
23:49:24.000000000 -0600
@@ -32,8 +32,6 @@
#ifdef USING_SQLITE
# include "tracker-db-sqlite.h"
-#else
-# include "tracker-db-mysql.h"
#endif
diff -burN tracker-0.5.3.no-mysql/configure.in tracker-0.5.3/configure.in
--- tracker-0.5.3.no-mysql/configure.in 2007-01-09 23:56:45.000000000 -0600
+++ tracker-0.5.3/configure.in 2007-01-10 00:21:44.000000000 -0600
@@ -223,13 +223,10 @@
)
####################################################################
-# Optional database/indexer component checks
+# External SQLite check
####################################################################
-
SQLITE_REQUIRED=3.2
-AC_DEFINE(USING_SQLITE, [], [Define if we are using sqlite])
-AM_CONDITIONAL(USING_SQLITE, true)
AC_ARG_ENABLE(external_sqlite,
AC_HELP_STRING(
@@ -239,16 +236,18 @@
if test "x$enable_external_sqlite" = "xyes";
then
-
# Check for SQLite3
PKG_CHECK_MODULES(SQLITE3, [ sqlite3 >= $SQLITE_REQUIRED ])
AC_SUBST(SQLITE3_CFLAGS)
AC_SUBST(SQLITE3_LIBS)
+
+ AC_DEFINE(USING_EXTERNAL_SQLITE, [], [Define if we are using sqlite])
AM_CONDITIONAL(USING_EXTERNAL_SQLITE, true)
else
AM_CONDITIONAL(USING_EXTERNAL_SQLITE, false)
fi
+
###############################################################################
# Check for file monitor backends
###############################################################################
diff -burN tracker-0.5.3.no-mysql/src/trackerd/Makefile.am
tracker-0.5.3/src/trackerd/Makefile.am
--- tracker-0.5.3.no-mysql/src/trackerd/Makefile.am 2007-01-09
23:56:45.000000000 -0600
+++ tracker-0.5.3/src/trackerd/Makefile.am 2007-01-10 00:20:48.000000000
-0600
@@ -1,5 +1,5 @@
if USING_EXTERNAL_SQLITE
-additional_flags= $(SQLITE3_CFLAGS)
+additional_flags= $(SQLITE3_CFLAGS) -I/usr/include
additional_libs= $(SQLITE3_LIBS)
else
additional_flags= -I$(top_builddir)/src/sqlite3
Files tracker-0.5.3.no-mysql/src/trackerd/.Makefile.am.swp and
tracker-0.5.3/src/trackerd/.Makefile.am.swp differ
diff -burN tracker-0.5.3.no-mysql/src/trackerd/tracker-db.h
tracker-0.5.3/src/trackerd/tracker-db.h
--- tracker-0.5.3.no-mysql/src/trackerd/tracker-db.h 2007-01-09
23:56:45.000000000 -0600
+++ tracker-0.5.3/src/trackerd/tracker-db.h 2007-01-10 00:01:50.000000000
-0600
@@ -29,9 +29,7 @@
#include "config.h"
-#ifdef USING_SQLITE
#include "tracker-db-sqlite.h"
-#endif
gboolean tracker_db_is_file_up_to_date (DBConnection *db_con, const
char *uri, guint32 *id);
FileInfo * tracker_db_get_file_info (DBConnection *db_con, FileInfo
*info);
diff -burN tracker-0.5.3.no-mysql/src/trackerd/tracker-db-sqlite.h
tracker-0.5.3/src/trackerd/tracker-db-sqlite.h
--- tracker-0.5.3.no-mysql/src/trackerd/tracker-db-sqlite.h 2007-01-09
23:56:45.000000000 -0600
+++ tracker-0.5.3/src/trackerd/tracker-db-sqlite.h 2007-01-10
00:04:35.000000000 -0600
@@ -22,7 +22,12 @@
#ifndef _TRACKER_SQLITE_DB_H_
#define _TRACKER_SQLITE_DB_H_
+#ifdef USING_EXTERNAL_SQLITE
+#include "<sqlite3.h>"
+#else
#include "../sqlite3/sqlite3.h"
+#endif
+
#include <glib.h>
#include "tracker-utils.h"
diff -burN tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox-evolution.h
tracker-0.5.3/src/trackerd/tracker-mbox-evolution.h
--- tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox-evolution.h
2007-01-09 23:56:45.000000000 -0600
+++ tracker-0.5.3/src/trackerd/tracker-mbox-evolution.h 2007-01-10
00:02:02.000000000 -0600
@@ -30,9 +30,7 @@
#include "config.h"
-#ifdef USING_SQLITE
-# include "tracker-db-sqlite.h"
-#endif
+#include "tracker-db-sqlite.h"
/*
diff -burN tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox.h
tracker-0.5.3/src/trackerd/tracker-mbox.h
--- tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox.h 2007-01-09
23:56:45.000000000 -0600
+++ tracker-0.5.3/src/trackerd/tracker-mbox.h 2007-01-10 00:01:29.000000000
-0600
@@ -30,9 +30,7 @@
#include "config.h"
-#ifdef USING_SQLITE
-# include "tracker-db-sqlite.h"
-#endif
+#include "tracker-db-sqlite.h"
typedef enum {
diff -burN tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox-kmail.h
tracker-0.5.3/src/trackerd/tracker-mbox-kmail.h
--- tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox-kmail.h 2007-01-09
23:56:45.000000000 -0600
+++ tracker-0.5.3/src/trackerd/tracker-mbox-kmail.h 2007-01-10
00:02:10.000000000 -0600
@@ -29,9 +29,7 @@
#include "config.h"
-#ifdef USING_SQLITE
-# include "tracker-db-sqlite.h"
-#endif
+#include "tracker-db-sqlite.h"
/*
diff -burN tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox-thunderbird.h
tracker-0.5.3/src/trackerd/tracker-mbox-thunderbird.h
--- tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox-thunderbird.h
2007-01-09 23:56:45.000000000 -0600
+++ tracker-0.5.3/src/trackerd/tracker-mbox-thunderbird.h 2007-01-10
00:01:43.000000000 -0600
@@ -30,9 +30,7 @@
#include "config.h"
-#ifdef USING_SQLITE
-# include "tracker-db-sqlite.h"
-#endif
+#include "tracker-db-sqlite.h"
/*
pgpmmqTZWT5wR.pgp
Description: PGP signature
_______________________________________________ tracker-list mailing list tracker-list@gnome.org http://mail.gnome.org/mailman/listinfo/tracker-list
