ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 2
ios/README | 39
+++-------
2 files changed, 16 insertions(+), 25 deletions(-)
New commits:
commit 3c8ebbdca744d87fcc42f97b76e04cef5a7b5c1f
Author: jan Iversen <j...@libreoffice.org>
Date: Sat Jan 13 14:26:21 2018 +0100
iOS, debugged callback
Callback now calls the swift function.
It is time to see if we can do without the thread queue.
Change-Id: If9a76c884ca7e5018243ae3f4bee20b61dbba40d
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 650895263ca6..a0b303ce58a4 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -58,6 +58,7 @@
397275391E77D9F1006ACDCC /* LibreOfficeLight.entitlements */ =
{isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path =
LibreOfficeLight.entitlements; sourceTree = "<group>"; };
3975A8C91FBD70EE00A87B3A /* LibreOfficeKit.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; name = LibreOfficeKit.h;
path = ../../include/LibreOfficeKit/LibreOfficeKit.h; sourceTree = "<group>"; };
397868D71E59A3EA007F9248 /* en */ = {isa = PBXFileReference;
lastKnownFileType = file.xib; name = en; path = en.lproj/LaunchScreen.xib;
sourceTree = "<group>"; };
+ 397A9624200937990073F066 /* init.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = init.cxx; path = ../../desktop/source/lib/init.cxx; sourceTree =
"<group>"; };
397E08FA1E597BD8001374E0 /* LibreOfficeLight.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = LibreOfficeLight.app; sourceTree = BUILT_PRODUCTS_DIR; };
397E08FD1E597BD8001374E0 /* AppDelegate.swift */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.swift; name =
AppDelegate.swift; path = LibreOfficeLight/AppDelegate.swift; sourceTree =
SOURCE_ROOT; };
397E09021E597BD8001374E0 /* en */ = {isa = PBXFileReference;
lastKnownFileType = file.storyboard; name = en; path =
en.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -114,6 +115,7 @@
3956B72D1FAB3DBF00BF5DE4 /* extra */ = {
isa = PBXGroup;
children = (
+ 397A9624200937990073F066 /* init.cxx */,
39E950521FC9842000D82C49 /* source */,
3975A8C91FBD70EE00A87B3A /* LibreOfficeKit.h */,
);
commit f64ae9b0ba80dec1e3e16502debc947f30c31bf4
Author: jan Iversen <j...@libreoffice.org>
Date: Sat Jan 13 10:30:38 2018 +0100
iOS, updated README
Changed README to reflect dylib, and new structure
Change-Id: I4230eed75572c0c0eefc059e284bfe92d5d9c506
diff --git a/ios/README b/ios/README
index 6ad40d2ef8a4..a5433cc99a36 100644
--- a/ios/README
+++ b/ios/README
@@ -1,8 +1,5 @@
iOS app and LibreOfficeKit.
--- LibreOfficeKit
-prelink all LO libraries into one to facilitate easier linking
-
-- LibreOfficeLight
a swift based UI, very much work in progress
@@ -26,35 +23,27 @@ the 3 configurations of LO first, and then link against
those.
Due to the multiple workdirs a separate work directories are needed as follows:
(names/locations can be changes, they are "linked" together by running
autogen.sh)
./core - libreoffice git clone (name can be changed)
- ./ios-arm64 - workdir for production, autogen.input:
- standard +
- #--enable-debug
- #--enable-ios-simulator
- --host=arm64-apple-darwin
- ./ios-arm64-debug - workdir for debug on device, autogen.input:
- standard +
- --enable-debug
- #--enable-ios-simulator
- --host=arm64-apple-darwin
- ./ios-simulator - workdir for simulator-debug, autogen.input:
- standard +
- --enable-debug
- --enable-ios-simulator
- #--host=arm64-apple-darwin
+ ./ios-arm64 - workdir for production
+ ./ios-arm64-debug - workdir for debug on device
+ ./ios-simulator - workdir for simulator-debug
-- Steps to generate
1) copy ./core/distro-configs/LibreOfficeiOS.conf to autogen.input in
./ios-arm64, ./ios-arm64-debug, ./ios-simulator
- Correct as per above, add your local setup (e.g. location of tarballs)
+ Correct as defined in the conf file,
+ add your local setup (e.g. location of tarballs)
2) run ../core/autogen.sh in ios-arm64, ios-arm64-debug and ios-simulator
3) run make in ios-arm64, ios-arm64-debug and ios-simulator
this will generate core/loApp.xcconfig which prepares LO to be compiled
- and build LOkit is 3 configurations and store the LibreOfficeKit
- prelinked object in ./core/ios/generated as:
- LibreOfficeKit-arm64.o
- LibreOfficeKit-arm64-debug.o
- LibreOfficeKit-simulator.o
-5) open xcode with LibreOfficeLight add ./ios-app/ios/loApp.xconfig to the
project.
+ and build LOkit is 3 configurations and store the preparedLibreOfficeKit
+ in ./core/ios/generated as:
+ release/libKit.a
+ release/libKit.dylib
+ debug/libKit.a
+ debug/libKit.dylib
+ simulator/libKit.a
+ simulator/libKit.dylib
+5) open xcode with LibreOfficeLight select scheme and build/test/run.
6) enjoy
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
