rename pipewire tools

Use the pw- prefix for all pipewire tools. This makes the
commands shorter but also avoids conflicts with password
and patchwork tools (pwcli is taken, pwconv is maybe we someday
can make).

pipewire-monitor -> pw-mon
pipewire-cli -> pw-cli
pipewire-dot -> pw-dot
pwcat -> pw-cat
This commit is contained in:
Wim Taymans 2020-01-27 15:42:59 +01:00
parent 88cd3d3f1e
commit c047bab910
8 changed files with 18 additions and 18 deletions

View file

@ -32,12 +32,12 @@ benchmark: all
monitor: all monitor: all
SPA_PLUGIN_DIR=@BUILD_ROOT@/spa/plugins \ SPA_PLUGIN_DIR=@BUILD_ROOT@/spa/plugins \
PIPEWIRE_MODULE_DIR=@BUILD_ROOT@/src/modules/ \ PIPEWIRE_MODULE_DIR=@BUILD_ROOT@/src/modules/ \
@BUILD_ROOT@/src/tools/pipewire-monitor @BUILD_ROOT@/src/tools/pw-mon
cli: all cli: all
SPA_PLUGIN_DIR=@BUILD_ROOT@/spa/plugins \ SPA_PLUGIN_DIR=@BUILD_ROOT@/spa/plugins \
PIPEWIRE_MODULE_DIR=@BUILD_ROOT@/src/modules/ \ PIPEWIRE_MODULE_DIR=@BUILD_ROOT@/src/modules/ \
@BUILD_ROOT@/src/tools/pipewire-cli @BUILD_ROOT@/src/tools/pw-cli
shell: all shell: all
ninja -C @BUILD_ROOT@ uninstalled ninja -C @BUILD_ROOT@ uninstalled

View file

@ -192,7 +192,7 @@ dl_lib = cc.find_library('dl', required : false)
pthread_lib = dependency('threads') pthread_lib = dependency('threads')
dbus_dep = dependency('dbus-1') dbus_dep = dependency('dbus-1')
sdl_dep = dependency('sdl2', required : false) sdl_dep = dependency('sdl2', required : false)
if get_option('pwcat') if get_option('pw-cat')
sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : false) sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : false)
endif endif

View file

@ -98,7 +98,7 @@ option('vulkan',
description: 'Enable vulkan spa plugin integration', description: 'Enable vulkan spa plugin integration',
type: 'boolean', type: 'boolean',
value: true) value: true)
option('pwcat', option('pw-cat',
description: 'Build pwcat/pwplay/pwrecord', description: 'Build pw-cat/pw-play/pw-record',
type: 'boolean', type: 'boolean',
value: true) value: true)

View file

@ -1,34 +1,34 @@
executable('pipewire-monitor', executable('pw-mon',
'pipewire-monitor.c', 'pw-mon.c',
c_args : [ '-D_GNU_SOURCE' ], c_args : [ '-D_GNU_SOURCE' ],
install: true, install: true,
dependencies : [pipewire_dep], dependencies : [pipewire_dep],
) )
executable('pipewire-cli', executable('pw-cli',
'pipewire-cli.c', 'pw-cli.c',
c_args : [ '-D_GNU_SOURCE' ], c_args : [ '-D_GNU_SOURCE' ],
install: true, install: true,
dependencies : [pipewire_dep], dependencies : [pipewire_dep],
) )
executable('pipewire-dot', executable('pw-dot',
'pipewire-dot.c', 'pw-dot.c',
c_args : [ '-D_GNU_SOURCE' ], c_args : [ '-D_GNU_SOURCE' ],
install: true, install: true,
dependencies : [pipewire_dep], dependencies : [pipewire_dep],
) )
if get_option('pwcat') and sndfile_dep.found() if get_option('pw-cat') and sndfile_dep.found()
pwcat_sources = [ pwcat_sources = [
'pwcat.c', 'pw-cat.c',
] ]
pwcat_aliases = [ pwcat_aliases = [
'pwplay', 'pw-play',
'pwrecord', 'pw-record',
] ]
executable('pwcat', executable('pw-cat',
pwcat_sources, pwcat_sources,
c_args : [ '-D_GNU_SOURCE' ], c_args : [ '-D_GNU_SOURCE' ],
install: true, install: true,
@ -37,7 +37,7 @@ if get_option('pwcat') and sndfile_dep.found()
foreach alias : pwcat_aliases foreach alias : pwcat_aliases
dst = join_paths(pipewire_bindir, alias) dst = join_paths(pipewire_bindir, alias)
cmd = 'ln -fs @0@ $DESTDIR@1@'.format('pwcat', dst) cmd = 'ln -fs @0@ $DESTDIR@1@'.format('pw-cat', dst)
meson.add_install_script('sh', '-c', cmd) meson.add_install_script('sh', '-c', cmd)
endforeach endforeach

View file

@ -1,4 +1,4 @@
/* PipeWire - pwcat /* PipeWire - pw-cat
* *
* Copyright © 2020 Konsulko Group * Copyright © 2020 Konsulko Group