[Libreoffice-commits] core.git: 2 commits - cppuhelper/source ios/CustomTarget_iOS_setup.mk ios/loApp.xcconfig.in

[jan Iversen]

 cppuhelper/source/servicemanager.cxx |    2 ++
 ios/CustomTarget_iOS_setup.mk        |   17 +----------------
 ios/loApp.xcconfig.in                |   27 ---------------------------
 3 files changed, 3 insertions(+), 43 deletions(-)

New commits:
commit 6eeac3539ea4cac32d126c5e24141f262eb5a4d9
Author: jan Iversen <jani at libreoffice.org>
Date:   Sat Nov 25 17:02:01 2017 +0100

    iOS, simplifyModule in cppuhelper is unused
    
    function simplifyModule is reported unused == error on iOS,
    therefore guarded with an #ifndef IOS
    
    Change-Id: I751cf68bd46ed17032251fede030f9082ce4e4f5

diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index 163e0e631d37..09e555a4ff43 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -1809,6 +1809,7 @@ cppuhelper::ServiceManager::findServiceImplementation(
 }
 
 /// Make a simpler unique name for preload / progress reporting.
+#ifndef IOS
 static rtl::OUString simplifyModule(const rtl::OUString &uri)
 {
     sal_Int32 nIdx;
@@ -1833,6 +1834,7 @@ static rtl::OUString simplifyModule(const rtl::OUString &uri)
         edit.remove(0,3);
     return edit.makeStringAndClear();
 }
+#endif
 
 /// Used only by LibreOfficeKit when used by Online to pre-initialize
 void cppuhelper::ServiceManager::preloadImplementations() {
commit 64c38401971eba6b7c2eb6dc1af978c8a6110ef8
Author: jan Iversen <jani at libreoffice.org>
Date:   Sat Nov 25 13:10:41 2017 +0100

    iOS, remove app xcconfig
    
    This is now handled directly in the project
    
    Change-Id: I1a57521ff8fe733d56154d186c98f68556128ebd

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index f32e85be3b9f..b6796d5d4721 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -8,7 +8,6 @@
 #- Env ------------------------------------------------------------------------
 IOSGEN := $(SRCDIR)/ios/generated
 IOSRES := $(IOSGEN)/resources
-IOSAPPXC := $(WORKDIR)/ios/loApp.xcconfig
 
 
 #- Top level  -----------------------------------------------------------------
@@ -16,25 +15,11 @@ $(eval $(call gb_CustomTarget_CustomTarget,ios/iOS_setup))
 
 
 
-$(call gb_CustomTarget_get_target,ios/iOS_setup): $(IOSAPPXC) $(IOSGEN)/native-code.h
+$(call gb_CustomTarget_get_target,ios/iOS_setup): $(IOSGEN)/native-code.h
 
 
 
 #- Generate dynamic files  ---------------------------------------------------
-$(IOSAPPXC): $(SRCDIR)/ios/loApp.xcconfig.in $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS_setup.mk
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
-	@mkdir -p $(WORKDIR)/ios
-	sed -e "s'@BUILDDIR@'$(BUILDDIR)'g" \
-	    -e "s'@INSTDIR@'$(INSTDIR)'g" \
-	    -e "s'@SRCDIR@'$(SRC_ROOT)'g" \
-	    -e "s'@WORKDIR@'$(WORKDIR)'g" \
-	    -e "s'@CFLAGS@'$(gb_GLOBALDEFS)'g" \
-	    -e "s'@CPLUSPLUSFLAGS@'$(gb_GLOBALDEFS)'g" \
-	    -e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \
-	    $(SRCDIR)/ios/loApp.xcconfig.in > $(IOSAPPXC)
-
-
-
 $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS_setup.mk
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
 	mkdir -p $(IOSGEN) $(IOSRES) $(IOSRES)/services \
diff --git a/ios/loApp.xcconfig.in b/ios/loApp.xcconfig.in
deleted file mode 100644
index 0c0fc98dac79..000000000000
--- a/ios/loApp.xcconfig.in
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// This file is part of the LibreOffice project.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-//
-// Xcode configuration properties
-LO_BUILDDIR = @BUILDDIR@
-LO_INSTDIR = @INSTDIR@
-LO_SRCDIR = @SRCDIR@
-LO_WORKDIR = @WORKDIR@
-OTHER_CFLAGS = @CFLAGS@
-OTHER_CPLUSPLUSFLAGS = @CPLUSPLUSFLAGS@
-SYMROOT = @SYMROOT@
-
-//:configuration = Debug
-LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64_debug.a -g
-
-//:configuration = Release
-LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64.a
-
-//:configuration = Simulator
-LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_X86_64_debug.a -g
-
-//:completeSettings = some
-