[PATCH] Fix bashism in configure.ac
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2978
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/2978/1
Fix bashism in configure.ac
Change-Id: I574e873fede3343b2384715162dcecce86563db3
---
M configure.ac
1 file changed, 27 insertions(+), 19 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6a31c89..4caa919 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11356,36 +11356,44 @@
dnl ===
AC_MSG_CHECKING([for alternative branding images directory])
# initialize mapped arrays
-brand_vars=(INTRO_BITMAP ABOUT_BACKGROUND_SVG FLAT_LOGO_SVG \
+brand_vars=INTRO_BITMAP ABOUT_BACKGROUND_SVG FLAT_LOGO_SVG \
STARTCENTER_LEFT_BITMAP STARTCENTER_RIGHT_BITMAP \
STARTCENTER_RTL_LEFT_BITMAP STARTCENTER_RTL_RIGHT_BITMAP \
-STARTCENTER_SPACE_BITMAP)
-brand_files=(intro.png about.svg flat_logo.svg \
+STARTCENTER_SPACE_BITMAP
+brand_files=intro.png about.svg flat_logo.svg \
backing_left.png backing_right.png \
backing_rtl_left.png backing_rtl_right.png \
-backing_space.png)
+backing_space.png
+brandmaxidx=0
-for i in $(echo ${brand_vars[[@]]})
+for i in $brand_vars
do
- declare $i=
+declare $i=
+let brandmaxidx=$brandmaxidx + 1
done
if test -z $with_branding -o $with_branding = no; then
AC_MSG_RESULT([none])
else
-idx=0
-while test $idx -lt ${#brand_vars[@]}
-do
-if ! test -f $with_branding/${brand_files[[$idx]]}
-then
-AC_MSG_WARN([Branded file $i does not exist, using the default
one])
-else
-declare
${brand_vars[[$idx]]}=$with_branding/${brand_files[[$idx]]}
-fi
-let idx=$idx + 1
-done
-check_for_progress=yes
-AC_MSG_RESULT([$with_branding])
+if ! test -d $with_branding ; then
+AC_MSG_ERROR([No directory $with_branding, falling back to default
branding])
+else
+AC_MSG_RESULT([$with_branding])
+idx=1
+while test $idx -le $brandmaxidx
+do
+lvar=$(echo $brand_vars | cut -f$idx -d )
+lfile=$(echo $brand_files | cut -f$idx -d )
+
+if ! test -f $with_branding/$lfile ; then
+AC_MSG_WARN([Branded file $lfile does not exist, using the
default one])
+else
+declare lvar=$with_branding/$lfile
+fi
+let idx=$idx + 1
+done
+check_for_progress=yes
+fi
fi
AC_SUBST(INTRO_BITMAP)
AC_SUBST(ABOUT_BACKGROUND_SVG)
--
To view, visit https://gerrit.libreoffice.org/2978
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I574e873fede3343b2384715162dcecce86563db3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mathias M m...@gmx.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Consolidated branding in configure
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1704 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/1704/1 Consolidated branding in configure Removed individual options (intro* and startcenter* + images) in favor of a folder with graceful fallback. Grouped progress bar intro settings in a text file into the branding folder Change-Id: Ib56b80e43c474a944ac79c0a842d66487e9f91d5 --- M configure.ac M instsetoo_native/util/openoffice.lst.in 2 files changed, 81 insertions(+), 303 deletions(-) diff --git a/configure.ac b/configure.ac index 8bc4101..44efb52 100644 --- a/configure.ac +++ b/configure.ac @@ -1845,110 +1845,37 @@ dnl === AC_ARG_WITH(branding, -[ --with-brandingUse given path to retrieve all branding images. - Expects /path/intro.png ... - /path/backing_rtl_right.png to be there. Individual - images can be overridden via --with-intro-bitmap ... - --with-startcenter-rtl-left-bitmap switches. +AS_HELP_STRING([--with-branding], +[Use given path to retrieve branding images set.]) +[ + Search for intro.png about.svg flat_logo.svg + backing_left.png backing_right.png + backing_rtl_left.png backing_rtl_right.png + backing_space.png. If any is missing, default + ones will be used instead. + + Search also progress.conf for progress + settings on intro screen : + + PROGRESSBARCOLOR=255,255,255 Set color of + progress bar. Comma separated RGB decimal values. + PROGRESSSIZE=407,6 Set size of progress bar. + Comma separated decimal values (width, height). + PROGRESSPOSITION=61,317 Set position of progress + bar from left,top. Comma separated decimal values. + PROGRESSFRAMECOLOR=20,136,3 Set color of progress + bar frame. Comma separated RGB decimal values. + PROGRESSTEXTCOLOR=255,255,255 Set color of progress + bar text. Comma separated RGB decimal values. + PROGRESSTEXTBASELINE=287 Set vertical position of + progress bar text from top. Decimal value. + + Default values will be used if not found. Usage: --with-branding=/path/to/images -],,) +], +,) -AC_ARG_WITH(intro-bitmap, -[ --with-intro-bitmapPrefer the specified intro bitmap over the - the default one. - - Usage: --with-intro-bitmap=/path/my_ooo_intro.png -],,) - -AC_ARG_WITH(intro-progressbar-color, -[ --with-intro-progressbar-colorSet color of progress bar on intro screen. - Comma separated RGB values in decimal format. - - Usage: --with-intro-progressbar-color=126,170,23 -],,) - -AC_ARG_WITH(intro-progressbar-size, -[ --with-intro-progressbar-size Set size of progress bar on intro screen. - Comma separated values in decimal format. - - Usage: --with-intro-progressbar-size=319,10 -],,) - -AC_ARG_WITH(intro-progressbar-position, -[ --with-intro-progressbar-position Set position of progress bar on intro screen. - Comma separated values in decimal format. - - Usage: --with-intro-progressbar-position=164,225 -],,) - -AC_ARG_WITH(intro-progressbar-frame-color, -[ --with-intro-progressbar-frame-colorSet color of progress bar frame on intro screen. - Comma separated RGB values in decimal format. - - Usage: --with-intro-progressbar-frame-color=207,208,211 -],,) - -AC_ARG_WITH(intro-progressbar-text-color, -AS_HELP_STRING([--with-intro-progressbar-text-color], -[Set color of progress bar text on intro screen. Comma separated RGB values in decimal format.]) -[ - Usage: --with-intro-progressbar-text-color=207,208,211 -],,) - -AC_ARG_WITH(intro-progressbar-text-baseline, -AS_HELP_STRING([--with-intro-progressbar-text-baseline], -[Set vertical position of progress bar text on intro screen. Value in decimal format.]) -[ - Usage: --with-intro-progressbar-text-baseline=250 -],,) - -AC_ARG_WITH(flat-logo-svg, -[ --with-flat-logo-svgAllows specification of the flat Logo SVG. - - Usage:
[PATCH] First fix for fdo#56902
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1233 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/1233/1 First fix for fdo#56902 Restrict moz to windows, and build vars also impacts nss, connectivity Change-Id: I27aae1398f3f8a4d046c2c7805d64bc7523c7282 --- M config_host.mk.in M configure.ac M connectivity/Module_connectivity.mk M moz/README M moz/extractfiles.mk M moz/makefile.mk M moz/zipped/makefile.mk M nss/README M nss/makefile.mk 9 files changed, 104 insertions(+), 702 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1233 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27aae1398f3f8a4d046c2c7805d64bc7523c7282 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mathias M m...@gmx.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Better handling of well-know prerequisites under windows
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1100 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/00/1100/1 Better handling of well-know prerequisites under windows Add moz prebuilt msvcrt80 copy Change-Id: I335c25904c16db534a4878ff6a17db202eaef4f5 --- M configure.ac M moz/makefile.mk M ooo.lst.in 3 files changed, 51 insertions(+), 27 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1100 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I335c25904c16db534a4878ff6a17db202eaef4f5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mathias M m...@gmx.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Proposal for fdo#42974 and moz/zipped also
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/870 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/870/1 Proposal for fdo#42974 and moz/zipped also wget for moz and cp for VS2005 CRT. Change-Id: I41554e795fc18c026b6b49e6bcb9894b5257f641 --- M configure.in 1 file changed, 40 insertions(+), 23 deletions(-) -- To view, visit https://gerrit.libreoffice.org/870 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I41554e795fc18c026b6b49e6bcb9894b5257f641 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mathias M m...@gmx.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Proposal for fdo#42974 and moz/zipped also
Mathias M has abandoned this change. Change subject: Proposal for fdo#42974 and moz/zipped also .. Patch Set 1: Abandoned Tabs instead of spaces. will resubmit -- To view, visit https://gerrit.libreoffice.org/870 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I41554e795fc18c026b6b49e6bcb9894b5257f641 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mathias M m...@gmx.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Proposal for fdo#42974 and moz/zipped also
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/871 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/871/1 Proposal for fdo#42974 and moz/zipped also wget for moz and cp for VS2005 CRT. (amend tabs 2 spaces) Change-Id: Ie90c2d82d262b2c23b84593e7952c7d798aa65da --- M configure.in 1 file changed, 42 insertions(+), 25 deletions(-) -- To view, visit https://gerrit.libreoffice.org/871 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie90c2d82d262b2c23b84593e7952c7d798aa65da Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mathias M m...@gmx.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
