[Libreoffice-commits] core.git: 2 commits - avmedia/source ios/CustomTarget_iOS.mk ios/LibreOfficeLight ios/loApp.xcconfig.in
jan Iversen
jani at libreoffice.org
Tue Oct 10 13:54:08 UTC 2017
avmedia/source/avmediadummy.cxx | 6 +
ios/CustomTarget_iOS.mk | 1
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 30 +++--
ios/LibreOfficeLight/LibreOfficeLight/LibreOfficeKit.mm | 52 ++++++++++
ios/loApp.xcconfig.in | 7 -
5 files changed, 81 insertions(+), 15 deletions(-)
New commits:
commit da01a190a19bdb737b39c41f75f0bc3d3da36417
Author: jan Iversen <jani at libreoffice.org>
Date: Tue Oct 10 15:51:04 2017 +0200
iOS, update app to link
Linking app for test directly in xCode, later it will
be added to CustomTarget_iOS.mk
Change-Id: I166bbdb626625ea1c4a8a191004b85ba7eef8f11
diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk
index eee114c94a9d..7effabcaa769 100644
--- a/ios/CustomTarget_iOS.mk
+++ b/ios/CustomTarget_iOS.mk
@@ -46,6 +46,7 @@ $(IOSKITXC) $(IOSAPPXC): $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i
-e "s'@CFLAGS@'$(gb_GLOBALDEFS)'g" \
-e "s'@CPLUSPLUSFLAGS@'$(gb_GLOBALDEFS)'g" \
-e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \
+ -e "s'@LDLIBS@'`$(SRCDIR)/bin/lo-all-static-libs`'g" \
$(SRCDIR)/ios/loApp.xcconfig.in > $(WORKDIR)/ios/loApp.xcconfig
ifeq ("$(wildcard $(IOSRES))","")
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 491c5c62c05b..26cc02235d3f 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -13,6 +13,8 @@
39022C211EDC2D0800100066 /* icudt59l.dat in Resources */ = {isa = PBXBuildFile; fileRef = 39022C201EDC2D0800100066 /* icudt59l.dat */; };
39022C241EDC303200100066 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 39022C221EDC303200100066 /* InfoPlist.strings */; };
392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */; };
+ 393975781F8BECB0002DC80B /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 393975771F8BECB0002DC80B /* libiconv.tbd */; };
+ 3939757A1F8BECC1002DC80B /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 393975791F8BECC1002DC80B /* libz.tbd */; };
396F92F71E7AE62400A28C82 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 396F92F61E7AE62400A28C82 /* Settings.bundle */; };
397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */; };
397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 397E08FD1E597BD8001374E0 /* AppDelegate.swift */; };
@@ -21,6 +23,7 @@
3992D85A1E5B762A00BEA987 /* DocumentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3992D8591E5B762A00BEA987 /* DocumentController.swift */; };
3992D85D1E5B764A00BEA987 /* SideMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3992D85B1E5B764A00BEA987 /* SideMenu.swift */; };
399648471E5B87DC00E73E83 /* ViewProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 399648461E5B87DC00E73E83 /* ViewProperties.swift */; };
+ 39A356E01F8D077500C780F2 /* LibreOfficeKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 39A356DF1F8D077500C780F2 /* LibreOfficeKit.mm */; };
39B08B9D1E5F0BB600682A59 /* fundamentalrc in Resources */ = {isa = PBXBuildFile; fileRef = 39B084E51E5F0BB400682A59 /* fundamentalrc */; };
39B08B9E1E5F0BB600682A59 /* offapi.rdb in Resources */ = {isa = PBXBuildFile; fileRef = 39B084E61E5F0BB400682A59 /* offapi.rdb */; };
39B08B9F1E5F0BB600682A59 /* oovbaapi.rdb in Resources */ = {isa = PBXBuildFile; fileRef = 39B084E71E5F0BB400682A59 /* oovbaapi.rdb */; };
@@ -38,6 +41,8 @@
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>"; };
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; };
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>"; };
@@ -48,6 +53,7 @@
3992D8591E5B762A00BEA987 /* DocumentController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DocumentController.swift; path = LibreOfficeLight/DocumentController.swift; sourceTree = SOURCE_ROOT; };
3992D85B1E5B764A00BEA987 /* SideMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SideMenu.swift; path = LibreOfficeLight/SideMenu.swift; sourceTree = SOURCE_ROOT; };
399648461E5B87DC00E73E83 /* ViewProperties.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewProperties.swift; path = LibreOfficeLight/ViewProperties.swift; sourceTree = SOURCE_ROOT; };
+ 39A356DF1F8D077500C780F2 /* LibreOfficeKit.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LibreOfficeKit.mm; sourceTree = "<group>"; };
39ACF4181F8A317600DA7334 /* loApp.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = loApp.xcconfig; path = ../../../../../../../Users/jani/lo_ios/workdir/ios/loApp.xcconfig; sourceTree = "<group>"; };
39B084E51E5F0BB400682A59 /* fundamentalrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fundamentalrc; path = ../generated/resources/fundamentalrc; sourceTree = SOURCE_ROOT; };
39B084E61E5F0BB400682A59 /* offapi.rdb */ = {isa = PBXFileReference; lastKnownFileType = file; name = offapi.rdb; path = ../generated/resources/offapi.rdb; sourceTree = SOURCE_ROOT; };
@@ -64,6 +70,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 3939757A1F8BECC1002DC80B /* libz.tbd in Frameworks */,
+ 393975781F8BECB0002DC80B /* libiconv.tbd in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -87,6 +95,8 @@
3972753A1E77D9F7006ACDCC /* Frameworks */ = {
isa = PBXGroup;
children = (
+ 393975791F8BECC1002DC80B /* libz.tbd */,
+ 393975771F8BECB0002DC80B /* libiconv.tbd */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -113,6 +123,7 @@
397E08FC1E597BD8001374E0 /* LibreOfficeLight */ = {
isa = PBXGroup;
children = (
+ 39A356DF1F8D077500C780F2 /* LibreOfficeKit.mm */,
39022C191EDC14D300100066 /* lokit-Bridging-Header.h */,
397E08FD1E597BD8001374E0 /* AppDelegate.swift */,
3992D85B1E5B764A00BEA987 /* SideMenu.swift */,
@@ -245,6 +256,7 @@
399648471E5B87DC00E73E83 /* ViewProperties.swift in Sources */,
3992D85A1E5B762A00BEA987 /* DocumentController.swift in Sources */,
397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */,
+ 39A356E01F8D077500C780F2 /* LibreOfficeKit.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -348,12 +360,10 @@
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+ MACH_O_TYPE = mh_execute;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
- OTHER_LDFLAGS = (
- "$(LINK_LDFLAGS)",
- "-lstdc++",
- );
+ OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -426,12 +436,10 @@
"$(LO_SRCDIR)/ios/generated",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+ MACH_O_TYPE = mh_execute;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
- OTHER_LDFLAGS = (
- "$(LINK_LDFLAGS)",
- "-lstdc++",
- );
+ OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
@@ -577,12 +585,10 @@
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+ MACH_O_TYPE = mh_execute;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
- OTHER_LDFLAGS = (
- "$(LINK_LDFLAGS)",
- "-lstdc++",
- );
+ OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/LibreOfficeKit.mm b/ios/LibreOfficeLight/LibreOfficeLight/LibreOfficeKit.mm
new file mode 100644
index 000000000000..677386ce196b
--- /dev/null
+++ b/ios/LibreOfficeLight/LibreOfficeLight/LibreOfficeKit.mm
@@ -0,0 +1,52 @@
+//
+// 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/.
+//
+#include <stdio.h>
+#include <TargetConditionals.h>
+#define LOK_USE_UNSTABLE_API
+#include <LibreOfficeKit/LibreOfficeKitInit.h>
+
+#include <osl/process.h>
+
+#include <unicode/udata.h>
+#include <unicode/ucnv.h>
+
+// generated by solenv/bin/native-code.py:
+#include "native-code.mm"
+
+
+// Force reference to libreofficekit_hook
+extern "C" __attribute__((used)) void *libreofficekit_hook(const char *);
+static __attribute__((used)) void *(*foop)(const char *) = libreofficekit_hook;
+
+// pointers to our instance
+static LibreOfficeKit* kit;
+static LibreOfficeKitDocument* document;
+
+
+
+
+// Bridge functions to LibreOfficeKit
+extern "C" int BridgeLOkit_Init(const char *path)
+{
+ char bufUserPath[200];
+ strcpy(bufUserPath, path);
+ strcpy(bufUserPath + strlen(path), "/user");
+
+ // Initialize LibreOfficeKit
+ if (!kit)
+ kit = lok_init_2(path, bufUserPath);
+ return 0;
+}
+
+int LOkit_open(char *file)
+{
+ document = kit->pClass->documentLoad(kit, file);
+ document->pClass->initializeForRendering(document, "");
+ return 0;
+}
+
diff --git a/ios/loApp.xcconfig.in b/ios/loApp.xcconfig.in
index fb3426dd4df8..56cb23a9337f 100644
--- a/ios/loApp.xcconfig.in
+++ b/ios/loApp.xcconfig.in
@@ -13,15 +13,16 @@ LO_WORKDIR = @WORKDIR@
OTHER_CFLAGS = @CFLAGS@
OTHER_CPLUSPLUSFLAGS = @CPLUSPLUSFLAGS@
SYMROOT = @SYMROOT@
+LINK_LDFLAGS= @LDLIBS@
//:configuration = Debug
-LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64_debug.a
+//LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64_debug.a
//:configuration = Release
-LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64.a
+//LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64.a
//:configuration = Simulator
-LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_X86_64_debug.a
+//LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_X86_64_debug.a
//:completeSettings = some
commit 539feabcfb5466a30282c0aac4de657974979cd6
Author: jan Iversen <jani at libreoffice.org>
Date: Tue Oct 10 15:08:28 2017 +0200
iOS, dummy SoundHandler_get_implementation
Since it is not easy to remove the avmedia component, adding
a dummy SoundHandler_get_implementation solves the link errors
With this commit LibreOfficeLight links, but without the prelinked lib
Change-Id: Ib18773d784346573f3c1fb21dc4446d92bd27748
diff --git a/avmedia/source/avmediadummy.cxx b/avmedia/source/avmediadummy.cxx
index 36793857f248..08f66147deec 100644
--- a/avmedia/source/avmediadummy.cxx
+++ b/avmedia/source/avmediadummy.cxx
@@ -93,4 +93,10 @@ bool MediaItem::operator==( const SfxPoolItem& ) const
} // namespace avmedia
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_framework_SoundHandler_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
+{
+ return NULL;
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list