[PATCH weston] Automatically generate weston.ini with the right paths

Fri Nov 22 13:29:05 PST 2013

On Fri, Nov 22, 2013 at 04:46:00PM +0000, Neil Roberts wrote:
> Previously weston.ini had hardcoded paths for the weston-* clients in
> /usr/bin and /usr/libexec. This was a bit annoying when testing Weston
> because you wouldn't usually install those in the system prefix. This
> patch adds a make rule to automatically generate weston.ini from a
> template file with some replacement markers for the paths so that they
> can have the right prefix.
> ---
>  .gitignore    |  1 +
>  Makefile.am   | 11 +++++++++-
>  weston.ini    | 67 -----------------------------------------------------------
>  weston.ini.in | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  4 files changed, 78 insertions(+), 68 deletions(-)
>  delete mode 100644 weston.ini
>  create mode 100644 weston.ini.in

That's a nice idea.  Could we just generate it from configure.ac by
listing it in AC_CONFIG_FILES?  Also, I was thinking that we should
add a comment to the top of the file saying that this is a sample
weston.ini, that there's a weston.ini man page, and that you can copy
the sample weston.ini to ~/.config/weston.ini or /etc/xdg/weston/weston.ini.

Kristian

> diff --git a/.gitignore b/.gitignore
> index b3fb2a1..111c56c 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -28,6 +28,7 @@ cscope.out
>  /missing
>  /stamp-h1
>  /test-driver
> +/weston.ini
>  Makefile
>  Makefile.in
>  TAGS
> diff --git a/Makefile.am b/Makefile.am
> index e9ecc38..3a7d337 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -6,4 +6,13 @@ SUBDIRS = shared src clients data protocol tests $(wcap_subdir) man
>  
>  DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install
>  
> -EXTRA_DIST = weston.ini wayland-scanner.mk
> +EXTRA_DIST = weston.ini.in wayland-scanner.mk
> +
> +weston.ini : $(srcdir)/weston.ini.in
> +	$(AM_V_GEN)$(SED) \
> +		-e 's|@bindir[@]|$(bindir)|g' \
> +		-e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
> +		-e 's|@libexecdir[@]|$(libexecdir)|g' \
> +		$< > $@
> +
> +all-local : weston.ini
> diff --git a/weston.ini b/weston.ini
> deleted file mode 100644
> index 4761bed..0000000
> --- a/weston.ini
> +++ /dev/null
> @@ -1,67 +0,0 @@
> -[core]
> -#modules=xwayland.so,cms-colord.so
> -#shell=desktop-shell.so
> -#gbm-format=xrgb2101010
> -
> -[shell]
> -background-image=/usr/share/backgrounds/gnome/Aqua.jpg
> -background-color=0xff002244
> -background-type=tile
> -panel-color=0x90ff0000
> -locking=true
> -animation=zoom
> -startup-animation=fade
> -#binding-modifier=ctrl
> -#num-workspaces=6
> -#cursor-theme=whiteglass
> -#cursor-size=24
> -
> -#lockscreen-icon=/usr/share/icons/gnome/256x256/actions/lock.png
> -#lockscreen=/usr/share/backgrounds/gnome/Garden.jpg
> -#homescreen=/usr/share/backgrounds/gnome/Blinds.jpg
> -#animation=fade
> -
> -[launcher]
> -icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png
> -path=/usr/bin/gnome-terminal
> -
> -[launcher]
> -icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png
> -path=/usr/bin/weston-terminal
> -
> -[launcher]
> -icon=/usr/share/icons/hicolor/24x24/apps/google-chrome.png
> -path=/usr/bin/google-chrome
> -
> -[launcher]
> -icon=/usr/share/icons/gnome/24x24/apps/arts.png
> -path=./clients/weston-flower
> -
> -[screensaver]
> -# Uncomment path to disable screensaver
> -path=/usr/libexec/weston-screensaver
> -duration=600
> -
> -[input-method]
> -path=/usr/libexec/weston-keyboard
> -
> -#[output]
> -#name=LVDS1
> -#mode=1680x1050
> -#transform=90
> -#icc_profile=/usr/share/color/icc/colord/Bluish.icc
> -
> -#[output]
> -#name=VGA1
> -#mode=173.00  1920 2048 2248 2576  1080 1083 1088 1120 -hsync +vsync
> -#transform=flipped
> -
> -#[output]
> -#name=X1
> -#mode=1024x768
> -#transform=flipped-270
> -
> -#[touchpad]
> -#constant_accel_factor = 50
> -#min_accel_factor = 0.16
> -#max_accel_factor = 1.0
> diff --git a/weston.ini.in b/weston.ini.in
> new file mode 100644
> index 0000000..5181a9e
> --- /dev/null
> +++ b/weston.ini.in
> @@ -0,0 +1,67 @@
> +[core]
> +#modules=xwayland.so,cms-colord.so
> +#shell=desktop-shell.so
> +#gbm-format=xrgb2101010
> +
> +[shell]
> +background-image=/usr/share/backgrounds/gnome/Aqua.jpg
> +background-color=0xff002244
> +background-type=tile
> +panel-color=0x90ff0000
> +locking=true
> +animation=zoom
> +startup-animation=fade
> +#binding-modifier=ctrl
> +#num-workspaces=6
> +#cursor-theme=whiteglass
> +#cursor-size=24
> +
> +#lockscreen-icon=/usr/share/icons/gnome/256x256/actions/lock.png
> +#lockscreen=/usr/share/backgrounds/gnome/Garden.jpg
> +#homescreen=/usr/share/backgrounds/gnome/Blinds.jpg
> +#animation=fade
> +
> +[launcher]
> +icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png
> +path=/usr/bin/gnome-terminal
> +
> +[launcher]
> +icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png
> +path=@bindir@/weston-terminal
> +
> +[launcher]
> +icon=/usr/share/icons/hicolor/24x24/apps/google-chrome.png
> +path=/usr/bin/google-chrome
> +
> +[launcher]
> +icon=/usr/share/icons/gnome/24x24/apps/arts.png
> +path=@abs_top_builddir@/clients/weston-flower
> +
> +[screensaver]
> +# Uncomment path to disable screensaver
> +path=@libexecdir@/weston-screensaver
> +duration=600
> +
> +[input-method]
> +path=@libexecdir@/weston-keyboard
> +
> +#[output]
> +#name=LVDS1
> +#mode=1680x1050
> +#transform=90
> +#icc_profile=/usr/share/color/icc/colord/Bluish.icc
> +
> +#[output]
> +#name=VGA1
> +#mode=173.00  1920 2048 2248 2576  1080 1083 1088 1120 -hsync +vsync
> +#transform=flipped
> +
> +#[output]
> +#name=X1
> +#mode=1024x768
> +#transform=flipped-270
> +
> +#[touchpad]
> +#constant_accel_factor = 50
> +#min_accel_factor = 0.16
> +#max_accel_factor = 1.0
> -- 
> 1.8.3.1
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel