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

[Libreoffice Gerrit user]

 ios/CustomTarget_iOS_setup.mk |   23 ++++++++++++-----------
 sw/Module_sw.mk               |    2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit 0f68e45e2ec6b9fa8c562044e88355d95af0347d
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Nov 9 12:49:11 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Nov 9 12:52:02 2018 +0200

    Do put a BRAND_SHARE_RESOURCE_SUBDIR setting into fundamentalrc for iOS
    
    Not sure wht it was commented out. For now use
    $(LIBO_SHARE_RESOURCE_FOLDER) which is the same "program/resource" as
    on Unix.
    
    Change-Id: I81b8dd4868e68c3a8c38f9b4f84de7bfc8383d28

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 390236a29c5d..85fbbad4c727 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -56,6 +56,7 @@ $(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)/program/resource $(IOSRES)/program
 	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
@@ -75,7 +76,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
         && echo 'BRAND_BASE_DIR=file://$$APP_DATA_DIR' \
         && 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 'BRAND_SHARE_RESOURCE_SUBDIR=$(LIBO_SHARE_RESOURCE_FOLDER)' \
         && echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/registry ' \
 	        'res:$${BRAND_BASE_DIR}/registry' \
 	&& echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/' \
commit b0bcd15b399976343c2c6edabe9c125919a8f662
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Nov 9 11:41:54 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Nov 9 12:52:02 2018 +0200

    Alignment (whitespace) cleanup
    
    Change-Id: Ie46906d5aa84d91efcb88ca795797883e883939f

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 07c6c6f2fd42..390236a29c5d 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -12,16 +12,16 @@
 IOSGEN  = $(BUILDDIR)/workdir/CustomTarget/ios
 IOSRES  = $(IOSGEN)/resources
 IOSDIRS = $(IOSGEN) \
-	       $(IOSGEN)/Debug_x86_64 \
-	       $(IOSGEN)/Debug_arm64 \
-	       $(IOSGEN)/Release_x86_64 \
-	       $(IOSGEN)/Release_arm64 \
-	  $(IOSRES) \
-	       $(IOSRES)/services \
-               $(IOSRES)/program \
-	       $(IOSRES)/share \
-	       $(IOSRES)/config \
-               $(IOSRES)/filter
+          $(IOSGEN)/Debug_x86_64 \
+		  $(IOSGEN)/Debug_arm64 \
+		  $(IOSGEN)/Release_x86_64 \
+		  $(IOSGEN)/Release_arm64 \
+		  $(IOSRES) \
+		  $(IOSRES)/services \
+		  $(IOSRES)/program \
+		  $(IOSRES)/share \
+		  $(IOSRES)/config \
+		  $(IOSRES)/filter
 
 
 #- Top level  -----------------------------------------------------------------
commit 6833c9e594abd74d994283f86b641b8f80ee1478
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Nov 9 11:29:07 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Nov 9 12:52:02 2018 +0200

    Do produce messagte catalogs for sw, too, for iOS, when necessary
    
    Change-Id: I9d22b44e6a835819ad32d1402a0d84ed2e465a73

diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index b89b839c7aa0..773fd60a0487 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 \
 ))