[tracker] tracker: Remove tracker-compatibility



commit 059561ea47e051216e484906fb11e336eaed651b
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Jan 5 16:35:18 2016 +0100

    tracker: Remove tracker-compatibility
    
    This was scheduled for removal for 1.6, a bit late here.

 po/POTFILES.in                   |    1 -
 src/tracker/Makefile.am          |   27 +----
 src/tracker/tracker-compat.in    |    8 --
 src/tracker/tracker-compatible.c |  235 --------------------------------------
 src/tracker/tracker-compatible.h |   26 ----
 src/tracker/tracker-main.c       |   15 ---
 6 files changed, 1 insertions(+), 311 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5e26a43..76c245b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -53,7 +53,6 @@ src/tracker-store/tracker-main.vala
 src/tracker-store/tracker-store.desktop.in.in
 src/tracker-store/org.freedesktop.Tracker.Store.gschema.xml.in
 src/tracker/tracker-config.c
-src/tracker/tracker-compatible.c
 src/tracker/tracker-daemon.c
 src/tracker/tracker-dbus.c
 src/tracker/tracker-help.c
diff --git a/src/tracker/Makefile.am b/src/tracker/Makefile.am
index cd1c34b..2b284eb 100644
--- a/src/tracker/Makefile.am
+++ b/src/tracker/Makefile.am
@@ -18,8 +18,6 @@ bin_PROGRAMS = tracker
 
 tracker_SOURCES = \
        tracker-main.c \
-       tracker-compatible.c \
-       tracker-compatible.h \
        tracker-config.c \
        tracker-config.h \
        tracker-color.h \
@@ -57,33 +55,10 @@ tracker_LDADD = \
        $(BUILD_LIBS) \
        $(TRACKER_LIBS)
 
-install-data-hook: tracker-compat
-       $(AM_V_GEN) cp -f ./$^ "$(DESTDIR)${bindir}/tracker-control"
-       $(AM_V_GEN) cp -f ./$^ "$(DESTDIR)${bindir}/tracker-import"
-       $(AM_V_GEN) cp -f ./$^ "$(DESTDIR)${bindir}/tracker-info"
-       $(AM_V_GEN) cp -f ./$^ "$(DESTDIR)${bindir}/tracker-search"
-       $(AM_V_GEN) cp -f ./$^ "$(DESTDIR)${bindir}/tracker-sparql"
-       $(AM_V_GEN) cp -f ./$^ "$(DESTDIR)${bindir}/tracker-stats"
-       $(AM_V_GEN) cp -f ./$^ "$(DESTDIR)${bindir}/tracker-tag"
-
-uninstall-hook:
-       $(RM) "$(DESTDIR)$(bindir)/tracker-control" && \
-       $(RM) "$(DESTDIR)$(bindir)/tracker-import" && \
-       $(RM) "$(DESTDIR)$(bindir)/tracker-info" && \
-       $(RM) "$(DESTDIR)$(bindir)/tracker-search" && \
-       $(RM) "$(DESTDIR)$(bindir)/tracker-sparql" && \
-       $(RM) "$(DESTDIR)$(bindir)/tracker-stats" && \
-       $(RM) "$(DESTDIR)$(bindir)/tracker-tag"
-
 # Bash completion
 if WITH_BASH_COMPLETION
 bashcompletiondir = $(BASH_COMPLETION_DIR)
 bashcompletion_DATA = bash-completion/tracker
 endif
 
-tracker-compat: tracker-compat.in
-       $(AM_V_at)sed -e "s|@bindir[ ]|${bindir}|" $< > $@
-       $(AM_V_at)chmod +x $@
-
-EXTRA_DIST = $(bashcompletion_DATA) tracker-compat.in
-CLEANFILES = tracker-compat
+EXTRA_DIST = $(bashcompletion_DATA)
diff --git a/src/tracker/tracker-main.c b/src/tracker/tracker-main.c
index 4633f42..8c7d5b5 100644
--- a/src/tracker/tracker-main.c
+++ b/src/tracker/tracker-main.c
@@ -29,7 +29,6 @@
 #include <libtracker-common/tracker-common.h>
 
 #include "tracker-daemon.h"
-#include "tracker-compatible.h"
 #include "tracker-help.h"
 #include "tracker-index.h"
 #include "tracker-info.h"
@@ -198,8 +197,6 @@ print_usage (void)
 int
 main (int original_argc, char **original_argv)
 {
-       int new_argc = 0;
-       char **new_argv = NULL;
        const char **argv = (const char **) original_argv;
        int argc = original_argc;
 
@@ -209,12 +206,6 @@ main (int original_argc, char **original_argv)
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
        textdomain (GETTEXT_PACKAGE);
 
-       /* Handle old commands symlinked */
-       if (tracker_compatible_commands (argc, argv, &new_argc, &new_argv)) {
-               argv = (const char **) new_argv;
-               argc = new_argc;
-       }
-
        argv++;
        argc--;
 
@@ -222,12 +213,6 @@ main (int original_argc, char **original_argv)
                /* For cases like --version */
                if (g_str_has_prefix (argv[0], "--")) {
                        argv[0] += 2;
-               } else {
-                       /* Check for compatibility changes necessary before continuing */
-                       if (tracker_compatible (argc, argv, &new_argc, &new_argv)) {
-                               argv = (const char **) new_argv;
-                               argc = new_argc;
-                       }
                }
        } else {
                /* The user didn't specify a command; give them help */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]