[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2021-03-25 Thread Tor Lillqvist (via logerrit) 
 ios/CustomTarget_iOS_setup.mk |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3d495a867a26c4861386c0002ee8cacba89c5a5a
Author: Tor Lillqvist 
AuthorDate: Thu Mar 25 15:21:40 2021 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Mar 25 15:30:12 2021 +0200

Fix editing mistake for iOS build

Spelling dictionaries go into a separate directory.

Change-Id: Ia8bc14d8e3320533c35a70884f7b4cf190e19fe4

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 8a082bcd5273..f44a154470bb 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -80,10 +80,10 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
# Install the Swiss German dictionary and use it for Liechtenstein, too.
# Install also thesauruses.
if test -d $(INSTDIR)/share/extensions/dict-de; then \
-   cp $(INSTDIR)/share/extensions/dict-de/de_CH_frami.aff 
$(IOSRES)/share/thes/de_CH.aff; \
-   cp $(INSTDIR)/share/extensions/dict-de/de_CH_frami.dic 
$(IOSRES)/share/thes/de_CH.dic; \
-   cp $(INSTDIR)/share/extensions/dict-de/de_CH_frami.aff 
$(IOSRES)/share/thes/de_LI.aff; \
-   cp $(INSTDIR)/share/extensions/dict-de/de_CH_frami.dic 
$(IOSRES)/share/thes/de_LI.dic; \
+   cp $(INSTDIR)/share/extensions/dict-de/de_CH_frami.aff 
$(IOSRES)/share/spell/de_CH.aff; \
+   cp $(INSTDIR)/share/extensions/dict-de/de_CH_frami.dic 
$(IOSRES)/share/spell/de_CH.dic; \
+   cp $(INSTDIR)/share/extensions/dict-de/de_CH_frami.aff 
$(IOSRES)/share/spell/de_LI.aff; \
+   cp $(INSTDIR)/share/extensions/dict-de/de_CH_frami.dic 
$(IOSRES)/share/spell/de_LI.dic; \
cp $(INSTDIR)/share/extensions/*/th_*_v2.* 
$(IOSRES)/share/thes; \
cp $(INSTDIR)/share/extensions/dict-en/th_en_US_v2.dat 
$(IOSRES)/share/thes/th_en_GB_v2.dat; \
cp $(INSTDIR)/share/extensions/dict-en/th_en_US_v2.idx 
$(IOSRES)/share/thes/th_en_GB_v2.idx; \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2020-06-22 Thread Tor Lillqvist (via logerrit) 
 ios/CustomTarget_iOS_setup.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b31d9369449d37e951e27cdf76d39586ff6fe053
Author: Tor Lillqvist 
AuthorDate: Wed Jun 10 19:34:38 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Jun 22 17:57:51 2020 +0200

Use xcrun python3 to find the python3 also on Macs with older Xcode

There is no /usr/bin/python3 on those. With a current Xcode, it is the
python3 that comes with Xcode that /usr/bin/python3 runs anyway.

Change-Id: Iaee3d030337d6dfc37b67852a492b054fb4b9fee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96062
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96858
Tested-by: Jenkins

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 0227c860dfd2..3ed2d5379bbe 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -49,7 +49,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),EN2)
 
# generate native-code.h (used by LibreOffice.c)
-   $(SRCDIR)/solenv/bin/native-code.py \
+   xcrun python3 $(SRCDIR)/solenv/bin/native-code.py \
-C -g core -g writer -g calc -g draw -g edit \
> $(IOSGEN)/native-code.h
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2020-03-26 Thread Tor Lillqvist (via logerrit) 
 ios/CustomTarget_iOS_setup.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0063e7b67666f444dae2f870f3cfbb651c762445
Author: Tor Lillqvist 
AuthorDate: Thu Mar 26 14:54:10 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Mar 26 15:03:31 2020 +0200

Add share/fingerprint to the iOS app

I once noticed a message "Failed to open config file
'/private/var/containers/.../Mobile.app/share/fingerprint/fpdb.conf'",
so clearly it is needed in some situations.

Change-Id: Ie5af6152f7955f6b439ea53d75b4c603bf82c5df

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 66e876337278..0227c860dfd2 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -77,6 +77,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
cp -R $(INSTDIR)/share/fonts/truetype $(IOSRES)/share/fonts
cp -R $(INSTDIR)/share/gallery $(IOSRES)/share
cp -R $(INSTDIR)/share/palette $(IOSRES)/share
+   cp -R $(INSTDIR)/share/fingerprint $(IOSRES)/share
cp $(SRCDIR)/ios/welcome.odt $(IOSRES)
 
# Set up rc (the "inifile", fundamentalrc, unorc, bootstraprc and 
versionrc.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2020-02-17 Thread Tor Lillqvist (via logerrit) 
 ios/CustomTarget_iOS_setup.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 086be3661434a8304a88b846561abf4dda83fb1c
Author: Tor Lillqvist 
AuthorDate: Mon Feb 17 13:45:13 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Feb 17 15:56:02 2020 +0200

Move the "registry" directory to be under "share" on iOS, too

Necessary in order to be more like on other platforms. There is an
upcoming change in the online repo that hardcodes that. (There was no
specific reason why we had "registry" directly in the app bundle on
iOS, just some historical randomness.)

Change-Id: Iafcd54598805cb5adaec09b30d32dc51a3f4554e

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 914a2aacf4b7..66e876337278 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -68,7 +68,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
cp $(INSTDIR)/share/filter/oox-drawingml-adj-names 
$(IOSRES)/share/filter
cp $(INSTDIR)/share/filter/oox-drawingml-cs-presets 
$(IOSRES)/share/filter
cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/share/filter
-   cp -R $(INSTDIR)/share/registry $(IOSRES)
+   cp -R $(INSTDIR)/share/registry $(IOSRES)/share
cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config
cp -R $(INSTDIR)/share/liblangtag $(IOSRES)/share
cp -R $(INSTDIR)/share/theme_definitions $(IOSRES)/share
@@ -90,8 +90,8 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
 && echo 'BRAND_INI_DIR=file:://$$APP_DATA_DIR' \
 && echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)' \
 && echo 'BRAND_SHARE_RESOURCE_SUBDIR=$(LIBO_SHARE_RESOURCE_FOLDER)' \
-&& echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/registry ' \
-   'res:$${BRAND_BASE_DIR}/registry' \
+&& echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry 
' \
+   'res:$${BRAND_BASE_DIR}/share/registry' \
&& echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/' \
&& echo 'UNO_TYPES=file://$$APP_DATA_DIR/udkapi.rdb ' \
'file://$$APP_DATA_DIR/offapi.rdb' \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2019-10-07 Thread Tor Lillqvist (via logerrit) 
 ios/CustomTarget_iOS_setup.mk |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit dd49483be36b6ed02e3a014f1d00410d43ec1bf3
Author: Tor Lillqvist 
AuthorDate: Mon Aug 26 16:19:47 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Oct 7 15:02:01 2019 +0300

Use correct directory for some data files on iOS: share/filter, not filter

Change-Id: Idd7d675872b73454d78576ed231fe90644dbe4c5
Reviewed-on: https://gerrit.libreoffice.org/78142
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/78999

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index f69e54a31e30..ec6a2492cb47 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -21,7 +21,7 @@ IOSDIRS = $(IOSGEN) \
  $(IOSRES)/program \
  $(IOSRES)/share \
  $(IOSRES)/config \
- $(IOSRES)/filter
+ $(IOSRES)/share/filter
 
 
 #- Top level  -
@@ -61,9 +61,9 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
fi
mkdir -p $(IOSRES)/share/config
cp -R $(INSTDIR)/share/config/soffice.cfg $(IOSRES)/share/config
-   cp $(INSTDIR)/share/filter/oox-drawingml-adj-names $(IOSRES)/filter
-   cp $(INSTDIR)/share/filter/oox-drawingml-cs-presets $(IOSRES)/filter
-   cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/filter
+   cp $(INSTDIR)/share/filter/oox-drawingml-adj-names 
$(IOSRES)/share/filter
+   cp $(INSTDIR)/share/filter/oox-drawingml-cs-presets 
$(IOSRES)/share/filter
+   cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/share/filter
cp -R $(INSTDIR)/share/registry $(IOSRES)
cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config
cp -R $(INSTDIR)/share/liblangtag $(IOSRES)/share
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2019-08-30 Thread Tor Lillqvist (via logerrit) 
 ios/CustomTarget_iOS_setup.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d418eaed304d69f5a766a9ee5a907a71771b0223
Author: Tor Lillqvist 
AuthorDate: Fri Aug 30 13:18:49 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Fri Aug 30 13:28:13 2019 +0200

tdf#126966: The share/palette folder was missing from the iOS app

Maybe it would be good to simply include all of share as such, without
trying to pick only what is actually needed? Must investigate.

Change-Id: Ide991334fe4bbe2b1e9807b8dba2b1e635e4f469
Reviewed-on: https://gerrit.libreoffice.org/78292
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index b3b06f9fc733..f69e54a31e30 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -72,6 +72,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
mkdir -p $(IOSRES)/share/fonts
cp -R $(INSTDIR)/share/fonts/truetype $(IOSRES)/share/fonts
cp -R $(INSTDIR)/share/gallery $(IOSRES)/share
+   cp -R $(INSTDIR)/share/palette $(IOSRES)/share
cp $(SRCDIR)/ios/welcome.odt $(IOSRES)
 
# Set up rc (the "inifile", fundamentalrc, unorc, bootstraprc and 
versionrc.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2019-04-12 Thread Tor Lillqvist (via logerrit) 
 ios/CustomTarget_iOS_setup.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7811a0e581ca34f59daf4210c568f818d8c9dfdd
Author: Tor Lillqvist 
AuthorDate: Fri Apr 12 15:24:05 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Fri Apr 12 15:36:19 2019 +0300

tdf#124449: We need also share/gallery for the iOS app

I wonder wheter we should just include all of instdir/share. Seems
that I have to add more and more of it all the time anyway. I don't
remember why I thought (many years ago) that an app would need just a
subset. (Maybe I thought that an app would not, at least not
initially, have functionality that would use most of the stuff in
shre. But that has changed now.)

Change-Id: I62f935e3ab9c4709373fad11ed120ecca033b4aa

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index c06a1241853d..b3b06f9fc733 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -71,6 +71,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
cp -R $(INSTDIR)/share/template $(IOSRES)/share
mkdir -p $(IOSRES)/share/fonts
cp -R $(INSTDIR)/share/fonts/truetype $(IOSRES)/share/fonts
+   cp -R $(INSTDIR)/share/gallery $(IOSRES)/share
cp $(SRCDIR)/ios/welcome.odt $(IOSRES)
 
# Set up rc (the "inifile", fundamentalrc, unorc, bootstraprc and 
versionrc.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2019-03-25 Thread Tor Lillqvist (via logerrit) 
 ios/CustomTarget_iOS_setup.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fd2f43e05bd065ca9f7878ad715bf0f8afa23f3c
Author: Tor Lillqvist 
AuthorDate: Mon Mar 25 19:07:59 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Mar 25 19:07:59 2019 +0200

Just include all fonts from instdir/share/fonts in the iOS app

That is apparently what we want.

Change-Id: I900c26873de02495cac7918b0c453f4fdcb6c3e6

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 89f8e340f44d..c06a1241853d 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -69,8 +69,8 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
cp -R $(INSTDIR)/share/liblangtag $(IOSRES)/share
cp -R $(INSTDIR)/share/theme_definitions $(IOSRES)/share
cp -R $(INSTDIR)/share/template $(IOSRES)/share
-   mkdir -p $(IOSRES)/share/fonts/truetype
-   cp $(INSTDIR)/share/fonts/truetype/Liberation* 
$(IOSRES)/share/fonts/truetype
+   mkdir -p $(IOSRES)/share/fonts
+   cp -R $(INSTDIR)/share/fonts/truetype $(IOSRES)/share/fonts
cp $(SRCDIR)/ios/welcome.odt $(IOSRES)
 
# Set up rc (the "inifile", fundamentalrc, unorc, bootstraprc and 
versionrc.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2019-03-11 Thread Libreoffice Gerrit user 
 ios/CustomTarget_iOS_setup.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6088eeb6ea1c92be96418116556e32de6d33d038
Author: Tor Lillqvist 
AuthorDate: Mon Mar 11 17:16:20 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Mar 11 23:33:33 2019 +0200

We need share/theme_definitions in the iOS app

Change-Id: I460a71f363eb3b7f89786b8bd02f4b8f9521f4c7

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index e651dd63f5bb..faf8d25bf629 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -67,6 +67,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
cp -R $(INSTDIR)/share/registry $(IOSRES)
cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config
cp -R $(INSTDIR)/share/liblangtag $(IOSRES)/share
+   cp -R $(INSTDIR)/share/theme_definitions $(IOSRES)/share
mkdir -p $(IOSRES)/share/fonts/truetype
cp $(INSTDIR)/share/fonts/truetype/Liberation* 
$(IOSRES)/share/fonts/truetype
cp $(SRCDIR)/ios/welcome.odt $(IOSRES)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2018-11-27 Thread Libreoffice Gerrit user 
 ios/CustomTarget_iOS_setup.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6fcf55e293537adb1a1a099305dc4a8943cbbe72
Author: Tor Lillqvist 
AuthorDate: Tue Nov 27 15:04:35 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Nov 27 16:07:27 2018 +0200

Prepare to bundle the Liberation fonts with the iOS app

The way the iOS app is built (over in the online repo), any
"resources" to be included need to be copied into the
workdir/CustomTarget/ios folder.

Change-Id: Ibac15b03dc447d6649e03404fe9a68ef3b4881b9

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 539f3856ad5e..59bf0469b13e 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -65,6 +65,8 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
cp -R $(INSTDIR)/share/registry $(IOSRES)
cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config
cp -R $(INSTDIR)/share/liblangtag $(IOSRES)/share
+   mkdir -p $(IOSRES)/share/fonts/truetype
+   cp $(INSTDIR)/share/fonts/truetype/Liberation* 
$(IOSRES)/share/fonts/truetype
cp $(SRCDIR)/ios/welcome.odt $(IOSRES)
 
# Set up rc (the "inifile", fundamentalrc, unorc, bootstraprc and 
versionrc.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2018-11-26 Thread Libreoffice Gerrit user 
 ios/CustomTarget_iOS_setup.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 27e517b2e592d8516844848a85399c6ed05f18aa
Author: Tor Lillqvist 
AuthorDate: Tue Nov 27 00:07:02 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Nov 27 00:09:26 2018 +0200

Fill buildid in versionrc for iOS with the git HEAD hash

Previously it tried to use a BUILDID Make variable that did not exist.

Change-Id: Ie31eb3928c69dc52fcb17a9a5593cbe166d95307

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 642c6d969c77..539f3856ad5e 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -100,7 +100,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
(echo '[Version]' \
&& echo 'AllLanguages=en-US' \
&& echo 'BuildVersion=' \
-   && echo "buildid=$(BUILDID)" \
+   && echo "buildid=$(shell git -C $(SRCDIR) log -1 --format=%H)" \
) > $(IOSRES)/program/versionrc
 
$(SRCDIR)/bin/lo-all-static-libs | sed -e 's/ /\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2018-11-12 Thread Libreoffice Gerrit user 
 ios/CustomTarget_iOS_setup.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4122e02986f3f67e7c97eda914869f3ae23a5e2c
Author: Tor Lillqvist 
AuthorDate: Mon Nov 12 20:06:20 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Nov 12 20:20:52 2018 +0200

We need share/liblangtag, too

Otherwise i18nlantag works weirdly.

Change-Id: Ic5bf2007e586e6bb53a9e89782c2b05f73e348e3

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 85fbbad4c727..642c6d969c77 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -64,6 +64,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/filter
cp -R $(INSTDIR)/share/registry $(IOSRES)
cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config
+   cp -R $(INSTDIR)/share/liblangtag $(IOSRES)/share
cp $(SRCDIR)/ios/welcome.odt $(IOSRES)
 
# Set up rc (the "inifile", fundamentalrc, unorc, bootstraprc and 
versionrc.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2018-10-11 Thread Libreoffice Gerrit user 
 ios/CustomTarget_iOS_setup.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 944ef72a1e4e00bba8d9f88bec11d27cbe53fcdc
Author: Tor Lillqvist 
AuthorDate: Fri Oct 12 03:38:03 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Fri Oct 12 03:56:05 2018 +0300

Avoid superfluous directory level

Don't bother with a 'userinstallation' subdirectory. It is a
subdirectory called "user" of the UserInstallation value that will be
used for our stuff anyway.

Change-Id: Idb6b5992bfda73ed7af80274b0de8ad7b43c241c

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index df94b4ef2688..33ac39045e4a 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -92,7 +92,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
(echo '[Bootstrap]' \
&& echo 'InstallMode=' \
&& echo "ProductKey=LibreOffice $(PRODUCTVERSION)" \
-   && echo 'UserInstallation=$$SYSUSERHOME/userinstallation' \
+   && echo 'UserInstallation=$$SYSUSERHOME' \
) > $(IOSRES)/program/bootstraprc
 
(echo '[Version]' \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk ios/UnitTest libreofficekit/qa

2018-09-28 Thread Libreoffice Gerrit user 
 ios/CustomTarget_iOS_setup.mk   |   11 
 ios/UnitTest/UnitTest.xcodeproj/project.pbxproj |  470 
 ios/UnitTest/UnitTest/AppDelegate.h |   16 
 ios/UnitTest/UnitTest/AppDelegate.m |   52 ++
 ios/UnitTest/UnitTest/Info.plist|   45 ++
 ios/UnitTest/UnitTest/ViewController.h  |   14 
 ios/UnitTest/UnitTest/ViewController.mm |   75 +++
 ios/UnitTest/UnitTest/main.m|   18 
 libreofficekit/qa/tilebench/tilebench.cxx   |   16 
 9 files changed, 705 insertions(+), 12 deletions(-)

New commits:
commit 68de1021353902d48ddd712f5e6fedc51c57936d
Author: Tor Lillqvist 
AuthorDate: Thu Sep 27 18:08:07 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Sep 28 14:03:05 2018 +0200

Start on the iOS unit test app

Change-Id: Idef0b375d5c7d6d4542aee1f8abecaf9f834189c
Reviewed-on: https://gerrit.libreoffice.org/61058
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 3f6f5eac90ac..df94b4ef2688 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -21,8 +21,7 @@ IOSDIRS = $(IOSGEN) \
$(IOSRES)/program \
   $(IOSRES)/share \
   $(IOSRES)/config \
-   $(IOSRES)/filter \
- $(WORKDIR)/ios
+   $(IOSRES)/filter
 
 
 #- Top level  -
@@ -41,13 +40,10 @@ $(IOSDIRS):
 $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
  $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \
 $(SRCDIR)/solenv/bin/native-code.py \
-$(IOSGEN) $(WORKDIR)/ios \
+$(IOSGEN) \
 $(IOSDIRS)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),EN2,2)
 
-   # Secure LibreOffice.c get build if there are changes
-   rm -rf $(WORKDIR)/ios/*
-
# generate native-code.h (used by LibreOffice.c)
$(SRCDIR)/solenv/bin/native-code.py \
-C -g core -g writer -g calc -g draw -g edit \
@@ -111,7 +107,6 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
 #- clean ios  -
 $(call gb_CustomTarget_get_clean_target,ios/iOS_setup):
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),ENV,2)
-   rm -rf $(IOSRES)/* $(IOSGEN)/native-code.h $(IOSGEN)/build
-   rm -rf $(WORKDIR)/ios
+   rm -rf $(IOSRES)/* $(IOSGEN)/native-code.h $(IOSGEN)
 
 # vim: set noet sw=4 ts=4:
diff --git a/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj 
b/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj
new file mode 100644
index ..8a49473ded43
--- /dev/null
+++ b/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj
@@ -0,0 +1,470 @@
+// !$*UTF8*$!
+{
+   archiveVersion = 1;
+   classes = {
+   };
+   objectVersion = 50;
+   objects = {
+
+/* Begin PBXBuildFile section */
+   BE39ADD7215D547B0244 /* test.odt in Resources */ = {isa = 
PBXBuildFile; fileRef = BE39ADD6215D547B0244 /* test.odt */; };
+   BE39ADEF215D5AA4000B0244 /* icudt62l.dat in Resources */ = {isa 
= PBXBuildFile; fileRef = BE39ADE0215D5AA3000B0244 /* icudt62l.dat */; };
+   BE39ADF0215D5AA4000B0244 /* fundamentalrc in Resources */ = 
{isa = PBXBuildFile; fileRef = BE39ADE1215D5AA3000B0244 /* fundamentalrc */; };
+   BE39ADF1215D5AA4000B0244 /* services in Resources */ = {isa = 
PBXBuildFile; fileRef = BE39ADE2215D5AA3000B0244 /* services */; };
+   BE39ADF2215D5AA4000B0244 /* share in Resources */ = {isa = 
PBXBuildFile; fileRef = BE39ADE3215D5AA3000B0244 /* share */; };
+   BE39ADF3215D5AA4000B0244 /* oovbaapi.rdb in Resources */ = {isa 
= PBXBuildFile; fileRef = BE39ADE4215D5AA3000B0244 /* oovbaapi.rdb */; };
+   BE39ADF4215D5AA4000B0244 /* program in Resources */ = {isa = 
PBXBuildFile; fileRef = BE39ADE5215D5AA3000B0244 /* program */; };
+   BE39ADF5215D5AA4000B0244 /* config in Resources */ = {isa = 
PBXBuildFile; fileRef = BE39ADE6215D5AA3000B0244 /* config */; };
+   BE39ADF6215D5AA4000B0244 /* services.rdb in Resources */ = {isa 
= PBXBuildFile; fileRef = BE39ADE7215D5AA3000B0244 /* services.rdb */; };
+   BE39ADF7215D5AA4000B0244 /* registry in Resources */ = {isa = 
PBXBuildFile; fileRef = BE39ADE8215D5AA3000B0244 /* registry */; };
+   BE39ADF8215D5AA4000B0244 /* offapi.rdb in Resources */ = {isa = 
PBXBuildFile; fileRef = BE39ADE9215D5AA3000B0244 /* offapi.rdb */; };
+   BE39ADF9215D5AA4000B0244 /* udkapi.rdb in Resources */ = {isa = 
PBXBuildFile; fileRef = BE39ADEA215D5AA3000B0244 /* udkapi.rdb */; };
+   BE39ADFA215D5AA4000B0244 /* rc in Resources */ = {isa = 
PBXBuildFile; fileRef =

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2018-09-14 Thread Libreoffice Gerrit user 
 ios/CustomTarget_iOS_setup.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 14a58a5e5582bb1d34025cafc5a7bea7e7cc0100
Author: Tor Lillqvist 
AuthorDate: Thu Sep 6 16:48:10 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Fri Sep 14 18:53:21 2018 +0200

Return share/config/soffice.cfg as it was, as I think the code expects

Not sure how it worked in LibreOfficeLight.

Change-Id: I0991b13a7538581642f530bf45a1bba1b1b644d5
Reviewed-on: https://gerrit.libreoffice.org/60505
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 94fffd34349e..3f6f5eac90ac 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -60,7 +60,8 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
cp $(INSTDIR)/program/types/oovbaapi.rdb$(IOSRES)
cp $(INSTDIR)/program/services/services.rdb $(IOSRES)/services
cp $(INSTDIR)/program/services.rdb  $(IOSRES)
-   cp -R $(INSTDIR)/share/config/soffice.cfg $(IOSRES)/config
+   mkdir -p $(IOSRES)/share/config
+   cp -R $(INSTDIR)/share/config/soffice.cfg $(IOSRES)/share/config
cp $(INSTDIR)/share/filter/oox-drawingml-adj-names $(IOSRES)/filter
cp $(INSTDIR)/share/filter/oox-drawingml-cs-presets $(IOSRES)/filter
cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/filter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2018-09-05 Thread Libreoffice Gerrit user 
 ios/CustomTarget_iOS_setup.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 59b9fc4776940863d905de14e25d74421f7de603
Author: Tor Lillqvist 
AuthorDate: Wed Sep 5 13:53:06 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 5 13:55:24 2018 +0300

Put the lib names one per line to match what ld's -filelist expects

Change-Id: I7454c10a1547db796554f45f2d630af81a916c55

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 432640aa45f6..4f4449e6eaaa 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -104,7 +104,8 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
&& echo "buildid=$(BUILDID)" \
) > $(IOSRES)/program/versionrc
 
-   $(SRCDIR)/bin/lo-all-static-libs >$(WORKDIR)/ios-all-static-libs.list
+   $(SRCDIR)/bin/lo-all-static-libs | sed -e 's/ /\
+/g' >$(WORKDIR)/ios-all-static-libs.list
 
 #- clean ios  -
 $(call gb_CustomTarget_get_clean_target,ios/iOS_setup):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2018-07-17 Thread Libreoffice Gerrit user 
 ios/CustomTarget_iOS_setup.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1d3de59ac2d12e42e12c9642bd252236a80b096b
Author: Eike Rathke 
AuthorDate: Tue Jul 17 17:37:55 2018 +0200
Commit: Eike Rathke 
CommitDate: Tue Jul 17 17:41:10 2018 +0200

Use $(ICU_MAJOR) instead of hard coded (Upgrade to ICU 62.1)

Change-Id: Ifea7072922388b2c0b7631fb809b23e2a5524a3c

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index a0d1a18823ab..718bb8b90d46 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -54,7 +54,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
> $(IOSGEN)/native-code.h
 
# copy resource files used to start/run LibreOffice
-   cp $(WORKDIR)/UnpackedTarball/icu/source/data/in/icudt61l.dat 
$(IOSRES)/icudt61l.dat
+   cp $(WORKDIR)/UnpackedTarball/icu/source/data/in/icudt$(ICU_MAJOR)l.dat 
$(IOSRES)/icudt$(ICU_MAJOR)l.dat
cp $(INSTDIR)/program/types.rdb $(IOSRES)/udkapi.rdb
cp $(INSTDIR)/program/types/offapi.rdb  $(IOSRES)
cp $(INSTDIR)/program/types/oovbaapi.rdb$(IOSRES)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk ios/LibreOfficeLight

2018-03-03 Thread jan Iversen 
 ios/CustomTarget_iOS_setup.mk   |   18 -
 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |  108 
+-
 2 files changed, 69 insertions(+), 57 deletions(-)

New commits:
commit 652749a32b347a9114acd1d9585d0697a7d8dbc0
Author: jan Iversen 
Date:   Sat Mar 3 22:36:40 2018 +0100

iOS, moved resources from share to direct.

Change-Id: I266fe71a6c58d8b80fa917198e8d84b356dfe296

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 3c7573ae5330..a9f98850c6d8 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -20,8 +20,8 @@ IOSDIRS = $(IOSGEN) \
   $(IOSRES)/services \
$(IOSRES)/program \
   $(IOSRES)/share \
-  $(IOSRES)/share/config \
-   $(IOSRES)/share/filter \
+  $(IOSRES)/config \
+   $(IOSRES)/filter \
  $(WORKDIR)/ios
 
 
@@ -60,12 +60,12 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
cp $(INSTDIR)/program/types/oovbaapi.rdb$(IOSRES)
cp $(INSTDIR)/program/services/services.rdb $(IOSRES)/services
cp $(INSTDIR)/program/services.rdb  $(IOSRES)
-   cp -R $(INSTDIR)/share/config/soffice.cfg $(IOSRES)/share/config
-   cp $(INSTDIR)/share/filter/oox-drawingml-adj-names 
$(IOSRES)/share/filter
-   cp $(INSTDIR)/share/filter/oox-drawingml-cs-presets 
$(IOSRES)/share/filter
-   cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/share/filter
-   cp -R $(INSTDIR)/share/registry $(IOSRES)/share
-   cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config
+   cp -R $(INSTDIR)/share/config/soffice.cfg $(IOSRES)/config
+   cp $(INSTDIR)/share/filter/oox-drawingml-adj-names $(IOSRES)/filter
+   cp $(INSTDIR)/share/filter/oox-drawingml-cs-presets $(IOSRES)/filter
+   cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/filter
+   cp -R $(INSTDIR)/share/registry $(IOSRES)
+   cp $(INSTDIR)/share/config/*zip $(IOSRES)/config
cp $(SRCDIR)/ios/welcome.odt $(IOSRES)
 
# Set up rc (the "inifile", fundamentalrc, unorc, bootstraprc and 
versionrc.
@@ -79,7 +79,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
 && echo 'BRAND_INI_DIR=file:://$$APP_DATA_DIR' \
 && echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)' \
 && echo '##BRAND_SHARE_RESOURCE_SUBDIR=$(LIBO_SHARE_RESOURCE_FOLDER)' \
-&& echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry 
' \
+&& echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/registry ' \
'res:$${BRAND_BASE_DIR}/registry' \
&& echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/' \
&& echo 'UNO_TYPES=file://$$APP_DATA_DIR/udkapi.rdb ' \
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index a1559d21bb48..e02182b1d8e7 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -7,13 +7,23 @@
objects = {
 
 /* Begin PBXBuildFile section */
-   39022C1B1EDC2A0E00100066 /* program in Resources */ = {isa = 
PBXBuildFile; fileRef = 39022C1A1EDC2A0E00100066 /* program */; };
-   39022C1D1EDC2A2C00100066 /* services in Resources */ = {isa = 
PBXBuildFile; fileRef = 39022C1C1EDC2A2C00100066 /* services */; };
-   39022C1F1EDC2AB000100066 /* share in Resources */ = {isa = 
PBXBuildFile; fileRef = 39022C1E1EDC2AB000100066 /* share */; };
-   39022C211EDC2D0800100066 /* icudt60l.dat in Resources */ = {isa 
= PBXBuildFile; fileRef = 39022C201EDC2D0800100066 /* icudt60l.dat */; };
39284DB31FA5F207006F43E4 /* DocumentActions.swift in Sources */ 
= {isa = PBXBuildFile; fileRef = 39284DB21FA5F207006F43E4 /* 
DocumentActions.swift */; };
392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources 
*/ = {isa = PBXBuildFile; fileRef = 392ED9B21E5E4B03005C8435 /* 
ViewPrintManager.swift */; };
-   3941EF05204B4AC200082486 /* welcome.odt in Resources */ = {isa 
= PBXBuildFile; fileRef = 3941EF04204B4AC200082486 /* welcome.odt */; };
+   3941EF15204B4C8A00082486 /* unorc in Resources */ = {isa = 
PBXBuildFile; fileRef = 3941EF06204B4C8900082486 /* unorc */; };
+   3941EF16204B4C8A00082486 /* fundamentalrc in Resources */ = 
{isa = PBXBuildFile; fileRef = 3941EF07204B4C8900082486 /* fundamentalrc */; };
+   3941EF17204B4C8A00082486 /* program in Resources */ = {isa = 
PBXBuildFile; fileRef = 3941EF08204B4C8900082486 /* program */; };
+   3941EF18204B4C8A00082486 /* services.rdb in Resources */ = {isa 
= PBXBuildFile; fileRef = 3941EF09204B4C8900082486 /* services.rdb */; };
+   3941EF19204B4C8A00082486 /* oovbaapi.rdb in Resources */ = {isa 
= PBXBuildFile;

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2018-02-05 Thread jan Iversen 
 ios/CustomTarget_iOS_setup.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2db0c3e04348d3096dff72c568c461be3cb1a0c6
Author: jan Iversen 
Date:   Mon Feb 5 19:37:43 2018 +0100

iOS, add tango theme to avoid vcl problem.

Change-Id: I73bee8ce04ec6234187224d03f0e081f09037e72

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 8fea759249e9..eb102f669bf3 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -66,6 +66,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
cp $(INSTDIR)/share/filter/oox-drawingml-cs-presets 
$(IOSRES)/share/filter
cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/share/filter
cp -R $(INSTDIR)/share/registry $(IOSRES)/share
+   cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config
 
# Set up rc (the "inifile", fundamentalrc, unorc, bootstraprc and 
versionrc.
(echo '[Bootstrap]' \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2018-01-18 Thread jan Iversen 
 ios/CustomTarget_iOS_setup.mk |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e2ef73648ad9a9d531d563668d85eb6721d88d79
Author: jan Iversen 
Date:   Thu Jan 18 12:02:17 2018 +0100

iOS, directory creation as part of setup

Corrected sequence for creating directories

Change-Id: I7a148b5568694c67e382e75a2e1629d3e23bf197

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 81dac6686fbb..543ef306a7db 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -21,21 +21,21 @@ $(call gb_CustomTarget_get_target,ios/iOS_setup): 
$(IOSGEN)/native-code.h
 
 #- Generate dynamic files  ---
 $(IOSGEN) $(WORKDIR)/ios:
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),EN1,2)
mkdir -p $(IOSGEN) $(IOSRES) $(IOSRES)/services \
 $(IOSRES)/share/config $(IOSRES)/share/filter 
$(IOSRES)/program \
 $(IOSGEN)/simulator \
 $(IOSGEN)/debug \
 $(IOSGEN)/release \
-$(IOSGEN) $(WORKDIR)/ios;
+$(WORKDIR)/ios;
 
 
 
 $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
  $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \
-$(SRCDIR)/solenv/bin/native-code.py
-$(IOSGEN)/ios:
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
+$(SRCDIR)/solenv/bin/native-code.py \
+$(IOSGEN) $(WORKDIR)/ios
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),EN2,2)
$(SRCDIR)/solenv/bin/native-code.py \
-C -g core -g writer -g calc -g draw -g edit \
> $(IOSGEN)/native-code.h
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2018-01-18 Thread jan Iversen 
 ios/CustomTarget_iOS_setup.mk |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit bccb5c54cdcaaea09ee8a3929c7bcc4b94972c11
Author: jan Iversen 
Date:   Thu Jan 18 11:38:16 2018 +0100

iOS, avoid racing conflict in dependencies

WORDIR might be deleted, but generated kept, situation solved

Change-Id: I5847d590affa7f80ef734bf314dbee9a6fc81669

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 28636c7f0759..81dac6686fbb 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -20,19 +20,22 @@ $(call gb_CustomTarget_get_target,ios/iOS_setup): 
$(IOSGEN)/native-code.h
 
 
 #- Generate dynamic files  ---
-$(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
- $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \
-$(SRCDIR)/solenv/bin/native-code.py
+$(IOSGEN) $(WORKDIR)/ios:
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
-
-   # prepare directories
mkdir -p $(IOSGEN) $(IOSRES) $(IOSRES)/services \
 $(IOSRES)/share/config $(IOSRES)/share/filter 
$(IOSRES)/program \
 $(IOSGEN)/simulator \
 $(IOSGEN)/debug \
 $(IOSGEN)/release \
 $(IOSGEN) $(WORKDIR)/ios;
-   # generate file with call declarations
+
+
+
+$(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
+ $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \
+$(SRCDIR)/solenv/bin/native-code.py
+$(IOSGEN)/ios:
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
$(SRCDIR)/solenv/bin/native-code.py \
-C -g core -g writer -g calc -g draw -g edit \
> $(IOSGEN)/native-code.h
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2018-01-14 Thread jan Iversen 
 ios/CustomTarget_iOS_setup.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e16668e16441406db20f2adf587a9e1fed75b9aa
Author: jan Iversen 
Date:   Sun Jan 14 12:27:22 2018 +0100

iOS, typo

Change-Id: I59db4b822a7d0f697f887f99805893e9adb54667

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index ab303a837efd..28636c7f0759 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -20,7 +20,7 @@ $(call gb_CustomTarget_get_target,ios/iOS_setup): 
$(IOSGEN)/native-code.h
 
 
 #- Generate dynamic files  ---
-$(IOSGEN)/native-code.h: $(WORKDIR)/ios $(BUILDDIR)/config_host.mk \
+$(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
  $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \
 $(SRCDIR)/solenv/bin/native-code.py
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk ios/StaticLibrary_iOSkit.mk

2018-01-14 Thread jan Iversen 
 ios/CustomTarget_iOS_setup.mk |   20 ++--
 ios/StaticLibrary_iOSkit.mk   |2 ++
 2 files changed, 8 insertions(+), 14 deletions(-)

New commits:
commit 35020496e22317715140278a4b4cc974e48889da
Author: jan Iversen 
Date:   Sun Jan 14 12:24:44 2018 +0100

iOS, static library depeneds on setup

added dependency to static library

Change-Id: Ib0d7f7eec1f34ff275600cc9e825fa606f1ef40d

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 20b58c7623e5..ab303a837efd 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -17,29 +17,21 @@ $(eval $(call gb_CustomTarget_CustomTarget,ios/iOS_setup))
 
 $(call gb_CustomTarget_get_target,ios/iOS_setup): $(IOSGEN)/native-code.h
 
-#- build  -
-.PHONY: FORCE
-FORCE:
 
 
+#- Generate dynamic files  ---
+$(IOSGEN)/native-code.h: $(WORKDIR)/ios $(BUILDDIR)/config_host.mk \
+ $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \
+$(SRCDIR)/solenv/bin/native-code.py
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
 
-$(WORKDIR)/ios:
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRE,2)
+   # prepare directories
mkdir -p $(IOSGEN) $(IOSRES) $(IOSRES)/services \
 $(IOSRES)/share/config $(IOSRES)/share/filter 
$(IOSRES)/program \
 $(IOSGEN)/simulator \
 $(IOSGEN)/debug \
 $(IOSGEN)/release \
 $(IOSGEN) $(WORKDIR)/ios;
-
-
-
-#- Generate dynamic files  ---
-$(IOSGEN)/native-code.h: $(WORKDIR)/ios $(BUILDDIR)/config_host.mk \
- $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \
-$(SRCDIR)/solenv/bin/native-code.py
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
-
# generate file with call declarations
$(SRCDIR)/solenv/bin/native-code.py \
-C -g core -g writer -g calc -g draw -g edit \
diff --git a/ios/StaticLibrary_iOSkit.mk b/ios/StaticLibrary_iOSkit.mk
index f36ef856a8dc..a543e494a344 100644
--- a/ios/StaticLibrary_iOSkit.mk
+++ b/ios/StaticLibrary_iOSkit.mk
@@ -23,4 +23,6 @@ $(eval $(call gb_StaticLibrary_add_cobjects,iOS_kitBridge,\
 ios/source/LibreOfficeKit \
 ))
 
+$(call gb_StaticLibrary_get_target,ios/iOS_kitBridge): $(call 
gb_CustomTarget_get_target,ios/iOS_setup)
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2018-01-12 Thread jan Iversen 
 ios/CustomTarget_iOS_setup.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a5eea680720dd8f3c78143ac635dafdf09b5dd14
Author: jan Iversen 
Date:   Fri Jan 12 17:05:59 2018 +0100

iOS, add .py dependency to native-code.h

Change-Id: I165d59228c2b273d758d1222dce8e653bdca0039

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 9b7986cfda46..e159e2433fd2 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -36,7 +36,8 @@ $(WORKDIR)/ios:
 
 #- Generate dynamic files  ---
 $(IOSGEN)/native-code.h: $(WORKDIR)/ios $(BUILDDIR)/config_host.mk \
- $(SRCDIR)/ios/CustomTarget_iOS_setup.mk
+ $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \
+$(SRCDIR)/solenv/bin/native-code.py
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
 
# generate file with call declarations
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

2018-01-04 Thread jan Iversen 
 ios/CustomTarget_iOS_setup.mk |   53 +++---
 1 file changed, 30 insertions(+), 23 deletions(-)

New commits:
commit 61ab976bff4195beb77b749791d4f368cc9b71ee
Author: jan Iversen 
Date:   Thu Jan 4 19:29:58 2018 +0100

iOS added BRAND_* to fundamentalrc

Updated the content of fundamentalrc

Change-Id: I0e7ce7ffc8e61f572ad96f8c07872e41677cc421

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index b6796d5d4721..8b128d463580 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -46,35 +46,42 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/ios/CustomTarget_i
cp -R $(INSTDIR)/share/registry $(IOSRES)/share
 
# Set up rc, the "inifile". See getIniFileName_Impl().
-   echo '[Bootstrap]' > $(IOSRES)/rc
-   echo 'URE_BOOTSTRAP=file://$$APP_DATA_DIR/fundamentalrc' >> $(IOSRES)/rc
-   echo 'HOME=$$SYSUSERHOME' >> $(IOSRES)/rc
+   (echo '[Bootstrap]' \
+   && echo 'URE_BOOTSTRAP=file://$$APP_DATA_DIR/fundamentalrc' \
+   && echo 'HOME=$$SYSUSERHOME'  \
+   && echo '[Bootstrap]' \
+   ) > $(IOSRES)/rc
 
# Set up fundamentalrc, unorc, bootstraprc and versionrc.
-   file=$(IOSRES)/fundamentalrc; \
-   echo '[Bootstrap]'  >  
$(IOSRES)/fundamentalrc
-   echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/'>> 
$(IOSRES)/fundamentalrc
-   echo 'BRAND_BASE_DIR=file://$$APP_DATA_DIR' >> 
$(IOSRES)/fundamentalrc
-   echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry ' \
-'res:$${BRAND_BASE_DIR}/registry' >> $(IOSRES)/fundamentalrc
-   echo 'UNO_TYPES=file://$$APP_DATA_DIR/udkapi.rdb ' \
-'file://$$APP_DATA_DIR/offapi.rdb' >> $(IOSRES)/fundamentalrc
-   echo 'UNO_SERVICES=file://$$APP_DATA_DIR/services.rdb ' \
-'file://$$APP_DATA_DIR/services/services.rdb' >> 
$(IOSRES)/fundamentalrc
-   echo 'OSL_SOCKET_PATH=$$APP_DATA_DIR/cache' >> $(IOSRES)/fundamentalrc
+   (echo '[Bootstrap]' \
+&& echo 'BRAND_BASE_DIR=$${ORIGIN}/..' \
+&& echo 'BRAND_INI_DIR=$${ORIGIN}' \
+&& echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)' \
+&& echo 'BRAND_SHARE_RESOURCE_SUBDIR=$(LIBO_SHARE_RESOURCE_FOLDER)' \
+&& echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry 
' \
+   'res:$${BRAND_BASE_DIR}/registry' \
+   && echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/' \
+   && echo 'UNO_TYPES=file://$$APP_DATA_DIR/udkapi.rdb ' \
+   'file://$$APP_DATA_DIR/offapi.rdb' \
+   && echo 'UNO_SERVICES=file://$$APP_DATA_DIR/services.rdb ' \
+   'file://$$APP_DATA_DIR/services/services.rdb' \
+   && echo 'OSL_SOCKET_PATH=$$APP_DATA_DIR/cache' \
+   ) > $(IOSRES)/fundamentalrc;
 
echo '[Bootstrap]' > $(IOSRES)/unorc
 
# bootstraprc must be in $BRAND_BASE_DIR/program
-   echo '[Bootstrap]' >  
$(IOSRES)/program/bootstraprc
-   echo 'InstallMode='   >> 
$(IOSRES)/program/bootstraprc
-   echo "ProductKey=LibreOffice $(PRODUCTVERSION)">> 
$(IOSRES)/program/bootstraprc
-   echo 'UserInstallation=$$SYSUSERHOME/userinstallation' >> 
$(IOSRES)/program/bootstraprc
-
-   echo '[Version]'>  $(IOSRES)/program/versionrc
-   echo 'AllLanguages=en-US'   >> $(IOSRES)/program/versionrc
-   echo 'BuildVersion='>> $(IOSRES)/program/versionrc
-   echo "buildid=$(BUILDID)"   >> $(IOSRES)/program/versionrc
+   (echo '[Bootstrap]' \
+   && echo 'InstallMode=' \
+   && echo "ProductKey=LibreOffice $(PRODUCTVERSION)" \
+   && echo 'UserInstallation=$$SYSUSERHOME/userinstallation' \
+   ) > $(IOSRES)/program/bootstraprc
+
+   (echo '[Version]' \
+   && echo 'AllLanguages=en-US' \
+   && echo 'BuildVersion=' \
+   && echo "buildid=$(BUILDID)" \
+   ) > $(IOSRES)/program/versionrc
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits