instsetoo_native/CustomTarget_setup.mk | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit a18017edd480f412fe54c90039dd3269858ba350
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Mar 16 23:21:15 2017 +0100
Sort lines in soffice ini-file
...so that they match the order in the scp2-generated counterpart
Change-Id: Id0a77536081872a5feff7f98417462bd7fd057b3
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index 2fe644c4bc2f..e9379571e4b4 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -117,6 +117,7 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \
echo '[Bootstrap]' \
+ && echo
'CrashDirectory=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,bootstrap):UserInstallation}/crash' \
&& echo 'HideEula=1' \
&& echo 'Logo=1' \
&& echo 'NativeProgress=false' \
@@ -126,13 +127,12 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'ProgressSize=444,8' \
&& echo 'ProgressTextBaseline=145' \
&& echo 'ProgressTextColor=255,255,255' \
- && echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call
gb_Helper_get_rcfile,fundamental)' \
&& echo 'SecureUserConfig=true' \
&& echo 'SecureUserConfigCompress=true' \
- && echo 'SecureUserConfigNumCopies=2' \
- && echo 'SecureUserConfigMode=1' \
&& echo 'SecureUserConfigExtensions=true' \
- && echo
'CrashDirectory=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,bootstrap):UserInstallation}/crash' \
+ && echo 'SecureUserConfigMode=1' \
+ && echo 'SecureUserConfigNumCopies=2' \
+ && echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call
gb_Helper_get_rcfile,fundamental)' \
) > $@
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,uno) :
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
