desktop/source/lib/init.cxx | 7 +++++ ios/CustomTarget_iOS.mk | 2 - ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj | 6 ++++ ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.c | 1 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 14 ++++++++++ 5 files changed, 28 insertions(+), 2 deletions(-)
New commits: commit d8a299e12937896f0346881cd7b9b7602010b2c4 Author: jan Iversen <j...@libreoffice.org> Date: Mon Oct 23 17:34:01 2017 +0200 iOS, updates to make structure Clean works better with this update. Change-Id: I8afe796048fd4f796a4c92b64121f754293ee973 diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk index 452b5d7dde9b..496070d5d9d2 100644 --- a/ios/CustomTarget_iOS.mk +++ b/ios/CustomTarget_iOS.mk @@ -158,7 +158,7 @@ $(call gb_CustomTarget_get_clean_target,ios/ios): , $(WORKDIR)/ios/build.log \ ) $(call gb_Helper_print_on_error, \ - xcodebuild -xcconfig $(IOSKITXC) -project $(IOSKITPRJ) clean \ + xcodebuild -xcconfig $(IOSKITXC) -configuration Debug -project $(IOSKITPRJ) clean \ , $(WORKDIR)/ios/build.log \ ) rm -f $(IOSGEN)/$(IOSKIT) diff --git a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj index 82fa34fb22ed..caa67a55b8bf 100644 --- a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj +++ b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj @@ -25,6 +25,7 @@ /* Begin PBXFileReference section */ 39503A6E1F94C3B700F19C78 /* LibreOfficeKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LibreOfficeKit.h; sourceTree = "<group>"; }; 39503A721F94CBA000F19C78 /* LibreOfficeKit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = LibreOfficeKit.c; sourceTree = "<group>"; }; + 3950BAE11F9CA739001A4E96 /* loKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = loKit.xcconfig; path = ../../../../../../Users/jani/lo_ios/workdir/ios/loKit.xcconfig; sourceTree = "<group>"; }; 39B5D2151F78130F008FB162 /* libLibreOfficeKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libLibreOfficeKit.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -42,6 +43,7 @@ 3969A8C91F782610006F06A9 /* Support files */ = { isa = PBXGroup; children = ( + 3950BAE11F9CA739001A4E96 /* loKit.xcconfig */, ); name = "Support files"; sourceTree = "<group>"; @@ -138,6 +140,7 @@ /* Begin XCBuildConfiguration section */ 39B5D21C1F78130F008FB162 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 3950BAE11F9CA739001A4E96 /* loKit.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -210,6 +213,7 @@ }; 39B5D21D1F78130F008FB162 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 3950BAE11F9CA739001A4E96 /* loKit.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -277,6 +281,7 @@ }; 39B5D21F1F78130F008FB162 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 3950BAE11F9CA739001A4E96 /* loKit.xcconfig */; buildSettings = { MACH_O_TYPE = staticlib; OTHER_LDFLAGS = ""; @@ -289,6 +294,7 @@ }; 39B5D2201F78130F008FB162 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 3950BAE11F9CA739001A4E96 /* loKit.xcconfig */; buildSettings = { MACH_O_TYPE = staticlib; OTHER_LDFLAGS = ""; diff --git a/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.c b/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.c index d8e41ebf740f..59a1c217b514 100644 --- a/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.c +++ b/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.c @@ -5,7 +5,6 @@ // 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/. // -#include "LibreOfficeKit.h" #include <stdio.h> #include <TargetConditionals.h> #define LOK_USE_UNSTABLE_API diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj index d1541cc35d0d..527961f92bee 100644 --- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj +++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj @@ -39,11 +39,14 @@ 39022C1E1EDC2AB000100066 /* share */ = {isa = PBXFileReference; lastKnownFileType = folder; name = share; path = ../generated/resources/share; sourceTree = "<group>"; }; 39022C201EDC2D0800100066 /* icudt59l.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = icudt59l.dat; path = ../generated/resources/icudt59l.dat; sourceTree = "<group>"; }; 39022C231EDC303200100066 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; }; + 3913F8FE1F9E36A600F7E0C8 /* xmlreader.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmlreader.cxx; path = ../../../xmlreader/source/xmlreader.cxx; sourceTree = "<group>"; }; 392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewPrintManager.swift; path = LibreOfficeLight/ViewPrintManager.swift; sourceTree = SOURCE_ROOT; }; 393975771F8BECB0002DC80B /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; }; 393975791F8BECC1002DC80B /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; 39503A6F1F94C4AC00F19C78 /* lokit-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "lokit-Bridging-Header.h"; sourceTree = "<group>"; }; 39503A741F94D44900F19C78 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; + 3950BAE31F9CB680001A4E96 /* syslocaleoptions.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = syslocaleoptions.cxx; path = ../../../unotools/source/config/syslocaleoptions.cxx; sourceTree = "<group>"; }; + 3950BAE51F9D0C32001A4E96 /* init.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = init.cxx; path = ../../../desktop/source/lib/init.cxx; sourceTree = "<group>"; }; 396F92F61E7AE62400A28C82 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; }; 397275391E77D9F1006ACDCC /* LibreOfficeLight.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = LibreOfficeLight.entitlements; sourceTree = "<group>"; }; 397868D71E59A3EA007F9248 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/LaunchScreen.xib; sourceTree = "<group>"; }; @@ -93,6 +96,16 @@ path = LibreOfficeLight; sourceTree = SOURCE_ROOT; }; + 3950BAE21F9CB63F001A4E96 /* extra */ = { + isa = PBXGroup; + children = ( + 3913F8FE1F9E36A600F7E0C8 /* xmlreader.cxx */, + 3950BAE51F9D0C32001A4E96 /* init.cxx */, + 3950BAE31F9CB680001A4E96 /* syslocaleoptions.cxx */, + ); + path = extra; + sourceTree = "<group>"; + }; 3972753A1E77D9F7006ACDCC /* Frameworks */ = { isa = PBXGroup; children = ( @@ -106,6 +119,7 @@ 397E08F11E597BD8001374E0 = { isa = PBXGroup; children = ( + 3950BAE21F9CB63F001A4E96 /* extra */, 39B084E41E5F0B5200682A59 /* Resources */, 3911D89F1E5993600050D6BC /* Support files */, 397E08FC1E597BD8001374E0 /* LibreOfficeLight */, commit b69f923a22f7404d1c1feb8d0d16a16a24bd548d Author: jan Iversen <j...@libreoffice.org> Date: Mon Oct 23 17:32:19 2017 +0200 iOS, updated desktop/source/lib/init.cxx InitVCL() needs to be called for iOS, even though it runs without desktop, since that function fills structures like mpDefInst Change-Id: Icebd4a4111881b46a8abc1e1988921a19e5e4527 diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 01b2e9347596..10a8ff1f51e6 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3421,6 +3421,13 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char Application::EnableHeadlessMode(true); +#ifdef IOS + // mpDefInst need to be initialized, which only happens in InitVCL(), + // there might be more elegant ways to get InitVCL() called, but + // this one works :-) + InitVCL(); +#endif + if (eStage == PRE_INIT) { InitVCL(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits