[2/2] compositor: List only available backends in help text

Submitted by Bryce Harrington on Oct. 23, 2014, 10:25 p.m.

Details

Message ID 1414103104-31486-2-git-send-email-bryce@osg.samsung.com
State Accepted
Commit 32297c96d33f66d0214ce7ab282266b9626500a2
Headers show

Not browsing as part of any series.

Commit Message

Bryce Harrington Oct. 23, 2014, 10:25 p.m.
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
---
 src/compositor.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/compositor.c b/src/compositor.c
index 0175747..01614f9 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -4189,9 +4189,25 @@  usage(int error_code)
 
 		"Core options:\n\n"
 		"  --version\t\tPrint weston version\n"
-		"  -B, --backend=MODULE\tBackend module, one of drm-backend.so,\n"
-		"\t\t\t\tfbdev-backend.so, x11-backend.so or\n"
-		"\t\t\t\twayland-backend.so\n"
+		"  -B, --backend=MODULE\tBackend module, one of\n"
+#if defined(BUILD_DRM_COMPOSITOR)
+			"\t\t\t\tdrm-backend.so\n"
+#endif
+#if defined(BUILD_FBDEV_COMPOSITOR)
+			"\t\t\t\tfbdev-backend.so"
+#endif
+#if defined(BUILD_X11_COMPOSITOR)
+			"\t\t\t\tx11-backend.so\n"
+#endif
+#if defined(BUILD_WAYLAND_COMPOSITOR)
+			"\t\t\t\twayland-backend.so\n"
+#endif
+#if defined(BUILD_RDP_COMPOSITOR)
+			"\t\t\t\trdp-backend.so\n"
+#endif
+#if defined(BUILD_RPI_COMPOSITOR) && defined(HAVE_BCM_HOST)
+			"\t\t\t\trpi-backend.so\n"
+#endif
 		"  --shell=MODULE\tShell module, defaults to desktop-shell.so\n"
 		"  -S, --socket=NAME\tName of socket to listen on\n"
 		"  -i, --idle-time=SECS\tIdle time in seconds\n"

Comments

I think this series is all obviously correct too.

Though, I suppose this one will look funny if someone manages to build
weston without any back-ends.  :)

Reviewed-by: Derek Foreman <derekf@osg.samsung.com>

On 23/10/14 05:25 PM, Bryce Harrington wrote:
> Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
> ---
>  src/compositor.c | 22 +++++++++++++++++++---
>  1 file changed, 19 insertions(+), 3 deletions(-)
> 
> diff --git a/src/compositor.c b/src/compositor.c
> index 0175747..01614f9 100644
> --- a/src/compositor.c
> +++ b/src/compositor.c
> @@ -4189,9 +4189,25 @@ usage(int error_code)
>  
>  		"Core options:\n\n"
>  		"  --version\t\tPrint weston version\n"
> -		"  -B, --backend=MODULE\tBackend module, one of drm-backend.so,\n"
> -		"\t\t\t\tfbdev-backend.so, x11-backend.so or\n"
> -		"\t\t\t\twayland-backend.so\n"
> +		"  -B, --backend=MODULE\tBackend module, one of\n"
> +#if defined(BUILD_DRM_COMPOSITOR)
> +			"\t\t\t\tdrm-backend.so\n"
> +#endif
> +#if defined(BUILD_FBDEV_COMPOSITOR)
> +			"\t\t\t\tfbdev-backend.so"
> +#endif
> +#if defined(BUILD_X11_COMPOSITOR)
> +			"\t\t\t\tx11-backend.so\n"
> +#endif
> +#if defined(BUILD_WAYLAND_COMPOSITOR)
> +			"\t\t\t\twayland-backend.so\n"
> +#endif
> +#if defined(BUILD_RDP_COMPOSITOR)
> +			"\t\t\t\trdp-backend.so\n"
> +#endif
> +#if defined(BUILD_RPI_COMPOSITOR) && defined(HAVE_BCM_HOST)
> +			"\t\t\t\trpi-backend.so\n"
> +#endif
>  		"  --shell=MODULE\tShell module, defaults to desktop-shell.so\n"
>  		"  -S, --socket=NAME\tName of socket to listen on\n"
>  		"  -i, --idle-time=SECS\tIdle time in seconds\n"
>
On Fri, 24 Oct 2014 09:20:23 -0500
Derek Foreman <derekf@osg.samsung.com> wrote:

> I think this series is all obviously correct too.
> 
> Though, I suppose this one will look funny if someone manages to build
> weston without any back-ends.  :)
> 
> Reviewed-by: Derek Foreman <derekf@osg.samsung.com>

Both pushed. And one more patch to add a missing newline. ;-)

> On 23/10/14 05:25 PM, Bryce Harrington wrote:
> > Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>


Thanks,
pq

> > ---
> >  src/compositor.c | 22 +++++++++++++++++++---
> >  1 file changed, 19 insertions(+), 3 deletions(-)