mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

headless build: build oosplash again

Browse Source 
It looks like we want it so revert:
dae66b7b1d
4d408cc2f0
64a530cfa8

Change-Id: I7cd410861b28a0556de3375a0865a7baef52bd78
This commit is contained in:
Riccardo Magliocchetti
2012-09-10 21:20:52 +02:00
parent 7f2e168421
commit ad050e40f1
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
desktop/CustomTarget_soffice.mk
View File

@@ -40,10 +40,4 @@ else
cp $< $@ cp $< $@
endif 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: # vim:set shiftwidth=4 tabstop=4 noexpandtab:

5
desktop/Module_desktop.mk
View File

@@ -116,6 +116,11 @@ else ifeq ($(OS),IOS)
else ifeq ($(GUIBASE),headless) else ifeq ($(GUIBASE),headless)
$(eval $(call gb_Module_add_targets,desktop,\
Executable_oosplash \
Library_spl_unx \
))
else else
$(eval $(call gb_Module_add_targets,desktop,\ $(eval $(call gb_Module_add_targets,desktop,\

2
desktop/scripts/soffice.sh
View File

@@ -175,4 +175,4 @@ for arg in $@ ; do
done done
# oosplash does the rest: forcing pages in, javaldx etc. are # oosplash does the rest: forcing pages in, javaldx etc. are
exec $VALGRINDCHECK $STRACECHECK "$sd_prog/@SOFFICEBIN@" "$@" exec $VALGRINDCHECK $STRACECHECK "$sd_prog/oosplash" "$@"

2
scp2/source/ooo/common_brand.scp
View File

@@ -525,7 +525,7 @@ File gid_Brand_File_Bin_Soffice_Bin
Name = "soffice.bin"; Name = "soffice.bin";
End End
#if defined UNX && ! defined MACOSX && ! defined LIBO_HEADLESS #if defined UNX && ! defined MACOSX
File gid_File_Bin_QStart_Bin File gid_File_Bin_QStart_Bin
BIN_FILE_BODY; BIN_FILE_BODY;