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

[Libreoffice Gerrit user]

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

New commits:
commit ad050e40f1eb05c49b116ec9d856142f8dc4f635
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Mon Sep 10 21:20:52 2012 +0200

    headless build: build oosplash again
    
    It looks like we want it so revert:
    dae66b7b1df89d824017c7afb52f66ebfd2b8fe2
    4d408cc2f09fcc645d0da736b74f2f5cae86edc4
    64a530cfa8e9be44965c9d708dfb642c2df2a59d
    
    Change-Id: I7cd410861b28a0556de3375a0865a7baef52bd78

diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk
index 83b84ab..74eb6c9 100644
--- a/desktop/CustomTarget_soffice.mk
+++ b/desktop/CustomTarget_soffice.mk
@@ -40,10 +40,4 @@ 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/Module_desktop.mk b/desktop/Module_desktop.mk
index f043a61..cb067b3 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -116,6 +116,11 @@ else ifeq ($(OS),IOS)
 
 else ifeq ($(GUIBASE),headless)
 
+$(eval $(call gb_Module_add_targets,desktop,\
+    Executable_oosplash \
+    Library_spl_unx \
+))
+
 else
 
 $(eval $(call gb_Module_add_targets,desktop,\
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index b0ba98d..a259bf6 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/@SOFFICEBIN@" "$@"
+exec $VALGRINDCHECK $STRACECHECK "$sd_prog/oosplash" "$@"
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 5d89ae8..968a550 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 && ! defined LIBO_HEADLESS
+#if defined UNX && ! defined MACOSX
 
 File gid_File_Bin_QStart_Bin
     BIN_FILE_BODY;