[Libreoffice-commits] core.git: 2 commits - ios/LibreOfficeLight
jan Iversen
jani at libreoffice.org
Sun Oct 8 11:54:58 UTC 2017
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 16
ios/LibreOfficeLight/LibreOfficeLight/lokit.mm | 348 ----------
2 files changed, 9 insertions(+), 355 deletions(-)
New commits:
commit 7396222599ceda7ef3b62af45d545058bcc2047b
Author: jan Iversen <jani at libreoffice.org>
Date: Sun Oct 8 13:52:44 2017 +0200
iOS, disable swift 3 syntax.
Code must be pure swift 4.
Change-Id: I430928d1a03f17fdcb7ca68701d308241eecc5e1
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index a77495613da3..491c5c62c05b 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -357,6 +357,7 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "arm64 x86_64";
@@ -433,6 +434,7 @@
);
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+ SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
@@ -472,7 +474,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "LibreOfficeLight/lokit-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
- SWIFT_SWIFT3_OBJC_INFERENCE = On;
+ SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 2;
VALID_ARCHS = "arm64 x86_64";
@@ -500,7 +502,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.jani.Editors.LibreOfficeLight;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "LibreOfficeLight/lokit-Bridging-Header.h";
- SWIFT_SWIFT3_OBJC_INFERENCE = On;
+ SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 2;
VALID_ARCHS = "arm64 x86_64";
@@ -584,6 +586,7 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "arm64 x86_64";
@@ -622,7 +625,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "LibreOfficeLight/lokit-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
- SWIFT_SWIFT3_OBJC_INFERENCE = On;
+ SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 2;
VALID_ARCHS = "arm64 x86_64";
commit 9da2023fc2f0213938852459ea4179a2ba11b247
Author: jan Iversen <jani at libreoffice.org>
Date: Sun Oct 8 13:31:33 2017 +0200
iOS, update app to build with single lib.
Added the prebuild lib(s) to the project and
removed the local implementation
Change-Id: I2538fa0eed016585d35a3b6e1bafc8d7a726d202
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 90196126a17b..a77495613da3 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
- 39022C181EDC142F00100066 /* lokit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 39022C171EDC142F00100066 /* lokit.mm */; };
39022C1B1EDC2A0E00100066 /* program in Resources */ = {isa = PBXBuildFile; fileRef = 39022C1A1EDC2A0E00100066 /* program */; };
39022C1D1EDC2A2C00100066 /* services in Resources */ = {isa = PBXBuildFile; fileRef = 39022C1C1EDC2A2C00100066 /* services */; };
39022C1F1EDC2AB000100066 /* share in Resources */ = {isa = PBXBuildFile; fileRef = 39022C1E1EDC2AB000100066 /* share */; };
@@ -32,7 +31,6 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
- 39022C171EDC142F00100066 /* lokit.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = lokit.mm; sourceTree = "<group>"; };
39022C191EDC14D300100066 /* lokit-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "lokit-Bridging-Header.h"; sourceTree = "<group>"; };
39022C1A1EDC2A0E00100066 /* program */ = {isa = PBXFileReference; lastKnownFileType = folder; name = program; path = ../generated/resources/program; sourceTree = "<group>"; };
39022C1C1EDC2A2C00100066 /* services */ = {isa = PBXFileReference; lastKnownFileType = folder; name = services; path = ../generated/resources/services; sourceTree = "<group>"; };
@@ -116,7 +114,6 @@
isa = PBXGroup;
children = (
39022C191EDC14D300100066 /* lokit-Bridging-Header.h */,
- 39022C171EDC142F00100066 /* lokit.mm */,
397E08FD1E597BD8001374E0 /* AppDelegate.swift */,
3992D85B1E5B764A00BEA987 /* SideMenu.swift */,
3992D8591E5B762A00BEA987 /* DocumentController.swift */,
@@ -247,7 +244,6 @@
3992D85D1E5B764A00BEA987 /* SideMenu.swift in Sources */,
399648471E5B87DC00E73E83 /* ViewProperties.swift in Sources */,
3992D85A1E5B762A00BEA987 /* DocumentController.swift in Sources */,
- 39022C181EDC142F00100066 /* lokit.mm in Sources */,
397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -361,6 +357,7 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "arm64 x86_64";
};
@@ -436,6 +433,7 @@
);
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+ SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "arm64 x86_64";
@@ -586,6 +584,7 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "arm64 x86_64";
};
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/lokit.mm b/ios/LibreOfficeLight/LibreOfficeLight/lokit.mm
deleted file mode 100755
index e538b5fbce57..000000000000
--- a/ios/LibreOfficeLight/LibreOfficeLight/lokit.mm
+++ /dev/null
@@ -1,348 +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/.
-//
-#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;
-}
-
-
-#if 0
-// createpath from tiled
-static NSString *createPaths(NSString *base, NSString *appRootEscaped, NSArray *fileNames)
-{
- NSString *result;
- NSString *prefix = @"file://";
- BOOL first = YES;
-
- result = base;
- for (NSString *fileName in fileNames) {
- result = [result stringByAppendingString: prefix];
- result = [result stringByAppendingString: [appRootEscaped stringByAppendingPathComponent: fileName]];
-
- if (first) {
- prefix = [@" " stringByAppendingString:prefix];
- first = NO;
- }
- }
-
- return result;
-}
-
-
-// Force reference to libreofficekit_hook
-extern "C" void *libreofficekit_hook(const char *);
-static __attribute__((used)) void *(*foop)(const char *) = libreofficekit_hook;
-
-extern "C" void lo_initialize(NSString *documentPath)
-{
- NSString *bundlePath = [[NSBundle mainBundle] bundlePath];
- NSString *app_root_escaped = [bundlePath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
- NSString *uno_types = createPaths(@"-env:UNO_TYPES=", app_root_escaped, @[@"offapi.rdb", @"oovbaapi.rdb", @"types.rdb"]);
- NSString *uno_services = createPaths(@"-env:UNO_SERVICES=", app_root_escaped, @[@"ure/services.rdb", @"services.rdb"]);
-
- int fd = open([[bundlePath stringByAppendingPathComponent:@U_ICUDATA_NAME".dat"] UTF8String], O_RDONLY);
- if (fd != -1) {
- struct stat st;
- if (fstat(fd, &st) != -1
- && st.st_size < (size_t)-1) {
- void *icudata = mmap(0, (size_t) st.st_size, PROT_READ, MAP_FILE|MAP_PRIVATE, fd, 0);
- if (icudata == MAP_FAILED) {
-#if OSL_DEBUG_LEVEL > 0
- NSLog(@"mmap failed:%s", strerror(errno));
-#endif
- } else {
- UErrorCode icuStatus = U_ZERO_ERROR;
- udata_setCommonData(icudata, &icuStatus);
-#if OSL_DEBUG_LEVEL > 0
- if (U_FAILURE(icuStatus))
- NSLog(@"udata_setCommonData failed");
- else {
- // Test that ICU works...
- UConverter *cnv = ucnv_open("iso-8859-3", &icuStatus);
- NSLog(@"ucnv_open(iso-8859-3)-> %p, err = %s, name=%s",
- (void *)cnv, u_errorName(icuStatus), (!cnv)?"?":ucnv_getName(cnv,&icuStatus));
- if (U_SUCCESS(icuStatus))
- ucnv_close(cnv);
- }
-#endif
- }
- }
- close(fd);
- }
-
- const char *argv[] = {
- [[[NSBundle mainBundle] executablePath] UTF8String],
- "-env:URE_INTERNAL_LIB_DIR=file:///",
- [uno_types UTF8String],
- [uno_services UTF8String],
- [[@"file://" stringByAppendingString: [documentPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]] UTF8String]
- };
-
- const int argc = sizeof(argv)/sizeof(*argv);
-
- osl_setCommandArgs(argc, (char **) argv);
-}
-
-#endif
-
-
-#if 0
-// LOK_main (online)
-#endif
-
-
-// CLIENT COMMAND INTERFACE
-static bool client_canceltiles(const char *args[])
-{
- return true;
-}
-
-static bool client_clientvisiblearea(const char *args[])
-{
- return true;
-}
-
-static bool client_closedocument(const char *args[])
-{
- return true;
-}
-
-static bool client_commandvalues(const char *args[])
-{
- return true;
-}
-
-static bool client_downloadas(const char *args[])
-{
- return true;
-}
-
-static bool client_getchildid(const char *args[])
-{
- return true;
-}
-
-static bool client_gettextselection(const char *args[])
-{
- return true;
-}
-
-static bool client_insertfile(const char *args[])
-{
- return true;
-}
-
-static bool client_key(const char *args[])
-{
- return true;
-}
-
-static bool client_load(const char *args[])
-{
- return true;
-}
-
-static bool client_loolclient(const char *args[])
-{
- return true;
-}
-
-static bool client_mouse(const char *args[])
-{
- return true;
-}
-
-static bool client_paste(const char *args[])
-{
- return true;
-}
-
-static bool client_ping(const char *args[])
-{
- return true;
-}
-
-static bool client_renderfont(const char *args[])
-{
- return true;
-}
-
-static bool client_requestloksession(const char *args[])
-{
- return true;
-}
-
-static bool client_resetselection(const char *args[])
-{
- return true;
-}
-
-static bool client_saveas(const char *args[])
-{
- return true;
-}
-
-static bool client_selectgraphic(const char *args[])
-{
- return true;
-}
-
-static bool client_selecttext(const char *args[])
-{
- return true;
-}
-
-static bool client_setclientpart(const char *args[])
-{
- return true;
-}
-
-static bool client_status(const char *args[])
-{
- return true;
-}
-
-static bool client_styles(const char *args[])
-{
- return true;
-}
-
-static bool client_tile(const char *args[])
-{
- return true;
-}
-
-static bool client_tilecombine(const char *args[])
-{
- return true;
-}
-
-static bool client_uno(const char *args[])
-{
- return true;
-}
-
-static bool client_useractive(const char *args[])
-{
- return true;
-}
-
-static bool client_userinactive(const char *args[])
-{
- return true;
-}
-
-
-
-typedef struct {const char *command; bool useArgs; bool (*funcCmd)(const char *[]);} CLIENTCOMMAND;
-static CLIENTCOMMAND clientcommands[] = {{"canceltiles", false, client_canceltiles},
- {"clientvisiblearea", true, client_clientvisiblearea},
- {"closedocument", false, client_closedocument},
- {"commandvalues", false, client_commandvalues},
- {"downloadas", true, client_downloadas},
- {"getchildid", false, client_getchildid},
- {"gettextselection", false, client_gettextselection},
- {"insertfile", true, client_insertfile},
- {"key", true, client_key},
- {"load", true, client_load},
- {"loolclient", true, client_loolclient},
- {"mouse", true, client_mouse},
- {"paste", true, client_paste},
- {"ping", false, client_ping},
- {"renderfont", true, client_renderfont},
- {"requestloksession", false, client_requestloksession},
- {"resetselection", false, client_resetselection},
- {"saveas", true, client_saveas},
- {"selectgraphic", true, client_selectgraphic},
- {"selecttext", true, client_selecttext},
- {"setclientpart", true, client_setclientpart},
- {"status", false, client_status},
- {"styles", false, client_styles},
- {"tile", true, client_tile},
- {"tilecombine", true, client_tilecombine},
- {"uno", false, client_uno},
- {"useractive", false, client_useractive},
- {"userinactive", false, client_userinactive},
- {NULL, false, NULL}
- };
-
-
-
-
-int BridgeLOkit_ClientCommand(const char *input)
-{
- static char argStore[2048];
- const char *args[10];
- char *cmd, *arg;
- const char *sep = " ";
- int j = 0;
-
- // Split input into cmd + args
- strcpy(argStore, input);
- arg = cmd = strtok(argStore, sep);
-
- // Locate correct command
- CLIENTCOMMAND *client_cmd = clientcommands;
- for (; client_cmd->command; ++client_cmd)
- if (!strcmp(client_cmd->command,cmd)) {
- args[j++] = input;
- args[j] = NULL;
- if (client_cmd->useArgs)
- while (arg && j < 10)
- {
- arg = strtok(NULL, sep);
- args[j++] = arg;
- }
- return (int)client_cmd->funcCmd(args);
- }
-
-
- // Call/Return from command
- return -999;
-}
-
-
More information about the Libreoffice-commits
mailing list