From: Luiz Augusto von Dentz <[email protected]>
This marks the following tools as deprecated as they are not longer
maintained or have been replaced by other tools:
hciattach hciconfig hcitool hcidump rfcomm sdptool ciptool gatttool
---
Makefile.tools | 86 ++++++++++++++++++++++++++++++++--------------------------
README | 11 ++++++++
configure.ac | 2 +-
3 files changed, 59 insertions(+), 40 deletions(-)
diff --git a/Makefile.tools b/Makefile.tools
index 7706dc7..9841d31 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -154,11 +154,35 @@ tools_userchan_tester_LDADD = lib/libbluetooth-internal.la \
endif
if TOOLS
-bin_PROGRAMS += tools/hciattach tools/hciconfig tools/hcitool tools/hcidump \
- tools/rfcomm tools/rctest tools/l2test tools/l2ping \
- tools/sdptool tools/ciptool tools/bccmd \
+bin_PROGRAMS += tools/rctest tools/l2test tools/l2ping tools/bccmd \
tools/bluemoon tools/hex2hcd tools/mpris-proxy
+tools_rctest_LDADD = lib/libbluetooth-internal.la
+
+tools_l2test_LDADD = lib/libbluetooth-internal.la
+
+tools_l2ping_LDADD = lib/libbluetooth-internal.la
+
+tools_bccmd_SOURCES = tools/bccmd.c tools/csr.h tools/csr.c \
+ tools/csr_hci.c tools/csr_usb.c \
+ tools/csr_h4.c tools/csr_3wire.c \
+ tools/csr_bcsp.c tools/ubcsp.h tools/ubcsp.c
+tools_bccmd_LDADD = lib/libbluetooth-internal.la
+
+tools_bluemoon_SOURCES = tools/bluemoon.c monitor/bt.h
+tools_bluemoon_LDADD = src/libshared-mainloop.la
+
+tools_hex2hcd_SOURCES = tools/hex2hcd.c
+
+tools_mpris_proxy_SOURCES = tools/mpris-proxy.c
+tools_mpris_proxy_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@
+
+dist_man_MANS += tools/rctest.1 tools/l2ping.1 tools/bccmd.1
+
+if DEPRECATED
+bin_PROGRAMS += tools/hciattach tools/hciconfig tools/hcitool tools/hcidump \
+ tools/rfcomm tools/sdptool tools/ciptool
+
tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \
tools/hciattach_st.c \
tools/hciattach_ti.c \
@@ -200,44 +224,25 @@ tools_hcidump_SOURCES = tools/hcidump.c \
tools/parser/ericsson.c \
tools/parser/csr.c \
tools/parser/bpa.c
-tools_hcidump_LDADD = lib/libbluetooth-internal.la
-
-tools_rfcomm_LDADD = lib/libbluetooth-internal.la
-
-tools_rctest_LDADD = lib/libbluetooth-internal.la
-
-tools_l2test_LDADD = lib/libbluetooth-internal.la
-
-tools_l2ping_LDADD = lib/libbluetooth-internal.la
tools_sdptool_SOURCES = tools/sdptool.c src/sdp-xml.h src/sdp-xml.c
tools_sdptool_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
tools_ciptool_LDADD = lib/libbluetooth-internal.la
+tools_hcidump_LDADD = lib/libbluetooth-internal.la
-tools_bccmd_SOURCES = tools/bccmd.c tools/csr.h tools/csr.c \
- tools/csr_hci.c tools/csr_usb.c \
- tools/csr_h4.c tools/csr_3wire.c \
- tools/csr_bcsp.c tools/ubcsp.h tools/ubcsp.c
-tools_bccmd_LDADD = lib/libbluetooth-internal.la
-
-tools_bluemoon_SOURCES = tools/bluemoon.c monitor/bt.h
-tools_bluemoon_LDADD = src/libshared-mainloop.la
-
-tools_hex2hcd_SOURCES = tools/hex2hcd.c
-
-tools_mpris_proxy_SOURCES = tools/mpris-proxy.c
-tools_mpris_proxy_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@
+tools_rfcomm_LDADD = lib/libbluetooth-internal.la
dist_man_MANS += tools/hciattach.1 tools/hciconfig.1 \
tools/hcitool.1 tools/hcidump.1 \
- tools/rfcomm.1 tools/rctest.1 tools/l2ping.1 \
- tools/sdptool.1 tools/ciptool.1 tools/bccmd.1
+ tools/rfcomm.1 tools/sdptool.1 tools/ciptool.1
else
EXTRA_DIST += tools/hciattach.1 tools/hciconfig.1 \
tools/hcitool.1 tools/hcidump.1 \
- tools/rfcomm.1 tools/rctest.1 tools/l2ping.1 \
- tools/sdptool.1 tools/ciptool.1 tools/bccmd.1
+ tools/rfcomm.1 tools/sdptool.1 tools/ciptool.1
+endif
+else
+EXTRA_DIST += tools/rctest.1 tools/l2ping.1 tools/bccmd.1
endif
if HID2HCI
@@ -343,18 +348,9 @@ EXTRA_DIST += tools/btattach.1
endif
if READLINE
-noinst_PROGRAMS += attrib/gatttool tools/btmgmt \
- tools/obex-client-tool tools/obex-server-tool \
+noinst_PROGRAMS += tools/btmgmt tools/obex-client-tool tools/obex-server-tool \
tools/bluetooth-player tools/obexctl
-attrib_gatttool_SOURCES = attrib/gatttool.c attrib/att.c attrib/gatt.c \
- attrib/gattrib.c btio/btio.c \
- attrib/gatttool.h attrib/interactive.c \
- attrib/utils.c src/log.c client/display.c \
- client/display.h
-attrib_gatttool_LDADD = lib/libbluetooth-internal.la \
- src/libshared-glib.la @GLIB_LIBS@ -lreadline
-
tools_obex_client_tool_SOURCES = $(gobex_sources) $(btio_sources) \
tools/obex-client-tool.c
tools_obex_client_tool_LDADD = lib/libbluetooth-internal.la \
@@ -377,6 +373,18 @@ tools_obexctl_LDADD = gdbus/libgdbus-internal.la \
tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c
tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \
-lreadline
+if DEPRECATED
+noinst_PROGRAMS += attrib/gatttool
+
+attrib_gatttool_SOURCES = attrib/gatttool.c attrib/att.c attrib/gatt.c \
+ attrib/gattrib.c btio/btio.c \
+ attrib/gatttool.h attrib/interactive.c \
+ attrib/utils.c src/log.c client/display.c \
+ client/display.h
+attrib_gatttool_LDADD = lib/libbluetooth-internal.la \
+ src/libshared-glib.la @GLIB_LIBS@ -lreadline
+
+endif
endif
if EXPERIMENTAL
diff --git a/README b/README
index 7b6001b..c42a113 100644
--- a/README
+++ b/README
@@ -166,6 +166,17 @@ For a working system, certain configuration options need to be enabled:
systems. The behavior of the experimental tools is unstable
and might still change.
+ --enable-deprecated
+
+ Enable deprecated tools
+
+ By defauld all tools that are no longer maintained are
+ disabled. This option can be used to enable them.
+
+ It is not recommended to enable this option for production
+ systems. The behavior of the deprecated tools may be unstable
+ or simply don't work anymore.
+
--enable-nfc
This option enable NFC pairing support.
diff --git a/configure.ac b/configure.ac
index 2b0363c..fb8deab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -291,7 +291,7 @@ AC_ARG_ENABLE(experimental, AC_HELP_STRING([--enable-experimental],
AM_CONDITIONAL(EXPERIMENTAL, test "${enable_experimental}" = "yes")
AC_ARG_ENABLE(deprecated, AC_HELP_STRING([--enable-deprecated],
- [enable deprecated plugins (BLE services, ...)]),
+ [enable deprecated tools]),
[enable_deprecated=${enableval}])
AM_CONDITIONAL(DEPRECATED, test "${enable_deprecated}" = "yes")
--
2.9.3
Hi,
On Wed, Jan 4, 2017 at 3:33 PM, Luiz Augusto von Dentz
<[email protected]> wrote:
> From: Luiz Augusto von Dentz <[email protected]>
>
> This marks the following tools as deprecated as they are not longer
> maintained or have been replaced by other tools:
>
> hciattach hciconfig hcitool hcidump rfcomm sdptool ciptool gatttool
> ---
> Makefile.tools | 86 ++++++++++++++++++++++++++++++++--------------------------
> README | 11 ++++++++
> configure.ac | 2 +-
> 3 files changed, 59 insertions(+), 40 deletions(-)
>
> diff --git a/Makefile.tools b/Makefile.tools
> index 7706dc7..9841d31 100644
> --- a/Makefile.tools
> +++ b/Makefile.tools
> @@ -154,11 +154,35 @@ tools_userchan_tester_LDADD = lib/libbluetooth-internal.la \
> endif
>
> if TOOLS
> -bin_PROGRAMS += tools/hciattach tools/hciconfig tools/hcitool tools/hcidump \
> - tools/rfcomm tools/rctest tools/l2test tools/l2ping \
> - tools/sdptool tools/ciptool tools/bccmd \
> +bin_PROGRAMS += tools/rctest tools/l2test tools/l2ping tools/bccmd \
> tools/bluemoon tools/hex2hcd tools/mpris-proxy
>
> +tools_rctest_LDADD = lib/libbluetooth-internal.la
> +
> +tools_l2test_LDADD = lib/libbluetooth-internal.la
> +
> +tools_l2ping_LDADD = lib/libbluetooth-internal.la
> +
> +tools_bccmd_SOURCES = tools/bccmd.c tools/csr.h tools/csr.c \
> + tools/csr_hci.c tools/csr_usb.c \
> + tools/csr_h4.c tools/csr_3wire.c \
> + tools/csr_bcsp.c tools/ubcsp.h tools/ubcsp.c
> +tools_bccmd_LDADD = lib/libbluetooth-internal.la
> +
> +tools_bluemoon_SOURCES = tools/bluemoon.c monitor/bt.h
> +tools_bluemoon_LDADD = src/libshared-mainloop.la
> +
> +tools_hex2hcd_SOURCES = tools/hex2hcd.c
> +
> +tools_mpris_proxy_SOURCES = tools/mpris-proxy.c
> +tools_mpris_proxy_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@
> +
> +dist_man_MANS += tools/rctest.1 tools/l2ping.1 tools/bccmd.1
> +
> +if DEPRECATED
> +bin_PROGRAMS += tools/hciattach tools/hciconfig tools/hcitool tools/hcidump \
> + tools/rfcomm tools/sdptool tools/ciptool
> +
> tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \
> tools/hciattach_st.c \
> tools/hciattach_ti.c \
> @@ -200,44 +224,25 @@ tools_hcidump_SOURCES = tools/hcidump.c \
> tools/parser/ericsson.c \
> tools/parser/csr.c \
> tools/parser/bpa.c
> -tools_hcidump_LDADD = lib/libbluetooth-internal.la
> -
> -tools_rfcomm_LDADD = lib/libbluetooth-internal.la
> -
> -tools_rctest_LDADD = lib/libbluetooth-internal.la
> -
> -tools_l2test_LDADD = lib/libbluetooth-internal.la
> -
> -tools_l2ping_LDADD = lib/libbluetooth-internal.la
>
> tools_sdptool_SOURCES = tools/sdptool.c src/sdp-xml.h src/sdp-xml.c
> tools_sdptool_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
>
> tools_ciptool_LDADD = lib/libbluetooth-internal.la
> +tools_hcidump_LDADD = lib/libbluetooth-internal.la
>
> -tools_bccmd_SOURCES = tools/bccmd.c tools/csr.h tools/csr.c \
> - tools/csr_hci.c tools/csr_usb.c \
> - tools/csr_h4.c tools/csr_3wire.c \
> - tools/csr_bcsp.c tools/ubcsp.h tools/ubcsp.c
> -tools_bccmd_LDADD = lib/libbluetooth-internal.la
> -
> -tools_bluemoon_SOURCES = tools/bluemoon.c monitor/bt.h
> -tools_bluemoon_LDADD = src/libshared-mainloop.la
> -
> -tools_hex2hcd_SOURCES = tools/hex2hcd.c
> -
> -tools_mpris_proxy_SOURCES = tools/mpris-proxy.c
> -tools_mpris_proxy_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@
> +tools_rfcomm_LDADD = lib/libbluetooth-internal.la
>
> dist_man_MANS += tools/hciattach.1 tools/hciconfig.1 \
> tools/hcitool.1 tools/hcidump.1 \
> - tools/rfcomm.1 tools/rctest.1 tools/l2ping.1 \
> - tools/sdptool.1 tools/ciptool.1 tools/bccmd.1
> + tools/rfcomm.1 tools/sdptool.1 tools/ciptool.1
> else
> EXTRA_DIST += tools/hciattach.1 tools/hciconfig.1 \
> tools/hcitool.1 tools/hcidump.1 \
> - tools/rfcomm.1 tools/rctest.1 tools/l2ping.1 \
> - tools/sdptool.1 tools/ciptool.1 tools/bccmd.1
> + tools/rfcomm.1 tools/sdptool.1 tools/ciptool.1
> +endif
> +else
> +EXTRA_DIST += tools/rctest.1 tools/l2ping.1 tools/bccmd.1
> endif
>
> if HID2HCI
> @@ -343,18 +348,9 @@ EXTRA_DIST += tools/btattach.1
> endif
>
> if READLINE
> -noinst_PROGRAMS += attrib/gatttool tools/btmgmt \
> - tools/obex-client-tool tools/obex-server-tool \
> +noinst_PROGRAMS += tools/btmgmt tools/obex-client-tool tools/obex-server-tool \
> tools/bluetooth-player tools/obexctl
>
> -attrib_gatttool_SOURCES = attrib/gatttool.c attrib/att.c attrib/gatt.c \
> - attrib/gattrib.c btio/btio.c \
> - attrib/gatttool.h attrib/interactive.c \
> - attrib/utils.c src/log.c client/display.c \
> - client/display.h
> -attrib_gatttool_LDADD = lib/libbluetooth-internal.la \
> - src/libshared-glib.la @GLIB_LIBS@ -lreadline
> -
> tools_obex_client_tool_SOURCES = $(gobex_sources) $(btio_sources) \
> tools/obex-client-tool.c
> tools_obex_client_tool_LDADD = lib/libbluetooth-internal.la \
> @@ -377,6 +373,18 @@ tools_obexctl_LDADD = gdbus/libgdbus-internal.la \
> tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c
> tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \
> -lreadline
> +if DEPRECATED
> +noinst_PROGRAMS += attrib/gatttool
> +
> +attrib_gatttool_SOURCES = attrib/gatttool.c attrib/att.c attrib/gatt.c \
> + attrib/gattrib.c btio/btio.c \
> + attrib/gatttool.h attrib/interactive.c \
> + attrib/utils.c src/log.c client/display.c \
> + client/display.h
> +attrib_gatttool_LDADD = lib/libbluetooth-internal.la \
> + src/libshared-glib.la @GLIB_LIBS@ -lreadline
> +
> +endif
> endif
>
> if EXPERIMENTAL
> diff --git a/README b/README
> index 7b6001b..c42a113 100644
> --- a/README
> +++ b/README
> @@ -166,6 +166,17 @@ For a working system, certain configuration options need to be enabled:
> systems. The behavior of the experimental tools is unstable
> and might still change.
>
> + --enable-deprecated
> +
> + Enable deprecated tools
> +
> + By defauld all tools that are no longer maintained are
> + disabled. This option can be used to enable them.
> +
> + It is not recommended to enable this option for production
> + systems. The behavior of the deprecated tools may be unstable
> + or simply don't work anymore.
> +
> --enable-nfc
>
> This option enable NFC pairing support.
> diff --git a/configure.ac b/configure.ac
> index 2b0363c..fb8deab 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -291,7 +291,7 @@ AC_ARG_ENABLE(experimental, AC_HELP_STRING([--enable-experimental],
> AM_CONDITIONAL(EXPERIMENTAL, test "${enable_experimental}" = "yes")
>
> AC_ARG_ENABLE(deprecated, AC_HELP_STRING([--enable-deprecated],
> - [enable deprecated plugins (BLE services, ...)]),
> + [enable deprecated tools]),
> [enable_deprecated=${enableval}])
> AM_CONDITIONAL(DEPRECATED, test "${enable_deprecated}" = "yes")
>
> --
> 2.9.3
>
Applied.
--
Luiz Augusto von Dentz
Hi Luiz,=20
On January 4, 2017 2:33:59 PM GMT+01:00, Luiz Augusto von Dentz <luiz=2Ede=
ntz@gmail=2Ecom> wrote:
>From: Luiz Augusto von Dentz <luiz=2Evon=2Edentz@intel=2Ecom>
>
>This marks the following tools as deprecated as they are not longer
>maintained or have been replaced by other tools:
>
> hciattach hciconfig hcitool hcidump rfcomm sdptool ciptool gatttool
Perhaps you could add a patch to this set to document --enable-midi option=
as well=2E I could so it myself but I am on holiday and this is such a sim=
ple patch=2E If not I can send it later=2E=20
It could be something like this:
Enable MIDI support via ALSA Sequencer=2E bluetoothd will create a new ALS=
A Sequencer client and port for each device connected that supports the MID=
I GATT primary service=2E=20
>---
>Makefile=2Etools | 86
>++++++++++++++++++++++++++++++++--------------------------
> README | 11 ++++++++
> configure=2Eac | 2 +-
> 3 files changed, 59 insertions(+), 40 deletions(-)
>
>diff --git a/Makefile=2Etools b/Makefile=2Etools
>index 7706dc7=2E=2E9841d31 100644
>--- a/Makefile=2Etools
>+++ b/Makefile=2Etools
>@@ -154,11 +154,35 @@ tools_userchan_tester_LDADD =3D
>lib/libbluetooth-internal=2Ela \
> endif
>=20
> if TOOLS
>-bin_PROGRAMS +=3D tools/hciattach tools/hciconfig tools/hcitool
>tools/hcidump \
>- tools/rfcomm tools/rctest tools/l2test tools/l2ping \
>- tools/sdptool tools/ciptool tools/bccmd \
>+bin_PROGRAMS +=3D tools/rctest tools/l2test tools/l2ping tools/bccmd \
> tools/bluemoon tools/hex2hcd tools/mpris-proxy
>=20
>+tools_rctest_LDADD =3D lib/libbluetooth-internal=2Ela
>+
>+tools_l2test_LDADD =3D lib/libbluetooth-internal=2Ela
>+
>+tools_l2ping_LDADD =3D lib/libbluetooth-internal=2Ela
>+
>+tools_bccmd_SOURCES =3D tools/bccmd=2Ec tools/csr=2Eh tools/csr=2Ec \
>+ tools/csr_hci=2Ec tools/csr_usb=2Ec \
>+ tools/csr_h4=2Ec tools/csr_3wire=2Ec \
>+ tools/csr_bcsp=2Ec tools/ubcsp=2Eh tools/ubcsp=2Ec
>+tools_bccmd_LDADD =3D lib/libbluetooth-internal=2Ela
>+
>+tools_bluemoon_SOURCES =3D tools/bluemoon=2Ec monitor/bt=2Eh
>+tools_bluemoon_LDADD =3D src/libshared-mainloop=2Ela
>+
>+tools_hex2hcd_SOURCES =3D tools/hex2hcd=2Ec
>+
>+tools_mpris_proxy_SOURCES =3D tools/mpris-proxy=2Ec
>+tools_mpris_proxy_LDADD =3D gdbus/libgdbus-internal=2Ela @GLIB_LIBS@
>@DBUS_LIBS@
>+
>+dist_man_MANS +=3D tools/rctest=2E1 tools/l2ping=2E1 tools/bccmd=2E1
>+
>+if DEPRECATED
>+bin_PROGRAMS +=3D tools/hciattach tools/hciconfig tools/hcitool
>tools/hcidump \
>+ tools/rfcomm tools/sdptool tools/ciptool
>+
> tools_hciattach_SOURCES =3D tools/hciattach=2Ec tools/hciattach=2Eh \
> tools/hciattach_st=2Ec \
> tools/hciattach_ti=2Ec \
>@@ -200,44 +224,25 @@ tools_hcidump_SOURCES =3D tools/hcidump=2Ec \
> tools/parser/ericsson=2Ec \
> tools/parser/csr=2Ec \
> tools/parser/bpa=2Ec
>-tools_hcidump_LDADD =3D lib/libbluetooth-internal=2Ela
>-
>-tools_rfcomm_LDADD =3D lib/libbluetooth-internal=2Ela
>-
>-tools_rctest_LDADD =3D lib/libbluetooth-internal=2Ela
>-
>-tools_l2test_LDADD =3D lib/libbluetooth-internal=2Ela
>-
>-tools_l2ping_LDADD =3D lib/libbluetooth-internal=2Ela
>=20
> tools_sdptool_SOURCES =3D tools/sdptool=2Ec src/sdp-xml=2Eh src/sdp-xml=
=2Ec
> tools_sdptool_LDADD =3D lib/libbluetooth-internal=2Ela @GLIB_LIBS@
>=20
> tools_ciptool_LDADD =3D lib/libbluetooth-internal=2Ela
>+tools_hcidump_LDADD =3D lib/libbluetooth-internal=2Ela
>=20
>-tools_bccmd_SOURCES =3D tools/bccmd=2Ec tools/csr=2Eh tools/csr=2Ec \
>- tools/csr_hci=2Ec tools/csr_usb=2Ec \
>- tools/csr_h4=2Ec tools/csr_3wire=2Ec \
>- tools/csr_bcsp=2Ec tools/ubcsp=2Eh tools/ubcsp=2Ec
>-tools_bccmd_LDADD =3D lib/libbluetooth-internal=2Ela
>-
>-tools_bluemoon_SOURCES =3D tools/bluemoon=2Ec monitor/bt=2Eh
>-tools_bluemoon_LDADD =3D src/libshared-mainloop=2Ela
>-
>-tools_hex2hcd_SOURCES =3D tools/hex2hcd=2Ec
>-
>-tools_mpris_proxy_SOURCES =3D tools/mpris-proxy=2Ec
>-tools_mpris_proxy_LDADD =3D gdbus/libgdbus-internal=2Ela @GLIB_LIBS@
>@DBUS_LIBS@
>+tools_rfcomm_LDADD =3D lib/libbluetooth-internal=2Ela
>=20
> dist_man_MANS +=3D tools/hciattach=2E1 tools/hciconfig=2E1 \
> tools/hcitool=2E1 tools/hcidump=2E1 \
>- tools/rfcomm=2E1 tools/rctest=2E1 tools/l2ping=2E1 \
>- tools/sdptool=2E1 tools/ciptool=2E1 tools/bccmd=2E1
>+ tools/rfcomm=2E1 tools/sdptool=2E1 tools/ciptool=2E1
> else
> EXTRA_DIST +=3D tools/hciattach=2E1 tools/hciconfig=2E1 \
> tools/hcitool=2E1 tools/hcidump=2E1 \
>- tools/rfcomm=2E1 tools/rctest=2E1 tools/l2ping=2E1 \
>- tools/sdptool=2E1 tools/ciptool=2E1 tools/bccmd=2E1
>+ tools/rfcomm=2E1 tools/sdptool=2E1 tools/ciptool=2E1
>+endif
>+else
>+EXTRA_DIST +=3D tools/rctest=2E1 tools/l2ping=2E1 tools/bccmd=2E1
> endif
>=20
> if HID2HCI
>@@ -343,18 +348,9 @@ EXTRA_DIST +=3D tools/btattach=2E1
> endif
>=20
> if READLINE
>-noinst_PROGRAMS +=3D attrib/gatttool tools/btmgmt \
>- tools/obex-client-tool tools/obex-server-tool \
>+noinst_PROGRAMS +=3D tools/btmgmt tools/obex-client-tool
>tools/obex-server-tool \
> tools/bluetooth-player tools/obexctl
>=20
>-attrib_gatttool_SOURCES =3D attrib/gatttool=2Ec attrib/att=2Ec attrib/ga=
tt=2Ec
>\
>- attrib/gattrib=2Ec btio/btio=2Ec \
>- attrib/gatttool=2Eh attrib/interactive=2Ec \
>- attrib/utils=2Ec src/log=2Ec client/display=2Ec \
>- client/display=2Eh
>-attrib_gatttool_LDADD =3D lib/libbluetooth-internal=2Ela \
>- src/libshared-glib=2Ela @GLIB_LIBS@ -lreadline
>-
> tools_obex_client_tool_SOURCES =3D $(gobex_sources) $(btio_sources) \
> tools/obex-client-tool=2Ec
> tools_obex_client_tool_LDADD =3D lib/libbluetooth-internal=2Ela \
>@@ -377,6 +373,18 @@ tools_obexctl_LDADD =3D gdbus/libgdbus-internal=2Ela=
\
>tools_btmgmt_SOURCES =3D tools/btmgmt=2Ec src/uuid-helper=2Ec
>client/display=2Ec
>tools_btmgmt_LDADD =3D lib/libbluetooth-internal=2Ela
>src/libshared-mainloop=2Ela \
> -lreadline
>+if DEPRECATED
>+noinst_PROGRAMS +=3D attrib/gatttool
>+
>+attrib_gatttool_SOURCES =3D attrib/gatttool=2Ec attrib/att=2Ec attrib/ga=
tt=2Ec
>\
>+ attrib/gattrib=2Ec btio/btio=2Ec \
>+ attrib/gatttool=2Eh attrib/interactive=2Ec \
>+ attrib/utils=2Ec src/log=2Ec client/display=2Ec \
>+ client/display=2Eh
>+attrib_gatttool_LDADD =3D lib/libbluetooth-internal=2Ela \
>+ src/libshared-glib=2Ela @GLIB_LIBS@ -lreadline
>+
>+endif
> endif
>=20
> if EXPERIMENTAL
>diff --git a/README b/README
>index 7b6001b=2E=2Ec42a113 100644
>--- a/README
>+++ b/README
>@@ -166,6 +166,17 @@ For a working system, certain configuration
>options need to be enabled:
> systems=2E The behavior of the experimental tools is unstable
> and might still change=2E
>=20
>+ --enable-deprecated
>+
>+ Enable deprecated tools
>+
>+ By defauld all tools that are no longer maintained are
>+ disabled=2E This option can be used to enable them=2E
>+
>+ It is not recommended to enable this option for production
>+ systems=2E The behavior of the deprecated tools may be unstable
>+ or simply don't work anymore=2E
>+
> --enable-nfc
>=20
> This option enable NFC pairing support=2E
>diff --git a/configure=2Eac b/configure=2Eac
>index 2b0363c=2E=2Efb8deab 100644
>--- a/configure=2Eac
>+++ b/configure=2Eac
>@@ -291,7 +291,7 @@ AC_ARG_ENABLE(experimental,
>AC_HELP_STRING([--enable-experimental],
> AM_CONDITIONAL(EXPERIMENTAL, test "${enable_experimental}" =3D "yes")
>=20
> AC_ARG_ENABLE(deprecated, AC_HELP_STRING([--enable-deprecated],
>- [enable deprecated plugins (BLE services, =2E=2E=2E)]),
>+ [enable deprecated tools]),
> [enable_deprecated=3D${enableval}])
> AM_CONDITIONAL(DEPRECATED, test "${enable_deprecated}" =3D "yes")
>=20
--=20
Sent from my Android device with K-9 Mail=2E Please excuse my brevity=2E
From: Luiz Augusto von Dentz <[email protected]>
This promotes many tools that were behind --enable-experimental which are
in fact used as stable tools for a while.
---
Makefile.tools | 198 +++++++++++++++++++++++++++------------------------------
1 file changed, 93 insertions(+), 105 deletions(-)
diff --git a/Makefile.tools b/Makefile.tools
index 9841d31..a6995a0 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -155,7 +155,89 @@ endif
if TOOLS
bin_PROGRAMS += tools/rctest tools/l2test tools/l2ping tools/bccmd \
- tools/bluemoon tools/hex2hcd tools/mpris-proxy
+ tools/bluemoon tools/hex2hcd tools/mpris-proxy \
+ tools/btattach
+
+noinst_PROGRAMS += tools/bdaddr tools/avinfo tools/avtest \
+ tools/scotest tools/amptest tools/hwdb \
+ tools/hcieventmask tools/hcisecfilter \
+ tools/btinfo \
+ tools/btsnoop tools/btproxy \
+ tools/btiotest tools/bneptest tools/mcaptest \
+ tools/cltest tools/oobtest tools/seq2bseq \
+ tools/nokfw tools/create-image \
+ tools/eddystone tools/ibeacon \
+ tools/btgatt-client tools/btgatt-server \
+ tools/test-runner tools/check-selftest \
+ tools/gatt-service profiles/iap/iapd
+
+tools_bdaddr_SOURCES = tools/bdaddr.c src/oui.h src/oui.c
+tools_bdaddr_LDADD = lib/libbluetooth-internal.la @UDEV_LIBS@
+
+tools_avinfo_LDADD = lib/libbluetooth-internal.la
+
+tools_avtest_LDADD = lib/libbluetooth-internal.la
+
+tools_scotest_LDADD = lib/libbluetooth-internal.la
+
+tools_amptest_LDADD = lib/libbluetooth-internal.la
+
+tools_hwdb_LDADD = lib/libbluetooth-internal.la
+
+tools_hcieventmask_LDADD = lib/libbluetooth-internal.la
+
+tools_btinfo_SOURCES = tools/btinfo.c monitor/bt.h
+tools_btinfo_LDADD = src/libshared-mainloop.la
+
+tools_btattach_SOURCES = tools/btattach.c monitor/bt.h
+tools_btattach_LDADD = src/libshared-mainloop.la
+
+tools_btsnoop_SOURCES = tools/btsnoop.c
+tools_btsnoop_LDADD = src/libshared-mainloop.la
+
+tools_btproxy_SOURCES = tools/btproxy.c monitor/bt.h
+tools_btproxy_LDADD = src/libshared-mainloop.la
+
+tools_btiotest_SOURCES = tools/btiotest.c btio/btio.h btio/btio.c
+tools_btiotest_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
+
+tools_mcaptest_SOURCES = tools/mcaptest.c \
+ btio/btio.h btio/btio.c \
+ src/log.c src/log.h \
+ profiles/health/mcap.h profiles/health/mcap.c
+tools_mcaptest_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@ -lrt
+
+tools_bneptest_SOURCES = tools/bneptest.c \
+ btio/btio.h btio/btio.c \
+ src/log.h src/log.c \
+ profiles/network/bnep.h profiles/network/bnep.c
+tools_bneptest_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
+
+tools_cltest_SOURCES = tools/cltest.c
+tools_cltest_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la
+
+tools_oobtest_SOURCES = tools/oobtest.c
+tools_oobtest_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la
+
+tools_seq2bseq_SOURCES = tools/seq2bseq.c
+
+tools_nokfw_SOURCES = tools/nokfw.c
+
+tools_create_image_SOURCES = tools/create-image.c
+
+tools_eddystone_SOURCES = tools/eddystone.c monitor/bt.h
+tools_eddystone_LDADD = src/libshared-mainloop.la
+
+tools_ibeacon_SOURCES = tools/ibeacon.c monitor/bt.h
+tools_ibeacon_LDADD = src/libshared-mainloop.la
+
+tools_btgatt_client_SOURCES = tools/btgatt-client.c src/uuid-helper.c
+tools_btgatt_client_LDADD = src/libshared-mainloop.la \
+ lib/libbluetooth-internal.la
+
+tools_btgatt_server_SOURCES = tools/btgatt-server.c src/uuid-helper.c
+tools_btgatt_server_LDADD = src/libshared-mainloop.la \
+ lib/libbluetooth-internal.la
tools_rctest_LDADD = lib/libbluetooth-internal.la
@@ -177,7 +259,15 @@ tools_hex2hcd_SOURCES = tools/hex2hcd.c
tools_mpris_proxy_SOURCES = tools/mpris-proxy.c
tools_mpris_proxy_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@
-dist_man_MANS += tools/rctest.1 tools/l2ping.1 tools/bccmd.1
+tools_gatt_service_SOURCES = tools/gatt-service.c
+tools_gatt_service_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ gdbus/libgdbus-internal.la
+
+profiles_iap_iapd_SOURCES = profiles/iap/main.c
+profiles_iap_iapd_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@
+
+dist_man_MANS += tools/rctest.1 tools/l2ping.1 tools/bccmd.1 tools/btattach.1
+
+EXTRA_DIST += tools/bdaddr.1
if DEPRECATED
bin_PROGRAMS += tools/hciattach tools/hciconfig tools/hcitool tools/hcidump \
@@ -242,7 +332,7 @@ EXTRA_DIST += tools/hciattach.1 tools/hciconfig.1 \
tools/rfcomm.1 tools/sdptool.1 tools/ciptool.1
endif
else
-EXTRA_DIST += tools/rctest.1 tools/l2ping.1 tools/bccmd.1
+EXTRA_DIST += tools/rctest.1 tools/l2ping.1 tools/bccmd.1 tools/btattach.1
endif
if HID2HCI
@@ -257,96 +347,6 @@ else
EXTRA_DIST += tools/hid2hci.1
endif
-if EXPERIMENTAL
-bin_PROGRAMS += tools/btattach
-
-noinst_PROGRAMS += tools/bdaddr tools/avinfo tools/avtest \
- tools/scotest tools/amptest tools/hwdb \
- tools/hcieventmask tools/hcisecfilter \
- tools/btinfo \
- tools/btsnoop tools/btproxy \
- tools/btiotest tools/bneptest tools/mcaptest \
- tools/cltest tools/oobtest tools/seq2bseq \
- tools/nokfw tools/create-image \
- tools/eddystone tools/ibeacon \
- tools/btgatt-client tools/btgatt-server \
- tools/test-runner tools/check-selftest
-
-tools_bdaddr_SOURCES = tools/bdaddr.c src/oui.h src/oui.c
-tools_bdaddr_LDADD = lib/libbluetooth-internal.la @UDEV_LIBS@
-
-tools_avinfo_LDADD = lib/libbluetooth-internal.la
-
-tools_avtest_LDADD = lib/libbluetooth-internal.la
-
-tools_scotest_LDADD = lib/libbluetooth-internal.la
-
-tools_amptest_LDADD = lib/libbluetooth-internal.la
-
-tools_hwdb_LDADD = lib/libbluetooth-internal.la
-
-tools_hcieventmask_LDADD = lib/libbluetooth-internal.la
-
-tools_btinfo_SOURCES = tools/btinfo.c monitor/bt.h
-tools_btinfo_LDADD = src/libshared-mainloop.la
-
-tools_btattach_SOURCES = tools/btattach.c monitor/bt.h
-tools_btattach_LDADD = src/libshared-mainloop.la
-
-tools_btsnoop_SOURCES = tools/btsnoop.c
-tools_btsnoop_LDADD = src/libshared-mainloop.la
-
-tools_btproxy_SOURCES = tools/btproxy.c monitor/bt.h
-tools_btproxy_LDADD = src/libshared-mainloop.la
-
-tools_btiotest_SOURCES = tools/btiotest.c btio/btio.h btio/btio.c
-tools_btiotest_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
-
-tools_mcaptest_SOURCES = tools/mcaptest.c \
- btio/btio.h btio/btio.c \
- src/log.c src/log.h \
- profiles/health/mcap.h profiles/health/mcap.c
-tools_mcaptest_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@ -lrt
-
-tools_bneptest_SOURCES = tools/bneptest.c \
- btio/btio.h btio/btio.c \
- src/log.h src/log.c \
- profiles/network/bnep.h profiles/network/bnep.c
-tools_bneptest_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
-
-tools_cltest_SOURCES = tools/cltest.c
-tools_cltest_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la
-
-tools_oobtest_SOURCES = tools/oobtest.c
-tools_oobtest_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la
-
-tools_seq2bseq_SOURCES = tools/seq2bseq.c
-
-tools_nokfw_SOURCES = tools/nokfw.c
-
-tools_create_image_SOURCES = tools/create-image.c
-
-tools_eddystone_SOURCES = tools/eddystone.c monitor/bt.h
-tools_eddystone_LDADD = src/libshared-mainloop.la
-
-tools_ibeacon_SOURCES = tools/ibeacon.c monitor/bt.h
-tools_ibeacon_LDADD = src/libshared-mainloop.la
-
-tools_btgatt_client_SOURCES = tools/btgatt-client.c src/uuid-helper.c
-tools_btgatt_client_LDADD = src/libshared-mainloop.la \
- lib/libbluetooth-internal.la
-
-tools_btgatt_server_SOURCES = tools/btgatt-server.c src/uuid-helper.c
-tools_btgatt_server_LDADD = src/libshared-mainloop.la \
- lib/libbluetooth-internal.la
-
-dist_man_MANS += tools/btattach.1
-
-EXTRA_DIST += tools/bdaddr.1
-else
-EXTRA_DIST += tools/btattach.1
-endif
-
if READLINE
noinst_PROGRAMS += tools/btmgmt tools/obex-client-tool tools/obex-server-tool \
tools/bluetooth-player tools/obexctl
@@ -387,18 +387,6 @@ attrib_gatttool_LDADD = lib/libbluetooth-internal.la \
endif
endif
-if EXPERIMENTAL
-noinst_PROGRAMS += tools/gatt-service
-
-tools_gatt_service_SOURCES = tools/gatt-service.c
-tools_gatt_service_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ gdbus/libgdbus-internal.la
-
-noinst_PROGRAMS += profiles/iap/iapd
-
-profiles_iap_iapd_SOURCES = profiles/iap/main.c
-profiles_iap_iapd_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@
-endif
-
if CUPS
cupsdir = $(libdir)/cups/backend
--
2.9.3
From: Luiz Augusto von Dentz <[email protected]>
This adds --enable-testing that can be used to enable emulator and tester
which are no longer experimental but also are not meant for production.
---
Makefile.tools | 2 +-
README | 11 +++++++++++
bootstrap-configure | 1 +
configure.ac | 5 +++++
4 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/Makefile.tools b/Makefile.tools
index a6995a0..55d392e 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -44,7 +44,7 @@ monitor_btmon_LDADD = lib/libbluetooth-internal.la \
src/libshared-mainloop.la @UDEV_LIBS@
endif
-if EXPERIMENTAL
+if TESTING
noinst_PROGRAMS += emulator/btvirt emulator/b1ee emulator/hfp \
peripheral/btsensor tools/3dsp \
tools/mgmt-tester tools/gap-tester \
diff --git a/README b/README
index c42a113..b4908ad 100644
--- a/README
+++ b/README
@@ -155,6 +155,17 @@ For a working system, certain configuration options need to be enabled:
This option is provided for distributions that do not have any
input capabilities.
+ --enable-testing
+
+ Enable testing tools
+
+ By default tools used only for testing emulation are disabled.
+ This option can be used to enable them.
+
+ It is not recommended to enable this option for production
+ systems. These tools may contain tests that depend on specific
+ environment or kernel features in development.
+
--enable-experimental
Enable experimental tools
diff --git a/bootstrap-configure b/bootstrap-configure
index ffc16ac..c7f7b04 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -13,6 +13,7 @@ fi
--localstatedir=/var \
--enable-manpages \
--enable-backtrace \
+ --enable-testing \
--enable-experimental \
--enable-nfc \
--enable-sap \
diff --git a/configure.ac b/configure.ac
index fb8deab..91b4955 100644
--- a/configure.ac
+++ b/configure.ac
@@ -285,6 +285,11 @@ AC_ARG_ENABLE(manpages, AC_HELP_STRING([--enable-manpages],
[enable_manpages=${enableval}])
AM_CONDITIONAL(MANPAGES, test "${enable_manpages}" = "yes")
+AC_ARG_ENABLE(testing, AC_HELP_STRING([--enable-testing],
+ [enable testing tools]),
+ [enable_testing=${enableval}])
+AM_CONDITIONAL(TESTING, test "${enable_testing}" = "yes")
+
AC_ARG_ENABLE(experimental, AC_HELP_STRING([--enable-experimental],
[enable experimental tools]),
[enable_experimental=${enableval}])
--
2.9.3