[gvfs] programs: Deprecate gvfs utils in favour of new gio tool

From: Ondrej Holy <oholy src gnome org>
To: commits-list gnome org
Cc:
Subject: [gvfs] programs: Deprecate gvfs utils in favour of new gio tool
Date: Mon, 3 Oct 2016 14:19:19 +0000 (UTC)
commit 2f28fa49cfeb1c82927a1c7c0021b15e2742149f
Author: Ondrej Holy <oholy redhat com>
Date:   Mon Aug 1 12:46:43 2016 +0200

    programs: Deprecate gvfs utils in favour of new gio tool
    
    New gio cmd tool has been added in GLib. The tool collects and unifies
    the various gvfs- utils. The gvfs- utils use GIO APIs anyway, so it
    makes sense for them to be part of GLib and doesn't longer make sense to
    maintain them here. Let's remove them and add scripts spawning new gio
    tool with deprecation warning instead.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=769378

 configure.ac                    |   23 +-
 programs/Makefile.am            |   88 ++--
 programs/completion/Makefile.am |   41 --
 programs/completion/gvfs-cat    |   57 --
 programs/deprecated.in          |    6 +
 programs/gvfs-cat.c             |  206 -------
 programs/gvfs-copy.c            |  252 --------
 programs/gvfs-info.c            |  426 --------------
 programs/gvfs-ls.c              |  482 ----------------
 programs/gvfs-mime.c            |  197 -------
 programs/gvfs-mkdir.c           |  115 ----
 programs/gvfs-monitor-dir.c     |  175 ------
 programs/gvfs-monitor-file.c    |  167 ------
 programs/gvfs-mount.c           | 1203 ---------------------------------------
 programs/gvfs-move.c            |  247 --------
 programs/gvfs-open.c            |  244 --------
 programs/gvfs-rename.c          |  124 ----
 programs/gvfs-rm.c              |  106 ----
 programs/gvfs-save.c            |  206 -------
 programs/gvfs-set-attribute.c   |  244 --------
 programs/gvfs-trash.c           |  148 -----
 programs/gvfs-tree.c            |  297 ----------
 22 files changed, 44 insertions(+), 5010 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a38f8ee..43b6087 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ GTK_DOC_CHECK
 DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.49.3 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.49.4 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0])
 
 PKG_CHECK_MODULES([DBUS], [dbus-1])
 
@@ -763,25 +763,6 @@ AC_CHECK_DECL(_NL_ADDRESS_COUNTRY_AB3,
               AC_DEFINE(HAVE_NL_ADDRESS_COUNTRY_AB3, 1, Define to 1 if _NL_ADDRESS_COUNTRY_AB3 is declared),,
               [#include <langinfo.h>])
 
-dnl Install bash-completion file?
-AC_ARG_ENABLE([bash-completion],
-             [AS_HELP_STRING([--disable-bash-completion],
-                             [build without bash-completion support])],
-             [msg_bash_completion=$enableval],
-             [msg_bash_completion=yes])
-if test "x$enable_bash_completion" != "xno"; then
-  msg_bash_completion=yes
-fi
-AM_CONDITIONAL([ENABLE_BASHCOMP], [test "$msg_bash_completion" = "yes"])
-
-AC_ARG_WITH([bash-completion-dir],
-           [AS_HELP_STRING([--with-bash-completion-dir=PATH],
-                           [choose directory for bash-completion file 
(default=DATADIR/bash-completion/completions)])],
-           [with_bashcomp_dir=$withval],
-           [with_bashcomp_dir=$datadir/bash-completion/completions])
-BASHCOMP_DIR=$with_bashcomp_dir
-AC_SUBST(BASHCOMP_DIR)
-
 dnl ==========================================================================
        
 dnl Globally define_GNU_SOURCE and therefore enable the GNU extensions
@@ -939,7 +920,6 @@ monitor/afc/Makefile
 monitor/mtp/Makefile
 monitor/goa/Makefile
 programs/Makefile
-programs/completion/Makefile
 man/Makefile
 test/Makefile
 po/Makefile.in
@@ -976,7 +956,6 @@ echo "
         Use GCR:                      $msg_gcr
        GNOME Keyring support:        $msg_keyring
        GTK+ support:                 $msg_gtk
-       Bash-completion support:      $msg_bash_completion
        Installed tests:              $msg_installed_tests
 "
 
diff --git a/programs/Makefile.am b/programs/Makefile.am
index da18410..d69734b 100644
--- a/programs/Makefile.am
+++ b/programs/Makefile.am
@@ -1,19 +1,8 @@
 NULL =
 
-if ENABLE_BASHCOMP
-SUBDIRS = completion
-endif
+bin_in_files = program.in
 
-AM_CPPFLAGS =                                  \
-       -I$(top_srcdir)                         \
-       -I$(top_builddir)                       \
-       $(GLIB_CFLAGS)                          \
-       -DGVFS_LOCALEDIR=\""$(localedir)"\"
-
-libraries =                                    \
-       $(GLIB_LIBS)
-
-bin_PROGRAMS =                                 \
+bin_SCRIPTS =                                  \
        gvfs-mount                              \
        gvfs-cat                                \
        gvfs-open                               \
@@ -31,61 +20,58 @@ bin_PROGRAMS =                                      \
        gvfs-monitor-dir                        \
        gvfs-mkdir                              \
        gvfs-mime                               \
-       $(NULL)
-
-bin_SCRIPTS =                                  \
        gvfs-less                               \
        $(NULL)
 
-gvfs_cat_SOURCES = gvfs-cat.c
-gvfs_cat_LDADD = $(libraries)
+gvfs-mount: deprecated.in Makefile
+       $(AM_V_GEN) $(SED) -e "s|\@replacement\@|gio mount|" $< > $@
 
-gvfs_open_SOURCES = gvfs-open.c
-gvfs_open_LDADD = $(libraries)
+gvfs-cat: deprecated.in Makefile
+       $(AM_V_GEN) $(SED) -e "s|\@replacement\@|gio cat|" $< > $@
 
-gvfs_copy_SOURCES = gvfs-copy.c
-gvfs_copy_LDADD = $(libraries)
+gvfs-open: deprecated.in Makefile
+       $(AM_V_GEN) $(SED) -e "s|\@replacement\@|gio open|" $< > $@
 
-gvfs_save_SOURCES = gvfs-save.c
-gvfs_save_LDADD = $(libraries)
+gvfs-save: deprecated.in Makefile
+       $(AM_V_GEN) $(SED) -e "s|\@replacement\@|gio save|" $< > $@
 
-gvfs_info_SOURCES = gvfs-info.c
-gvfs_info_LDADD = $(libraries)
+gvfs-ls: deprecated.in Makefile
+       $(AM_V_GEN) $(SED) -e "s|\@replacement\@|gio list|" $< > $@
 
-gvfs_set_attribute_SOURCES = gvfs-set-attribute.c
-gvfs_set_attribute_LDADD = $(libraries)
+gvfs-tree: deprecated.in Makefile
+       $(AM_V_GEN) $(SED) -e "s|\@replacement\@|gio tree|" $< > $@
 
-gvfs_trash_SOURCES = gvfs-trash.c
-gvfs_trash_LDADD = $(libraries)
+gvfs-info: deprecated.in Makefile
+       $(AM_V_GEN) $(SED) -e "s|\@replacement\@|gio info|" $< > $@
 
-gvfs_rename_SOURCES = gvfs-rename.c
-gvfs_rename_LDADD = $(libraries)
+gvfs-set-attribute: deprecated.in Makefile
+       $(AM_V_GEN) $(SED) -e "s|\@replacement\@|gio set|" $< > $@
 
-gvfs_rm_SOURCES = gvfs-rm.c
-gvfs_rm_LDADD = $(libraries)
+gvfs-trash: deprecated.in Makefile
+       $(AM_V_GEN) $(SED) -e "s|\@replacement\@|gio trash|" $< > $@
 
-gvfs_ls_SOURCES = gvfs-ls.c
-gvfs_ls_LDADD = $(libraries)
+gvfs-rename: deprecated.in Makefile
+       $(AM_V_GEN) $(SED) -e "s|\@replacement\@|gio rename|" $< > $@
 
-gvfs_tree_SOURCES = gvfs-tree.c
-gvfs_tree_LDADD = $(libraries)
+gvfs-rm: deprecated.in Makefile
+       $(AM_V_GEN) $(SED) -e "s|\@replacement\@|gio remove|" $< > $@
 
-gvfs_move_SOURCES = gvfs-move.c
-gvfs_move_LDADD = $(libraries)
+gvfs-copy: deprecated.in Makefile
+       $(AM_V_GEN) $(SED) -e "s|\@replacement\@|gio copy|" $< > $@
 
-gvfs_mount_SOURCES = gvfs-mount.c
-gvfs_mount_LDADD = $(libraries)
+gvfs-move: deprecated.in Makefile
+       $(AM_V_GEN) $(SED) -e "s|\@replacement\@|gio move|" $< > $@
 
-gvfs_monitor_dir_SOURCES = gvfs-monitor-dir.c
-gvfs_monitor_dir_LDADD = $(libraries)
+gvfs-monitor-file: deprecated.in Makefile
+       $(AM_V_GEN) $(SED) -e "s|\@replacement\@|gio monitor|" $< > $@
 
-gvfs_monitor_file_SOURCES = gvfs-monitor-file.c
-gvfs_monitor_file_LDADD = $(libraries)
+gvfs-monitor-dir: deprecated.in Makefile
+       $(AM_V_GEN) $(SED) -e "s|\@replacement\@|gio monitor|" $< > $@
 
-gvfs_mkdir_SOURCES = gvfs-mkdir.c
-gvfs_mkdir_LDADD = $(libraries)
+gvfs-mkdir: deprecated.in Makefile
+       $(AM_V_GEN) $(SED) -e "s|\@replacement\@|gio mkdir|" $< > $@
 
-gvfs_mime_SOURCES = gvfs-mime.c
-gvfs_mime_LDADD = $(libraries)
+gvfs-mime: deprecated.in Makefile
+       $(AM_V_GEN) $(SED) -e "s|\@replacement\@|gio mime|" $< > $@
 
-EXTRA_DIST = gvfs-less
+EXTRA_DIST = $(bin_in_files)
diff --git a/programs/deprecated.in b/programs/deprecated.in
new file mode 100644
index 0000000..70d0b83
--- /dev/null
+++ b/programs/deprecated.in
@@ -0,0 +1,6 @@
+#!/bin/sh
+replacement="@replacement@"
+>&2 echo "This tool has been deprecated, use '$replacement' instead."
+>&2 echo "See 'gio help' for more info."
+>&2 echo
+exec $replacement "$@"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]