[gvfs] programs: Remove deprecated gvfs utils
- From: Ondrej Holy <oholy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs] programs: Remove deprecated gvfs utils
- Date: Thu, 10 May 2018 08:53:09 +0000 (UTC)
commit 6d711c07cbd00768c6b2b468f3100f02afc58f6f
Author: Ondrej Holy <oholy redhat com>
Date: Thu May 10 10:52:33 2018 +0200
programs: Remove deprecated gvfs utils
Before two years, gvfs utils has been replaced by wrapper script which
just calls gio tool and prints warning. Let's remove this completely.
I suppose that 3 stable releases are enough for people to port to gio
tool.
man/deprecated.xml.in | 43 ----------------------------
man/gvfs-less.xml | 72 ------------------------------------------------
man/meson.build | 41 +++------------------------
meson.build | 6 ----
meson_options.txt | 1 -
programs/deprecated.in | 14 ---------
programs/gvfs-less | 23 ---------------
programs/meson.build | 37 ------------------------
test/run-in-tree.sh | 2 +-
9 files changed, 6 insertions(+), 233 deletions(-)
---
diff --git a/man/meson.build b/man/meson.build
index 31f7fd3..ccac1fa 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -15,45 +15,14 @@ xsltproc_cmd = [
]
mans = [
- ['gvfs-cat', 'gio cat'],
- ['gvfs-copy', 'gio copy'],
- ['gvfs-info', 'gio info'],
- ['gvfs-less', ''],
- ['gvfs-ls', 'gio list'],
- ['gvfs-mime', 'gio mime'],
- ['gvfs-mkdir', 'gio mkdir'],
- ['gvfs-monitor-dir', 'gio monitor'],
- ['gvfs-monitor-file', 'gio monitor'],
- ['gvfs-mount', 'gio mount'],
- ['gvfs-move', 'gio move'],
- ['gvfs-open', 'gio open'],
- ['gvfs-rename', 'gio rename'],
- ['gvfs-rm', 'gio remove'],
- ['gvfs-save', 'gio save'],
- ['gvfs-set-attribute', 'gio set'],
- ['gvfs-trash', 'gio trash'],
- ['gvfs-tree', 'gio tree'],
- ['gvfsd', ''],
- ['gvfsd-fuse', ''],
- ['gvfsd-metadata', '']
+ 'gvfsd',
+ 'gvfsd-fuse',
+ 'gvfsd-metadata'
]
foreach man: mans
- if man[1].strip() == ''
- xml = man[0] + '.xml'
- else
- conf = configuration_data()
- conf.set('original', man[0])
- conf.set('replacement', man[1])
-
- xml = configure_file(
- input: 'deprecated.xml.in',
- output: man[0] + '.xml',
- configuration: conf
- )
- endif
-
- output = man[0] + '.1'
+ xml = man + '.xml'
+ output = man + '.1'
custom_target(
output,
diff --git a/meson.build b/meson.build
index 0099123..fa90823 100644
--- a/meson.build
+++ b/meson.build
@@ -482,11 +482,6 @@ subdir('daemon')
subdir('monitor')
subdir('po')
-enable_deprecated_programs = get_option('deprecated_programs')
-if enable_deprecated_programs
- subdir('programs')
-endif
-
enable_man = get_option('man')
if enable_man
subdir('man')
@@ -535,7 +530,6 @@ output += ' keyring: ' + enable_keyring.to_string() + '\n'
output += ' logind: ' + enable_logind.to_string() + '\n'
output += ' libusb: ' + enable_libusb.to_string() + '\n'
output += '\n'
-output += ' deprecated_programs: ' + enable_deprecated_programs.to_string() + '\n'
output += ' devel_utils: ' + enable_devel_utils.to_string() + '\n'
output += ' installed_tests: ' + enable_installed_tests.to_string() + '\n'
output += ' man: ' + enable_man.to_string() + '\n'
diff --git a/meson_options.txt b/meson_options.txt
index e4006db..32f10d4 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -26,7 +26,6 @@ option('keyring', type: 'boolean', value: true, description: 'build with keyring
option('logind', type: 'boolean', value: true, description: 'build with logind support')
option('libusb', type: 'boolean', value: true, description: 'build with libusb interruption support')
-option('deprecated_programs', type: 'boolean', value: false, description: 'generate deprecated programs')
option('devel_utils', type: 'boolean', value: false, description: 'build with development utility programs')
option('installed_tests', type: 'boolean', value: false, description: 'enable installed unit tests')
option('man', type: 'boolean', value: false, description: 'generate man pages')
diff --git a/test/run-in-tree.sh b/test/run-in-tree.sh
index 6552e3f..747c123 100755
--- a/test/run-in-tree.sh
+++ b/test/run-in-tree.sh
@@ -9,7 +9,7 @@ fi
export GVFS_MOUNTABLE_EXTENSION=".localmount"
export GVFS_MOUNTABLE_DIR=`pwd`/../daemon
export GVFS_MONITOR_DIR=`pwd`
-export PATH=`pwd`/../programs:/usr/local/sbin:/usr/sbin:/sbin:$PATH
+export PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH
export GIO_EXTRA_MODULES=`pwd`/../client/.libs:`pwd`/../monitor/proxy/.libs
# Start a custom session dbus, unless we run under "make check" (test suite
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]