GNOME.org
 

tracker r2056 - in branches/indexer-split: . po src src/libtracker src/tracker-utils

Author: mr
Date: Tue Aug 12 14:20:18 2008
New Revision: 2056
URL: http://svn.gnome.org/viewvc/tracker?rev=2056&view=rev

Log:
	* POTFILES.in:

	* configure.ac:
	* src/Makefile.am:
	* src/libtracker/Makefile.am:
	* src/libtracker/tracker-files.c:
	* src/libtracker/tracker-get-meta-for-folder.c:
	* src/libtracker/tracker-query.c:
	* src/libtracker/tracker-search.c:
	* src/libtracker/tracker-stats.c:
	* src/libtracker/tracker-status.c:
	* src/libtracker/tracker-tag.c:
	* src/libtracker/tracker-unique.c:
	* src/tracker-utils/tracker-files.c:
	* src/tracker-utils/tracker-query.c:
	* src/tracker-utils/tracker-search.c:
	* src/tracker-utils/tracker-stats.c: 
	* src/tracker-utils/tracker-status.c:
	* src/tracker-utils/tracker-tag.c: Moved all utilities to a
	tracker-utils folder instead of mixing them up with the libtracker
	library.


Added:
   branches/indexer-split/src/tracker-utils/
   branches/indexer-split/src/tracker-utils/tracker-files.c
      - copied, changed from r2046, /branches/indexer-split/src/libtracker/tracker-files.c
   branches/indexer-split/src/tracker-utils/tracker-meta-folder.c
      - copied unchanged from r2046, /branches/indexer-split/src/libtracker/tracker-get-meta-for-folder.c
   branches/indexer-split/src/tracker-utils/tracker-query.c
      - copied, changed from r2046, /branches/indexer-split/src/libtracker/tracker-query.c
   branches/indexer-split/src/tracker-utils/tracker-search.c
      - copied, changed from r2046, /branches/indexer-split/src/libtracker/tracker-search.c
   branches/indexer-split/src/tracker-utils/tracker-stats.c
      - copied, changed from r2046, /branches/indexer-split/src/libtracker/tracker-stats.c
   branches/indexer-split/src/tracker-utils/tracker-status.c
      - copied, changed from r2046, /branches/indexer-split/src/libtracker/tracker-status.c
   branches/indexer-split/src/tracker-utils/tracker-tag.c
      - copied, changed from r2046, /branches/indexer-split/src/libtracker/tracker-tag.c
   branches/indexer-split/src/tracker-utils/tracker-unique.c
      - copied unchanged from r2046, /branches/indexer-split/src/libtracker/tracker-unique.c
Removed:
   branches/indexer-split/src/libtracker/tracker-files.c
   branches/indexer-split/src/libtracker/tracker-get-meta-for-folder.c
   branches/indexer-split/src/libtracker/tracker-query.c
   branches/indexer-split/src/libtracker/tracker-search.c
   branches/indexer-split/src/libtracker/tracker-stats.c
   branches/indexer-split/src/libtracker/tracker-status.c
   branches/indexer-split/src/libtracker/tracker-tag.c
   branches/indexer-split/src/libtracker/tracker-unique.c
Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/configure.ac
   branches/indexer-split/po/ChangeLog
   branches/indexer-split/po/POTFILES.in
   branches/indexer-split/src/Makefile.am
   branches/indexer-split/src/libtracker/Makefile.am

Modified: branches/indexer-split/configure.ac
==============================================================================
--- branches/indexer-split/configure.ac	(original)
+++ branches/indexer-split/configure.ac	Tue Aug 12 14:20:18 2008
@@ -711,62 +711,63 @@
 test "$have_exempi" = "yes" && AC_DEFINE(HAVE_EXEMPI, [], [Define if we have exempi])
 
 AC_CONFIG_FILES([
-	Makefile
-	tracker.pc
-	trackerd.desktop.in
-	libtracker-gtk.pc
-	docs/Makefile
-	data/Makefile
 	data/dbus/Makefile
-	data/modules/Makefile
-	data/languages/Makefile
-	data/icons/Makefile
 	data/icons/16x16/Makefile
 	data/icons/22x22/Makefile
 	data/icons/24x24/Makefile
 	data/icons/32x32/Makefile
 	data/icons/48x48/Makefile
+	data/icons/Makefile
 	data/icons/scalable/Makefile
+	data/languages/Makefile
+	data/Makefile
+	data/modules/Makefile
 	data/services/Makefile
-	filters/Makefile
+	docs/Makefile
 	filters/application/Makefile
+	filters/Makefile
 	filters/text/Makefile
-	thumbnailers/Makefile
-	thumbnailers/application/Makefile
-	thumbnailers/image/Makefile
-	src/Makefile
-	src/qdbm/Makefile
-	src/tracker-extract/Makefile
-	src/tracker-thumbnailer/Makefile
+	libtracker-gtk.pc
+	Makefile
+	po/Makefile.in
+	python/deskbar-handler/Makefile
+	python/Makefile
 	src/libstemmer/Makefile
 	src/libtracker-common/Makefile
-	src/libtracker/Makefile
 	src/libtracker-db/Makefile
 	src/libtracker-gtk/Makefile
-	src/tracker-indexer/Makefile
-	src/tracker-indexer/modules/Makefile
+	src/libtracker/Makefile
+	src/Makefile
+	src/qdbm/Makefile
 	src/tracker-applet/Makefile
 	src/tracker-applet/tracker-applet.desktop.in
-	src/tracker-search-tool/Makefile
-	src/tracker-search-tool/tracker-search-tool.desktop.in
+	src/trackerd/Makefile
+	src/tracker-extract/Makefile
+	src/tracker-indexer/Makefile
+	src/tracker-indexer/modules/Makefile
 	src/tracker-preferences/Makefile
 	src/tracker-preferences/tracker-preferences.desktop.in	
-	src/trackerd/Makefile
-	tests/Makefile
+	src/tracker-search-tool/Makefile
+	src/tracker-search-tool/tracker-search-tool.desktop.in
+	src/tracker-thumbnailer/Makefile
+	src/tracker-utils/Makefile
+	src/xdgmime/Makefile
 	tests/common/Makefile
 	tests/libtracker-common/Makefile
-	tests/trackerd/Makefile
-	tests/trackerd/xesam/Makefile
 	tests/libtracker-db/Makefile
+	tests/Makefile
 	tests/scripts/dummy_data_start.sh
 	tests/scripts/dummy_data_stop.sh
 	tests/scripts/Makefile
+	tests/trackerd/Makefile
+	tests/trackerd/xesam/Makefile
+	thumbnailers/application/Makefile
+	thumbnailers/image/Makefile
+	thumbnailers/Makefile
+	trackerd.desktop.in
+	tracker.pc
 	utils/Makefile
 	utils/qdbm/Makefile
-	src/xdgmime/Makefile
-	po/Makefile.in
-	python/Makefile
-	python/deskbar-handler/Makefile
 ])
 
 AC_CONFIG_HEADERS([config.h])

Modified: branches/indexer-split/po/POTFILES.in
==============================================================================
--- branches/indexer-split/po/POTFILES.in	(original)
+++ branches/indexer-split/po/POTFILES.in	Tue Aug 12 14:20:18 2008
@@ -8,16 +8,9 @@
 src/libtracker-common/tracker-utils.c
 src/libtracker-gtk/tracker-metadata-tile.c
 src/libtracker-gtk/tracker-tag-bar.c
-src/libtracker/tracker-files.c
-src/libtracker/tracker-query.c
-src/libtracker/tracker-search.c
-src/libtracker/tracker-stats.c
-src/libtracker/tracker-status.c
-src/libtracker/tracker-tag.c
 src/tracker-applet/tracker-applet.c
 src/tracker-applet/tracker-applet.desktop.in.in
 src/tracker-applet/tracker-applet-prefs.glade
-src/trackerd/tracker-main.c
 src/tracker-indexer/tracker-indexer.c
 src/tracker-indexer/tracker-main.c
 src/tracker-preferences/tracker-preferences.c
@@ -27,4 +20,11 @@
 src/tracker-search-tool/tracker-search-tool-callbacks.c
 src/tracker-search-tool/tracker-search-tool.desktop.in.in
 src/tracker-search-tool/tracker-search-tool-support.c
+src/tracker-utils/tracker-files.c
+src/tracker-utils/tracker-query.c
+src/tracker-utils/tracker-search.c
+src/tracker-utils/tracker-stats.c
+src/tracker-utils/tracker-status.c
+src/tracker-utils/tracker-tag.c
+src/trackerd/tracker-main.c
 trackerd.desktop.in.in

Modified: branches/indexer-split/src/Makefile.am
==============================================================================
--- branches/indexer-split/src/Makefile.am	(original)
+++ branches/indexer-split/src/Makefile.am	Tue Aug 12 14:20:18 2008
@@ -26,6 +26,7 @@
 	libtracker-db				\
 	trackerd				\
 	libtracker				\
+	tracker-utils				\
 	tracker-extract				\
 	tracker-thumbnailer			\
 	tracker-indexer				\

Modified: branches/indexer-split/src/libtracker/Makefile.am
==============================================================================
--- branches/indexer-split/src/libtracker/Makefile.am	(original)
+++ branches/indexer-split/src/libtracker/Makefile.am	Tue Aug 12 14:20:18 2008
@@ -1,72 +1,35 @@
-INCLUDES = -I.	-I..				\
-	-DTRACKER_DATADIR=\""$(datadir)"\"	\
-	-DTRACKER_LOCALEDIR=\""$(localedir)"\"	\
+INCLUDES = 					\
+	-g					\
+	-DLOCALEDIR=\""$(localedir)"\" 		\
+	-DG_LOG_DOMAIN=\"Tracker\"		\
+	-I$(top_srcdir)/src			\
 	$(GLIB2_CFLAGS)				\
 	$(DBUS_CFLAGS)			
 
-# Common linking
-libs =						\
-	$(GLIB2_LIBS) 				\
-	    	       	     $(DBUS_LIBS)	\
-			     $(GOBJECT_LIBS)
-
-# Libraries
 lib_LTLIBRARIES = libtrackerclient.la
 
 libtrackerclient_la_SOURCES = tracker.c
 libtrackerclient_la_LDFLAGS = -version-info 0:0:0
-libtrackerclient_la_LIBADD = $(libs)
-
+libtrackerclient_la_LIBADD = 			\
+	$(GLIB2_LIBS) 				\
+	$(DBUS_LIBS)				\
+	$(GOBJECT_LIBS)
+	
 include_HEADERS = 				\
 	tracker.h				\
 	$(BUILT_SOURCES)		
 
-# Applications
-bin_PROGRAMS = 					\
-	tracker-search 				\
-	tracker-query 				\
-	tracker-meta-folder			\
-	tracker-stats				\
-	tracker-tag				\
-	tracker-files				\
-	tracker-status				\
-	tracker-unique
-
-tracker_search_SOURCES = tracker-search.c
-tracker_search_LDADD = $(libs) libtrackerclient.la
-
-tracker_query_SOURCES = tracker-query.c
-tracker_query_LDADD = $(libs) libtrackerclient.la
-
-tracker_meta_folder_SOURCES = tracker-get-meta-for-folder.c
-tracker_meta_folder_LDADD = $(libs) libtrackerclient.la
-
-tracker_stats_SOURCES = tracker-stats.c
-tracker_stats_LDADD = $(libs) libtrackerclient.la
-
-tracker_tag_SOURCES = tracker-tag.c
-tracker_tag_LDADD = $(libs) libtrackerclient.la
-
-tracker_files_SOURCES = tracker-files.c
-tracker_files_LDADD = $(libs) libtrackerclient.la
-
-tracker_status_SOURCES = tracker-status.c
-tracker_status_LDADD = $(libs) libtrackerclient.la
-
-tracker_unique_SOURCES = tracker-unique.c
-tracker_unique_LDADD = $(libs) libtrackerclient.la
-
 # Generate DBus files from XML data.
 dbus_sources = 					\
-	tracker-daemon-glue.h		\
-	tracker-files-glue.h		\
-	tracker-keywords-glue.h		\
-	tracker-metadata-glue.h		\
+	tracker-daemon-glue.h			\
+	tracker-files-glue.h			\
+	tracker-keywords-glue.h			\
+	tracker-metadata-glue.h			\
 	tracker-search-glue.h
 
 %-glue.h: $(top_srcdir)/data/dbus/%.xml
 	$(DBUSBINDINGTOOL) --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
 
 BUILT_SOURCES = $(dbus_sources)
- 
+
 CLEANFILES = $(BUILT_SOURCES)

Copied: branches/indexer-split/src/tracker-utils/tracker-files.c (from r2046, /branches/indexer-split/src/libtracker/tracker-files.c)
==============================================================================
--- /branches/indexer-split/src/libtracker/tracker-files.c	(original)
+++ branches/indexer-split/src/tracker-utils/tracker-files.c	Tue Aug 12 14:20:18 2008
@@ -53,7 +53,7 @@
 	GError *error = NULL;
 	GOptionContext *context;
 
-	bindtextdomain (GETTEXT_PACKAGE, TRACKER_LOCALEDIR);
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 

Copied: branches/indexer-split/src/tracker-utils/tracker-query.c (from r2046, /branches/indexer-split/src/libtracker/tracker-query.c)
==============================================================================
--- /branches/indexer-split/src/libtracker/tracker-query.c	(original)
+++ branches/indexer-split/src/tracker-utils/tracker-query.c	Tue Aug 12 14:20:18 2008
@@ -118,7 +118,7 @@
 	GError *error = NULL;
 	TrackerClient *client = NULL;
 
-	bindtextdomain (GETTEXT_PACKAGE, TRACKER_LOCALEDIR);
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 

Copied: branches/indexer-split/src/tracker-utils/tracker-search.c (from r2046, /branches/indexer-split/src/libtracker/tracker-search.c)
==============================================================================
--- /branches/indexer-split/src/libtracker/tracker-search.c	(original)
+++ branches/indexer-split/src/tracker-utils/tracker-search.c	Tue Aug 12 14:20:18 2008
@@ -85,7 +85,7 @@
 	GPtrArray *out_array = NULL;
 
 
-	bindtextdomain (GETTEXT_PACKAGE, TRACKER_LOCALEDIR);
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 

Copied: branches/indexer-split/src/tracker-utils/tracker-stats.c (from r2046, /branches/indexer-split/src/libtracker/tracker-stats.c)
==============================================================================
--- /branches/indexer-split/src/libtracker/tracker-stats.c	(original)
+++ branches/indexer-split/src/tracker-utils/tracker-stats.c	Tue Aug 12 14:20:18 2008
@@ -64,7 +64,7 @@
 	GOptionContext *context = NULL;
 	TrackerClient *client = NULL;
 
-	bindtextdomain (GETTEXT_PACKAGE, TRACKER_LOCALEDIR);
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 

Copied: branches/indexer-split/src/tracker-utils/tracker-status.c (from r2046, /branches/indexer-split/src/libtracker/tracker-status.c)
==============================================================================
--- /branches/indexer-split/src/libtracker/tracker-status.c	(original)
+++ branches/indexer-split/src/tracker-utils/tracker-status.c	Tue Aug 12 14:20:18 2008
@@ -36,11 +36,11 @@
 	TrackerClient *client = NULL;
 	gchar* status;
 
-	bindtextdomain (GETTEXT_PACKAGE, TRACKER_LOCALEDIR);
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-	client =  tracker_connect (FALSE);
+	client = tracker_connect (FALSE);
 
         if (!client) {
                 g_printerr (_("%s: no connection to tracker daemon"), argv[0]);

Copied: branches/indexer-split/src/tracker-utils/tracker-tag.c (from r2046, /branches/indexer-split/src/libtracker/tracker-tag.c)
==============================================================================
--- /branches/indexer-split/src/libtracker/tracker-tag.c	(original)
+++ branches/indexer-split/src/tracker-utils/tracker-tag.c	Tue Aug 12 14:20:18 2008
@@ -87,7 +87,7 @@
 	gint            i = 0;
         gint            k;
 
-	bindtextdomain (GETTEXT_PACKAGE, TRACKER_LOCALEDIR);
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]