From f73c3b7d7dc68bd1b44749fdc755a9bca1bb6ce8 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Thu, 24 Sep 2015 22:37:56 +0200 Subject: sync splash-progressbar position for installets with instdir values for actual installer versions come from openoffice.lst, add a hint to the instdir-makefile Change-Id: I6eea5585dd776d4d6071af7b508a91a9c385cb3a (cherry picked from commit f38683a114c1c36284a795c052e8708bc65438c3) --- instsetoo_native/CustomTarget_setup.mk | 1 + instsetoo_native/util/openoffice.lst.in | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'instsetoo_native') diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index f898d55cf671..149f2b8abb85 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -103,6 +103,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H)' \ ) > $@ +# for release-builds (building installers) adjust values in openoffice.lst.in $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,soffice) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ( \ diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index d05f8ab5db29..8cf38a2c429d 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -16,11 +16,11 @@ Globals SOLSUREPACKAGEPREFIX libreoffice REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb REGISTRATIONURL http://survey.libreoffice.org/user/index.php - PROGRESSBARCOLOR 128,128,128 - PROGRESSSIZE 409,8 - PROGRESSPOSITION 72,189 - PROGRESSFRAMECOLOR 245,245,245 - PROGRESSTEXTBASELINE 170 + PROGRESSBARCOLOR 0,0,0 + PROGRESSSIZE 444,8 + PROGRESSPOSITION 35,153 + PROGRESSFRAMECOLOR 102,102,102 + PROGRESSTEXTBASELINE 145 PROGRESSTEXTCOLOR 255,255,255 NATIVEPROGRESS false REGISTRYLAYERNAME Layers -- cgit