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

[jan Iversen]

 ios/CustomTarget_iOS_link.mk                                    |    8 ++--
 ios/CustomTarget_iOS_setup.mk                                   |   17 +---------
 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |    4 +-
 3 files changed, 10 insertions(+), 19 deletions(-)

New commits:
commit 1bd8cd252c749aea1e078699915928ac01b61da6
Author: jan Iversen <jani at libreoffice.org>
Date:   Sun Feb 4 17:56:40 2018 +0100

    iOS, simplified lib ref and copy to device
    
    Named libKit directories so they can be referenced simple within xCode
    
    Change-Id: Ic05fa4e87b6cc87e2823177474c3ed9ac3433dd3

diff --git a/ios/CustomTarget_iOS_link.mk b/ios/CustomTarget_iOS_link.mk
index ef6303a217d8..fc926a535d9d 100644
--- a/ios/CustomTarget_iOS_link.mk
+++ b/ios/CustomTarget_iOS_link.mk
@@ -18,13 +18,13 @@ IOSSRC = $(SRCDIR)/ios/source/LibreOfficeKit.c
 
 ifeq ($(ENABLE_DEBUG),TRUE)
 ifeq ($(CPUNAME),X86_64)
-IOSKIT = $(IOSGEN)/simulator/libKit.dylib
+IOSKIT = $(IOSGEN)/Debug_x86_64/libKit.dylib
 else
-IOSKIT = $(IOSGEN)/debug/libKit.dylib
+IOSKIT = $(IOSGEN)/Debug_arm64/libKit.dylib
 endif
 else
 ifeq ($(CPUNAME),ARM64)
-IOSKIT = $(IOSGEN)/release/libKit.dylib
+IOSKIT = $(IOSGEN)/Release_arm64/libKit.dylib
 endif
 endif
 
@@ -81,7 +81,7 @@ endif
 
 #- clean ios  -----------------------------------------------------------------
 $(call gb_CustomTarget_get_clean_target,ios/iOS_link):
-	rm -f $(IOSKIT).dylib
+	rm -f $(IOSKIT)
 
 
 
diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index b3e7843abba3..0ca73a345ffb 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -12,9 +12,9 @@
 IOSGEN  = $(SRCDIR)/ios/generated
 IOSRES  = $(IOSGEN)/resources
 IOSDIRS = $(IOSGEN) \
-	       $(IOSGEN)/simulator \
-	       $(IOSGEN)/debug \
-	       $(IOSGEN)/release \
+	       $(IOSGEN)/Debug_x86_64 \
+	       $(IOSGEN)/Debug_arm64 \
+	       $(IOSGEN)/Release_arm64 \
 	  $(IOSRES) \
 	       $(IOSRES)/services \
                $(IOSRES)/program \
@@ -108,16 +108,5 @@ $(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
-ifeq ($(ENABLE_DEBUG),TRUE)
-ifeq ($(CPUNAME),X86_64)
-	rm -f $(IOSGEN)/simulator/*
-else
-	rm -f $(IOSGEN)/debug/*
-endif
-else
-ifeq ($(CPUNAME),ARM64)
-	rm -f $(IOSGEN)/release/*
-endif
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 2d01b21c6832..c85096aa1a60 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -324,7 +324,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
-			shellScript = "echo hello\n\nGEN=$PROJECT_DIR/../generated\necho $arch\nif [ $arch = \"x86_64\" ]; then\nLIB=$GEN/simulator/libKit.dylib\nelse\nLIB=$GEN/release/libKit.dylib\nfi\necho $LIB\nln -sf $LIB $TARGET_BUILD_DIR/libKit.dylib\n\n\n\n\n";
+			shellScript = "\nGEN=$PROJECT_DIR/../generated/$CONFIGURATION\\_$arch/libKit.dylib\ncp $GEN $TARGET_BUILD_DIR/libKit.dylib\n\n\n\n\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -527,6 +527,7 @@
 				INFOPLIST_FILE = LibreOfficeLight/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = "";
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.jani.Editors.LibreOfficeLight;
@@ -560,6 +561,7 @@
 				INFOPLIST_FILE = LibreOfficeLight/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = "";
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.jani.Editors.LibreOfficeLight;