Kaydet (Commit) f38683a1 authored tarafından Christian Lohmaier's avatar Christian Lohmaier

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
üst 793d1aba
...@@ -103,6 +103,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ ...@@ -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)' \ && 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_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,soffice) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \ ( \
......
...@@ -16,11 +16,11 @@ Globals ...@@ -16,11 +16,11 @@ Globals
SOLSUREPACKAGEPREFIX libreoffice SOLSUREPACKAGEPREFIX libreoffice
REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb
REGISTRATIONURL http://survey.libreoffice.org/user/index.php REGISTRATIONURL http://survey.libreoffice.org/user/index.php
PROGRESSBARCOLOR 128,128,128 PROGRESSBARCOLOR 0,0,0
PROGRESSSIZE 409,8 PROGRESSSIZE 444,8
PROGRESSPOSITION 72,189 PROGRESSPOSITION 35,153
PROGRESSFRAMECOLOR 245,245,245 PROGRESSFRAMECOLOR 102,102,102
PROGRESSTEXTBASELINE 170 PROGRESSTEXTBASELINE 145
PROGRESSTEXTCOLOR 255,255,255 PROGRESSTEXTCOLOR 255,255,255
NATIVEPROGRESS false NATIVEPROGRESS false
REGISTRYLAYERNAME Layers REGISTRYLAYERNAME Layers
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment