Skip to content
Snippets Groups Projects
Commit a41cccd0 authored by Ludovico de Nittis's avatar Ludovico de Nittis :palm_tree:
Browse files

Merge branch 'wip/smcv/rename-examples' into 'master'

Re-brand steam-runtime-system-info to be more like a standalone tool

See merge request steam/steam-runtime-tools!28
parents 86c56471 9fb02ef9
No related branches found
No related tags found
1 merge request!28Re-brand steam-runtime-system-info to be more like a standalone tool
Pipeline #1360 passed
File moved
...@@ -255,8 +255,6 @@ main (int argc, ...@@ -255,8 +255,6 @@ main (int argc,
JsonGenerator *generator; JsonGenerator *generator;
gboolean can_run = FALSE; gboolean can_run = FALSE;
gchar *json_output; gchar *json_output;
GList *libraries = NULL;
GList *detailed_errors = NULL;
int opt; int opt;
static const char * const multiarch_tuples[] = { SRT_ABI_I386, SRT_ABI_X86_64 }; static const char * const multiarch_tuples[] = { SRT_ABI_I386, SRT_ABI_X86_64 };
...@@ -310,6 +308,8 @@ main (int argc, ...@@ -310,6 +308,8 @@ main (int argc,
for (gsize i = 0; i < G_N_ELEMENTS (multiarch_tuples); i++) 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_set_member_name (builder, multiarch_tuples[i]);
json_builder_begin_object (builder); json_builder_begin_object (builder);
json_builder_set_member_name (builder, "can-run"); json_builder_set_member_name (builder, "can-run");
...@@ -331,7 +331,6 @@ main (int argc, ...@@ -331,7 +331,6 @@ main (int argc,
print_libraries_details (builder, libraries, verbose); print_libraries_details (builder, libraries, verbose);
json_builder_end_object (builder); json_builder_end_object (builder);
g_list_free_full (detailed_errors, g_free);
g_list_free_full (libraries, g_object_unref); g_list_free_full (libraries, g_object_unref);
} }
......
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 ] [ Simon McVittie ]
* SrtSystemInfo: Document (lack of) thread-safety * SrtSystemInfo: Document (lack of) thread-safety
......
...@@ -86,6 +86,7 @@ Section: misc ...@@ -86,6 +86,7 @@ Section: misc
Depends: Depends:
${misc:Depends}, ${misc:Depends},
${shlibs:Depends}, ${shlibs:Depends},
steam-runtime-tools-bin,
zlib1g, zlib1g,
Description: Description:
The Steam Runtime is the library stack used to run the Steam client The Steam Runtime is the library stack used to run the Steam client
...@@ -93,3 +94,24 @@ Description: ...@@ -93,3 +94,24 @@ Description:
supporting code used by the Steam client to discover system information. supporting code used by the Steam client to discover system information.
. .
This package contains automated tests. 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.
usr/bin/steam-runtime-system-info
usr/libexec/installed-tests usr/libexec/installed-tests
usr/share/installed-tests usr/share/installed-tests
usr/bin/steam-runtime-system-info
...@@ -129,8 +129,8 @@ if multiarch != '' ...@@ -129,8 +129,8 @@ if multiarch != ''
subdir('helpers') subdir('helpers')
endif endif
subdir('bin')
subdir('docs') subdir('docs')
subdir('examples')
subdir('tests') subdir('tests')
# vim:set sw=2 sts=2 et: # vim:set sw=2 sts=2 et:
...@@ -25,13 +25,13 @@ test_env = environment() ...@@ -25,13 +25,13 @@ test_env = environment()
test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
test_env.set('G_TEST_BUILDDIR', meson.current_build_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.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 = [ tests = [
'architecture', 'architecture',
'examples-system-info',
'library', 'library',
'system-info', 'system-info',
'system-info-cli',
] ]
tests_dir = join_paths( tests_dir = join_paths(
......
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment