[Libreoffice-commits] online.git: 4 commits - docker/l10n-docker-nightly.sh

[Andras Timar]

 docker/l10n-docker-nightly.sh |   63 +++++++++++++++++++++++++++++-------------
 1 file changed, 44 insertions(+), 19 deletions(-)

New commits:
commit 4dd0ed6792aad78257c7f5fef0487e98a6d13458
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Jan 5 17:25:42 2018 +0100

    Online docker: always overwrite autogen.input
    
    Change-Id: I049c22ee698fc5393486623ae71b7b41a4bf8904

diff --git a/docker/l10n-docker-nightly.sh b/docker/l10n-docker-nightly.sh
index 7cb97cc3..c95c9b3e 100755
--- a/docker/l10n-docker-nightly.sh
+++ b/docker/l10n-docker-nightly.sh
@@ -38,7 +38,22 @@ mkdir -p "$INSTDIR"
 # libreoffice repo
 if test ! -d libreoffice ; then
     git clone git://anongit.freedesktop.org/libreoffice/core libreoffice || exit 1
-    cat > libreoffice/autogen.input << EOF
+fi
+
+( cd libreoffice && git checkout master && git pull -r ) || exit 1
+
+# online repo
+if test ! -d online ; then
+    git clone git://anongit.freedesktop.org/libreoffice/online online || exit 1
+    ( cd online && ./autogen.sh ) || exit 1
+fi
+
+( cd online && git checkout -f master && git pull -r ) || exit 1
+
+##### LibreOffice #####
+
+# build LibreOffice
+cat > libreoffice/autogen.input << EOF
 --disable-cups
 --disable-dbus
 --disable-dconf
@@ -92,22 +107,7 @@ if test ! -d libreoffice ; then
 --without-system-postgresql
 EOF
 
-    ( cd libreoffice && ./autogen.sh ) || exit 1
-fi
-
-( cd libreoffice && git checkout master && git pull -r ) || exit 1
-
-# online repo
-if test ! -d online ; then
-    git clone git://anongit.freedesktop.org/libreoffice/online online || exit 1
-    ( cd online && ./autogen.sh ) || exit 1
-fi
-
-( cd online && git checkout -f master && git pull -r ) || exit 1
-
-##### LibreOffice #####
-
-# build LibreOffice
+( cd libreoffice && ./autogen.sh ) || exit 1
 ( cd libreoffice && make ) || exit 1
 
 # copy stuff
commit 0e9aecaba72783102f2a9b01dcb7caeb49409f6c
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Jan 5 17:24:33 2018 +0100

    Online docker: add dictionaries
    
    Change-Id: I31a121d5d532ff68acdb053a491e6fec68772f8d

diff --git a/docker/l10n-docker-nightly.sh b/docker/l10n-docker-nightly.sh
index d47b2fb8..7cb97cc3 100755
--- a/docker/l10n-docker-nightly.sh
+++ b/docker/l10n-docker-nightly.sh
@@ -80,7 +80,7 @@ if test ! -d libreoffice ; then
 --without-help
 --without-java
 --without-junit
---without-myspell-dicts
+--with-myspell-dicts
 --without-package-format
 --without-system-cairo
 --without-system-jars
@@ -113,6 +113,30 @@ fi
 # copy stuff
 mkdir -p "$INSTDIR"/opt/
 cp -a libreoffice/instdir "$INSTDIR"/opt/libreoffice
+mkdir -p "$INSTDIR"/usr/share/hunspell
+mkdir -p "$INSTDIR"/usr/share/hyphen
+mkdir -p "$INSTDIR"/opt/lool/systemplate/usr/share/hyphen
+for i in `find libreoffice/instdir/share/extensions/ -name hyph*.dic`;do cp -a $i "$INSTDIR"/opt/lool/systemplate/usr/share/hyphen;done
+for i in `find libreoffice/instdir/share/extensions/ -name hyph*.dic`;do cp -a $i "$INSTDIR"/usr/share/hyphen;done
+cp -a libreoffice/instdir/share/extensions/dict-en/en_US.* "$INSTDIR"/usr/share/hunspell
+cp -a libreoffice/instdir/share/extensions/dict-en/en_GB.* "$INSTDIR"/usr/share/hunspell
+cp -a libreoffice/instdir/share/extensions/dict-it/it_IT.* "$INSTDIR"/usr/share/hunspell
+cp -a libreoffice/instdir/share/extensions/dict-nl/nl_NL.* "$INSTDIR"/usr/share/hunspell
+cp -a libreoffice/instdir/share/extensions/dict-pl/pl_PL.* "$INSTDIR"/usr/share/hunspell
+cp -a libreoffice/instdir/share/extensions/dict-ru/ru_RU.* "$INSTDIR"/usr/share/hunspell
+cp -a libreoffice/instdir/share/extensions/dict-pt-BR/pt_BR.* "$INSTDIR"/usr/share/hunspell
+cp -a libreoffice/instdir/share/extensions/dict-pt-PT/pt_PT.* "$INSTDIR"/usr/share/hunspell
+cp -a libreoffice/instdir/share/extensions/dict-fr/fr.dic "$INSTDIR"/usr/share/hunspell/fr_FR.dic
+cp -a libreoffice/instdir/share/extensions/dict-fr/fr.aff "$INSTDIR"/usr/share/hunspell/fr_FR.aff
+cp -a libreoffice/instdir/share/extensions/dict-es/es_ANY.dic "$INSTDIR"/usr/share/hunspell/es_ES.dic
+cp -a libreoffice/instdir/share/extensions/dict-es/es_ANY.aff "$INSTDIR"/usr/share/hunspell/es_ES.aff
+cp -a libreoffice/instdir/share/extensions/dict-de/de_AT_frami.dic "$INSTDIR"/usr/share/hunspell/de_AT.dic
+cp -a libreoffice/instdir/share/extensions/dict-de/de_AT_frami.aff "$INSTDIR"/usr/share/hunspell/de_AT.aff
+cp -a libreoffice/instdir/share/extensions/dict-de/de_CH_frami.dic "$INSTDIR"/usr/share/hunspell/de_CH.dic
+cp -a libreoffice/instdir/share/extensions/dict-de/de_CH_frami.aff "$INSTDIR"/usr/share/hunspell/de_CH.aff
+cp -a libreoffice/instdir/share/extensions/dict-de/de_DE_frami.dic "$INSTDIR"/usr/share/hunspell/de_DE.dic
+cp -a libreoffice/instdir/share/extensions/dict-de/de_DE_frami.aff "$INSTDIR"/usr/share/hunspell/de_DE.aff
+
 
 ##### loolwsd & loleaflet #####
 
commit a314dab8d8b1f398521d689b7bbac665ae3173e2
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Jan 5 17:12:34 2018 +0100

    Online docker: do not use system cairo
    
    Change-Id: Idbfa92eaeb9fff28ccdef5db91a063900592bd6c

diff --git a/docker/l10n-docker-nightly.sh b/docker/l10n-docker-nightly.sh
index b97cf84d..d47b2fb8 100755
--- a/docker/l10n-docker-nightly.sh
+++ b/docker/l10n-docker-nightly.sh
@@ -82,6 +82,7 @@ if test ! -d libreoffice ; then
 --without-junit
 --without-myspell-dicts
 --without-package-format
+--without-system-cairo
 --without-system-jars
 --without-system-jpeg
 --without-system-libpng
commit 3af18201c046fb4eb09febd60b2c2f3c230c41c0
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Jan 5 17:09:44 2018 +0100

    Online docker: build all languages
    
    Change-Id: I9e9f06dee433995691def08d0bacde2e538ab3fc

diff --git a/docker/l10n-docker-nightly.sh b/docker/l10n-docker-nightly.sh
index d6aea13c..b97cf84d 100755
--- a/docker/l10n-docker-nightly.sh
+++ b/docker/l10n-docker-nightly.sh
@@ -71,7 +71,7 @@ if test ! -d libreoffice ; then
 --with-external-thes-dir=/usr/share/mythes
 --with-fonts
 --with-galleries=no
---with-lang=
+--with-lang=ALL
 --with-linker-hash-style=both
 --with-system-dicts
 --with-system-zlib