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

[jan Iversen]

 ios/CustomTarget_iOS_prelink.mk |    7 ++++++-
 ios/CustomTarget_iOS_setup.mk   |    4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit dacb12d219fd060504553bf29e8536bdb747c930
Author: jan Iversen <jani at libreoffice.org>
Date:   Fri Jan 12 18:26:21 2018 +0100

    iOS, split .a and .dylib generation
    
    Added new dependency/action
    
    Change-Id: I378bc517e74e1569f81c9c7154be154021f1df3c

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index d7834cac50b3..0534264d416c 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -42,7 +42,9 @@ IOSPREBUILD: FORCE
 
 
 
-$(IOSKIT).dylib: IOSPREBUILD $(WORKDIR)/ios $(call gb_StaticLibrary_get_target,iOS_kitBridge) $(IOSLIBS)
+$(IOSKIT).a: IOSPREBUILD $(WORKDIR)/ios $(call gb_StaticLibrary_get_target,iOS_kitBridge) \
+	    $(IOSLIBS)
+	$(call gb_Output_announce,iOS prelink object,$(true),LNK,2)
 	$(IOSLD) -r -ios_version_min $(IOS_DEPLOYMENT_VERSION) \
 	    -syslibroot $(MACOSX_SDK_PATH) \
 	    -arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
@@ -51,6 +53,9 @@ $(IOSKIT).dylib: IOSPREBUILD $(WORKDIR)/ios $(call gb_StaticLibrary_get_target,i
 	    $(IOSLIBS)
 	$(AR) -r $(IOSKIT).a $(IOSOBJ)
 
+
+$(IOSKIT).dylib: $(IOSKIT).a
+	$(call gb_Output_announce,iOS dylib,$(true),LNK,2)
 	$(IOSCLANG) -dynamiclib -mios-simulator-version-min=$(IOS_DEPLOYMENT_VERSION) \
 	    -arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
 	    -isysroot $(MACOSX_SDK_PATH) \
commit b61791533edca81551fcc7948ea7202d9ba6e5c4
Author: jan Iversen <jani at libreoffice.org>
Date:   Sat Jan 13 05:40:29 2018 +0100

    iOS, Correct BRAND_* in rc
    
    Wrong BRAND_BASE_DIR and BRAND_INI_DIR reference.
    
    Change-Id: I85295a9de3807a60d0afb05c160be9acae2e4aec

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index e159e2433fd2..20b58c7623e5 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -68,8 +68,8 @@ $(IOSGEN)/native-code.h: $(WORKDIR)/ios $(BUILDDIR)/config_host.mk \
 
 	# Set up fundamentalrc, unorc, bootstraprc and versionrc.
 	(echo '[Bootstrap]' \
-        && echo 'BRAND_BASE_DIR=$$APP_DATA_DIR/..' \
-        && echo 'BRAND_INI_DIR=$$APP_DATA_DIR' \
+        && 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 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry ' \