[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - ios/CustomTarget_iOS_setup.mk sw/Module_sw.mk

[Libreoffice Gerrit user]

 ios/CustomTarget_iOS_setup.mk |    2 ++
 sw/Module_sw.mk               |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 28d5caff2fd84be68e4eb538972d36db846f9aa0
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Nov 14 19:44:06 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Nov 14 19:46:36 2018 +0200

    Do include the message catalogs, if any, in program/resource for iOS
    
    Change-Id: I75f3e3d9873e2612852a3a43476f6f453732e457

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 6d2591a1ac4f..4de69c94e6ab 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -38,6 +38,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i
 	cp $(INSTDIR)/program/types/oovbaapi.rdb    $(IOSRES)
 	cp $(INSTDIR)/program/services/services.rdb $(IOSRES)/services
 	cp $(INSTDIR)/program/services.rdb          $(IOSRES)
+	cp -R $(INSTDIR)/program/resource $(IOSRES)/program
 	mkdir -p $(IOSRES)/share/config
 	cp -R $(INSTDIR)/share/config/soffice.cfg $(IOSRES)/share/config
 	cp $(WORKDIR)/CustomTarget/i18npool/breakiterator/dict_*.data $(IOSRES)/share
@@ -59,6 +60,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i
 	echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/'            >> $(IOSRES)/fundamentalrc
 	echo 'BRAND_BASE_DIR=file://$$APP_DATA_DIR'             >> $(IOSRES)/fundamentalrc
 	echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)'          >> $(IOSRES)/fundamentalrc
+	echo 'BRAND_SHARE_RESOURCE_SUBDIR=$(LIBO_SHARE_RESOURCE_FOLDER)' >> $(IOSRES)/fundamentalrc
 	echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/registry ' \
 	     'res:$${BRAND_BASE_DIR}/registry' >> $(IOSRES)/fundamentalrc
 	echo 'UNO_TYPES=file://$$APP_DATA_DIR/udkapi.rdb ' \
commit ea7a83cd7ee1eba85e07f54cb1c37748a15b96f3
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Nov 14 19:43:47 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Nov 14 19:46:36 2018 +0200

    Do produce message catalogs for sw, too, for iOS
    
    Change-Id: Ibeed019f411315904de96b2d6da616b7588c0323

diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 985d79874162..b1f736c0ac3a 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Module_add_targets,sw,\
 	UIConfig_swxform \
 ))
 
-ifneq ($(OS),IOS)
 $(eval $(call gb_Module_add_l10n_targets,sw,\
     AllLangMoTarget_sw \
 ))
@@ -48,6 +47,7 @@ $(eval $(call gb_Module_add_targets,sw,\
 
 endif
 
+ifneq ($(OS),IOS)
 $(eval $(call gb_Module_add_check_targets,sw,\
     CppunitTest_sw_uibase_unit \
 ))