[Libreoffice-commits] desktop: use soffice.bin instead of oosplash if build with --enable-headless

[Stephan Bergmann]

On 09/07/2012 08:15 PM, Libreoffice Gerrit user wrote:
> commit dae66b7b1df89d824017c7afb52f66ebfd2b8fe2
> Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
> Date:   Fri Sep 7 20:11:41 2012 +0200
>
>      desktop: use soffice.bin instead of oosplash if build with --enable-headless
>
>      Change-Id: I2e4742a6893267ea8d4ec2048dd0686fd309a7db
>
> diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk
> index 74eb6c9..83b84ab 100644
> --- a/desktop/CustomTarget_soffice.mk
> +++ b/desktop/CustomTarget_soffice.mk
> @@ -40,4 +40,10 @@ else
>   	cp $< $@
>   endif
>
> +ifeq ($(strip $(ENABLE_HEADLESS)),TRUE)
> +	sed -i "s/@SOFFICEBIN@/soffice.bin/" $@
> +else
> +	sed -i "s/@SOFFICEBIN@/oosplash/" $@
> +endif
> +
>   # vim:set shiftwidth=4 tabstop=4 noexpandtab:
> diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
> index a259bf6..b0ba98d 100755
> --- a/desktop/scripts/soffice.sh
> +++ b/desktop/scripts/soffice.sh
> @@ -175,4 +175,4 @@ for arg in $@ ; do
>   done
>
>   # oosplash does the rest: forcing pages in, javaldx etc. are
> -exec $VALGRINDCHECK $STRACECHECK "$sd_prog/oosplash" "$@"
> +exec $VALGRINDCHECK $STRACECHECK "$sd_prog/@SOFFICEBIN@" "$@"

Ach, the logic to restart soffice.bin when it exists with the special 
exit codes (79, 81, cf. desktop/source7inc/exithelper.hxx) had been 
moved from soffice script to oosplash completely; so short-circuiting 
oosplash completely won't make you happy.

Stephan