[Libreoffice-commits] .: 2 commits - desktop/CustomTarget_soffice.mk desktop/scripts scp2/source

[Libreoffice Gerrit user]

 desktop/CustomTarget_soffice.mk  |    6 ++++++
 desktop/scripts/soffice.sh       |    2 +-
 scp2/source/ooo/common_brand.scp |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
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@" "$@"
commit 4d408cc2f09fcc645d0da736b74f2f5cae86edc4
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Fri Sep 7 18:21:06 2012 +0200

    scp2: Don't deliver oosplash with --enable-headless
    
    Change-Id: I6e12236d04e7ca19bea396e2aa79cba8280639a1

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 968a550..5d89ae8 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -525,7 +525,7 @@ File gid_Brand_File_Bin_Soffice_Bin
     Name = "soffice.bin";
 End
 
-#if defined UNX && ! defined MACOSX
+#if defined UNX && ! defined MACOSX && ! defined LIBO_HEADLESS
 
 File gid_File_Bin_QStart_Bin
     BIN_FILE_BODY;