diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-09-24 22:37:56 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-10-26 16:04:12 +0100 |
| commit | feb68b2402074517d556a3d580e3b45b3af8ab74 (patch) | |
| tree | a0be523eadd25ea695e7dfd5dfc8a19bcd658807 /instsetoo_native | |
| parent | 37e2d3fa305849f63f36afe31c43d3ec9f9bf407 (diff) | |
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)
(cherry picked from commit f73c3b7d7dc68bd1b44749fdc755a9bca1bb6ce8)
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 1 | ||||
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 10 |
2 files changed, 6 insertions, 5 deletions
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 cba3e6cdc578..f51d6f568d8f 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 |