diff --git a/examples/meson.build b/bin/meson.build similarity index 100% rename from examples/meson.build rename to bin/meson.build diff --git a/examples/system-info.c b/bin/system-info.c similarity index 99% rename from examples/system-info.c rename to bin/system-info.c index 2946d0f6f47950105d6b018d1c2e9aeb6719e930..090d01a1523f73b10739410b953a885c94a3dd30 100644 --- a/examples/system-info.c +++ b/bin/system-info.c @@ -255,8 +255,6 @@ main (int argc, JsonGenerator *generator; gboolean can_run = FALSE; gchar *json_output; - GList *libraries = NULL; - GList *detailed_errors = NULL; int opt; static const char * const multiarch_tuples[] = { SRT_ABI_I386, SRT_ABI_X86_64 }; @@ -310,6 +308,8 @@ main (int argc, for (gsize i = 0; i < G_N_ELEMENTS (multiarch_tuples); i++) { + GList *libraries = NULL; + json_builder_set_member_name (builder, multiarch_tuples[i]); json_builder_begin_object (builder); json_builder_set_member_name (builder, "can-run"); @@ -331,7 +331,6 @@ main (int argc, print_libraries_details (builder, libraries, verbose); json_builder_end_object (builder); - g_list_free_full (detailed_errors, g_free); g_list_free_full (libraries, g_object_unref); } diff --git a/debian/changelog b/debian/changelog index c337f64a4f81a3bb6cabe63973efc3e296bb9832..7dc4e33a9259e34e7747641bd2185c2de78d078b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,15 @@ -steam-runtime-tools (0.20190802.0-0+steamrt1.1) UNRELEASED; urgency=medium +steam-runtime-tools (0.20190806.0-0+steamrt1.1) UNRELEASED; urgency=medium + + [ Ludovico de Nittis ] + * Enhance examples/system-info.c to show libraries and uinput capabilities + * Add C argument `-D_GNU_SOURCE` for the whole project + + [ Simon McVittie ] + * system-info: Avoid g_debug() interfering with machine-readable stdout + + -- Simon McVittie <smcv@collabora.com> Tue, 06 Aug 2019 15:56:51 +0100 + +steam-runtime-tools (0.20190802.0-0+steamrt1.1) scout; urgency=medium [ Simon McVittie ] * SrtSystemInfo: Document (lack of) thread-safety diff --git a/debian/control b/debian/control index a6d229ae3b742047e751baf568270430b8edb829..3e77d791496162bf122d2b821f80098c225b696a 100644 --- a/debian/control +++ b/debian/control @@ -86,6 +86,7 @@ Section: misc Depends: ${misc:Depends}, ${shlibs:Depends}, + steam-runtime-tools-bin, zlib1g, Description: The Steam Runtime is the library stack used to run the Steam client @@ -93,3 +94,24 @@ Description: supporting code used by the Steam client to discover system information. . This package contains automated tests. + +Package: steam-runtime-tools-bin +Architecture: any +Multi-Arch: foreign +Section: libdevel +Breaks: + libsteam-runtime-tools-0-tests (<< 0.20190806.0~), +Replaces: + libsteam-runtime-tools-0-tests (<< 0.20190806.0~), +Depends: + libsteam-runtime-tools-0-0, + ${misc:Depends}, + ${shlibs:Depends}, +Description: Steam Runtime utility library - command-line tools + The Steam Runtime is the library stack used to run the Steam client + on Linux. The Steam Runtime Tools utility library contains open-source + supporting code used by the Steam client to discover system information. + . + This package contains the command-line tool steam-runtime-system-info, + which summarizes everything that the libsteam-runtime-tools library + can find out. diff --git a/debian/libsteam-runtime-tools-0-tests.install b/debian/libsteam-runtime-tools-0-tests.install index 7c203c2ab3c1ef27e3e56f91ab4c5c4fdbac935d..e2a295100b80820d1513a7a6d14fa8dbbe1f9c11 100644 --- a/debian/libsteam-runtime-tools-0-tests.install +++ b/debian/libsteam-runtime-tools-0-tests.install @@ -1,3 +1,2 @@ -usr/bin/steam-runtime-system-info usr/libexec/installed-tests usr/share/installed-tests diff --git a/debian/steam-runtime-tools-bin.install b/debian/steam-runtime-tools-bin.install new file mode 100644 index 0000000000000000000000000000000000000000..0d975a7d53b3ceedb9f6cf6bb0568d6b8c8ac38c --- /dev/null +++ b/debian/steam-runtime-tools-bin.install @@ -0,0 +1 @@ +usr/bin/steam-runtime-system-info diff --git a/meson.build b/meson.build index 1a2c000cd0883282d5dc5577013ad5f411b41de4..0ed78ea72234f0a88123bf035f1c7fea1b95f797 100644 --- a/meson.build +++ b/meson.build @@ -129,8 +129,8 @@ if multiarch != '' subdir('helpers') endif +subdir('bin') subdir('docs') -subdir('examples') subdir('tests') # vim:set sw=2 sts=2 et: diff --git a/tests/meson.build b/tests/meson.build index 4a9d6e0d3dc28a3aa969e49af6a1c820aeef62fd..de2c93df2b67e2029951d62e3cb5d9314750aea7 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -25,13 +25,13 @@ test_env = environment() test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) test_env.set('SRT_HELPERS_PATH', join_paths(meson.current_build_dir(), '..', 'helpers')) -test_env.prepend('PATH', join_paths(meson.current_build_dir(), '..', 'examples')) +test_env.prepend('PATH', join_paths(meson.current_build_dir(), '..', 'bin')) tests = [ 'architecture', - 'examples-system-info', 'library', 'system-info', + 'system-info-cli', ] tests_dir = join_paths( diff --git a/tests/examples-system-info.c b/tests/system-info-cli.c similarity index 100% rename from tests/examples-system-info.c rename to tests/system-info-cli.c