configure.ac | 6 -
ios/.gitignore | 3
ios/CustomTarget_Lo_Xcconfig.mk | 8 -
ios/CustomTarget_Prototype_app.mk | 30 -----
ios/DISCLAIMER_WARNING | 11 +
ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj | 6 -
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 6 -
ios/LibreOfficeLight/lo_app.xcconfig.in | 32 +++++
ios/README | 58
+++++++++-
9 files changed, 110 insertions(+), 50 deletions(-)
New commits:
commit 11f001f1a05684c87615e74a1edab300409bf6c6
Author: jan Iversen <j...@libreoffice.org>
Date: Tue Sep 26 12:54:40 2017 +0200
iOS, build instructions.
Added README with instruction on how to build for
the different platforms, updated iOS files corresponding
Change-Id: I8a85f808841d682bc09f1e3b039192e342ecc484
diff --git a/configure.ac b/configure.ac
index eb387452d313..b8d1225db3bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4413,7 +4413,8 @@ if test "$cross_compiling" = "yes"; then
instsetoo_native/util/openoffice.lst.in \
config_host/*.in \
sysui/desktop/macosx/Info.plist.in \
- ios/lo.xcconfig.in) \
+ ios/LibreOfficeKit/lo_kit.xcconfig.in \
+ ios/LibreOfficeApp/lo_app.xcconfig.in) \
| (cd CONF-FOR-BUILD && tar xf -)
cp configure CONF-FOR-BUILD
test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host
2>/dev/null
@@ -12377,7 +12378,8 @@ AC_CONFIG_FILES([config_host.mk
bin/officeotron.sh
instsetoo_native/util/openoffice.lst
sysui/desktop/macosx/Info.plist
- ios/lo.xcconfig])
+ ios/LibreOfficeKit/lo_kit.xcconfig
+ ios/LibreOfficeLight/lo_app.xcconfig])
AC_CONFIG_HEADERS([config_host/config_buildid.h])
AC_CONFIG_HEADERS([config_host/config_clang.h])
AC_CONFIG_HEADERS([config_host/config_dconf.h])
diff --git a/ios/.gitignore b/ios/.gitignore
index 4c274d723106..f0d6995bda19 100644
--- a/ios/.gitignore
+++ b/ios/.gitignore
@@ -6,5 +6,4 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-ioswork
-lo.xcconfig
+lo*.xcconfig
diff --git a/ios/CustomTarget_Lo_Xcconfig.mk b/ios/CustomTarget_Lo_Xcconfig.mk
index a4bbbc577e82..6aea394fab2f 100644
--- a/ios/CustomTarget_Lo_Xcconfig.mk
+++ b/ios/CustomTarget_Lo_Xcconfig.mk
@@ -11,7 +11,6 @@ IOSWORK := $(BUILDDIR)/workdir
IOSDIR := $(IOSWORK)/ios
IOSRESOURCE := $(IOSDIR)/resources
IOSGENERATED := $(IOSDIR)/generated
-IOSLINK := $(SRCDIR)/ios/ioswork
LO_XCCONFIG = $(IOSGENERATED)/lo.xcconfig
@@ -20,7 +19,8 @@ define IOSbuild
CC=; \
$(call gb_Helper_print_on_error, \
xcodebuild \
- -project $(SRCDIR)/ios/experimental/$(1)/$(1).xcodeproj
\
+ -xcconfig $(BUILDDIR)/ios/$1/lo_kit.xconfig \
+ -project $(SRCDIR)/ios/$(1)/$(1).xcodeproj \
-target $(1) \
-sdk $(XCODEBUILD_SDK) \
-arch $(XCODE_ARCHS) \
@@ -42,9 +42,8 @@ $(LO_XCCONFIG) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
# prepare work directories for all ios builds
- rm -rf $(IOSRESOURCE) $(IOSLINK) 2>/dev/null;
+ rm -rf $(IOSRESOURCE) 2>/dev/null;
mkdir -p $(IOSDIR) $(IOSGENERATED) $(IOSRESOURCE)
$(IOSRESOURCE)/services;
- ln -s $(IOSWORK) $(IOSLINK)
# generate file with call declarations
$(SRCDIR)/solenv/bin/native-code.py \
@@ -127,7 +126,6 @@ $(LO_XCCONFIG) :
$(call gb_CustomTarget_get_clean_target,ios/Lo_Xcconfig):
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),ENV,2)
rm -rf $(IOSDIR)
- rm -f $(IOSLINK)
rm -f $(WORKDIR)/CustomTarget/ios/Lo_Xcconfig.done
diff --git a/ios/CustomTarget_Prototype_app.mk
b/ios/CustomTarget_Prototype_app.mk
deleted file mode 100644
index 316b1116761b..000000000000
--- a/ios/CustomTarget_Prototype_app.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-
-#- Env ------------------------------------------------------------------------
-BUILDID :=$(shell cd $(SRCDIR) && git log -1
--format=%H)
-
-#- Targets --------------------------------------------------------------------
-
-.PHONY: Prototype_setup
-
-# Register target
-$(eval $(call gb_CustomTarget_CustomTarget,ios/Prototype))
-
-# Build
-# Depend on the custom target that sets up lo.xcconfig
-$(call gb_CustomTarget_get_target,ios/Prototype): $(call
gb_CustomTarget_get_target,ios/Lo_Xcconfig)
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
- $(call IOSbuild,Prototype, clean build)
-
-# Clean
-$(call gb_CustomTarget_get_clean_target,ios/Prototype):
- $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),APP,2)
- $(call IOSbuild,Prototype, clean)
-
-# vim: set noet sw=4 ts=4:
diff --git a/ios/DISCLAIMER_WARNING b/ios/DISCLAIMER_WARNING
new file mode 100644
index 000000000000..36663688db14
--- /dev/null
+++ b/ios/DISCLAIMER_WARNING
@@ -0,0 +1,11 @@
+******
+Everything in ios is currently
+ WORK IN PROGRESS
+
+Do not expect it to work, or even compile
+
+If you want to help with the work, please send
+an email to our dev@ list.
+
+rgds
+jan I
diff --git
a/ios/experimental/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
similarity index 96%
rename from
ios/experimental/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
rename to ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
index ccff1022393c..0bb2386137bd 100644
--- a/ios/experimental/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 46;
+ objectVersion = 48;
objects = {
/* Begin PBXBuildFile section */
@@ -25,7 +25,6 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
- 3969A8CA1F7826EB006F06A9 /* lo.xcconfig */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name =
lo.xcconfig; path = ../../ioswork/ios/generated/lo.xcconfig; sourceTree =
"<group>"; };
39B5D2151F78130F008FB162 /* libLibreOfficeKit.a */ = {isa =
PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path =
libLibreOfficeKit.a; sourceTree = BUILT_PRODUCTS_DIR; };
39B5D2181F78130F008FB162 /* LibreOfficeKit.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LibreOfficeKit.h;
sourceTree = "<group>"; };
39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path =
LibreOfficeKit.mm; sourceTree = "<group>"; };
@@ -45,7 +44,6 @@
3969A8C91F782610006F06A9 /* Support files */ = {
isa = PBXGroup;
children = (
- 3969A8CA1F7826EB006F06A9 /* lo.xcconfig */,
);
name = "Support files";
sourceTree = "<group>";
@@ -112,7 +110,7 @@
};
};
buildConfigurationList = 39B5D2101F78130F008FB162 /*
Build configuration list for PBXProject "LibreOfficeKit" */;
- compatibilityVersion = "Xcode 3.2";
+ compatibilityVersion = "Xcode 8.0";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
diff --git a/ios/experimental/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.h
b/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.h
similarity index 100%
rename from ios/experimental/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.h
rename to ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.h
diff --git a/ios/experimental/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.mm
b/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.mm
similarity index 100%
rename from ios/experimental/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.mm
rename to ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.mm
diff --git a/ios/lo.xcconfig.in b/ios/LibreOfficeKit/lo_kit.xcconfig.in
similarity index 100%
rename from ios/lo.xcconfig.in
rename to ios/LibreOfficeKit/lo_kit.xcconfig.in
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
similarity index 97%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
rename to ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index cecc1c8a1d15..36856498d786 100644
---
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -50,7 +50,6 @@
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; };
- 39B084E21E5F0A9600682A59 /* lo.xcconfig */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name =
lo.xcconfig; path = ../../ioswork/ios/generated/lo.xcconfig; sourceTree =
SOURCE_ROOT; };
39B084E51E5F0BB400682A59 /* fundamentalrc */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name =
fundamentalrc; path = ../../ioswork/ios/resources/fundamentalrc; sourceTree =
SOURCE_ROOT; };
39B084E61E5F0BB400682A59 /* offapi.rdb */ = {isa =
PBXFileReference; lastKnownFileType = file; name = offapi.rdb; path =
../../ioswork/ios/resources/offapi.rdb; sourceTree = SOURCE_ROOT; };
39B084E71E5F0BB400682A59 /* oovbaapi.rdb */ = {isa =
PBXFileReference; lastKnownFileType = file; name = oovbaapi.rdb; path =
../../ioswork/ios/resources/oovbaapi.rdb; sourceTree = SOURCE_ROOT; };
@@ -78,7 +77,6 @@
39022C221EDC303200100066 /* InfoPlist.strings
*/,
39B092501E5F3DEA00682A59 /*
LibreOfficeLight-Prefix.pch */,
397275391E77D9F1006ACDCC /*
LibreOfficeLight.entitlements */,
- 39B084E21E5F0A9600682A59 /* lo.xcconfig */,
397E09071E597BD8001374E0 /* Assets.xcassets */,
396F92F61E7AE62400A28C82 /* Settings.bundle */,
);
@@ -286,7 +284,6 @@
/* Begin XCBuildConfiguration section */
397E09231E597BD8001374E0 /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 39B084E21E5F0A9600682A59
/* lo.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD)";
@@ -364,7 +361,6 @@
};
397E09241E597BD8001374E0 /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 39B084E21E5F0A9600682A59
/* lo.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD)";
@@ -436,7 +432,6 @@
};
397E09261E597BD8001374E0 /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 39B084E21E5F0A9600682A59
/* lo.xcconfig */;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -476,7 +471,6 @@
};
397E09271E597BD8001374E0 /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 39B084E21E5F0A9600682A59
/* lo.xcconfig */;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
b/ios/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
similarity index 100%
rename from ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
rename to ios/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-29...@1x.png
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-29...@1x.png
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-29...@1x.png
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-29...@1x.png
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-29...@2x.png
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-29...@2x.png
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-29...@2x.png
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-29...@2x.png
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-40...@2x.png
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-40...@2x.png
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-40...@2x.png
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-40...@2x.png
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-76...@1x.png
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-76...@1x.png
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-76...@1x.png
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-76...@1x.png
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-76...@2x.png
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-76...@2x.png
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-76...@2x.png
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-76...@2x.png
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-83.5x8...@2x.png
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-83.5x8...@2x.png
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-83.5x8...@2x.png
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/libreoffice-83.5x8...@2x.png
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/back.png
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/back.png
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/back.png
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/back.png
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/b...@2x.png
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/b...@2x.png
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/b...@2x.png
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/b...@2x.png
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/b...@3x.png
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/b...@3x.png
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/b...@3x.png
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/b...@3x.png
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/drawing-template.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/drawing-template.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/drawing-template.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/drawing-template.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/drawing-template.dataset/drawing-template.icns
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/drawing-template.dataset/drawing-template.icns
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/drawing-template.dataset/drawing-template.icns
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/drawing-template.dataset/drawing-template.icns
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/drawing.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/drawing.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/drawing.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/drawing.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/drawing.dataset/drawing.icns
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/drawing.dataset/drawing.icns
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/drawing.dataset/drawing.icns
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/drawing.dataset/drawing.icns
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/empty-document.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/empty-document.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/empty-document.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/empty-document.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/empty-document.dataset/empty-document.ico
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/empty-document.dataset/empty-document.ico
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/empty-document.dataset/empty-document.ico
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/empty-document.dataset/empty-document.ico
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/empty-template.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/empty-template.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/empty-template.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/empty-template.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/empty-template.dataset/empty-template.ico
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/empty-template.dataset/empty-template.ico
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/empty-template.dataset/empty-template.ico
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/empty-template.dataset/empty-template.ico
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/extension.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/extension.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/extension.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/extension.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/extension.dataset/extension.icns
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/extension.dataset/extension.icns
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/extension.dataset/extension.icns
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/extension.dataset/extension.icns
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/formula.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/formula.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/formula.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/formula.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/formula.dataset/formula.icns
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/formula.dataset/formula.icns
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/formula.dataset/formula.icns
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/formula.dataset/formula.icns
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/main.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/main.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/main.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/main.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/main.dataset/main.icns
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/main.dataset/main.icns
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/main.dataset/main.icns
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/main.dataset/main.icns
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/master-document.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/master-document.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/master-document.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/master-document.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/master-document.dataset/master-document.icns
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/master-document.dataset/master-document.icns
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/master-document.dataset/master-document.icns
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/master-document.dataset/master-document.icns
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-database.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-database.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-database.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-database.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-database.dataset/oasis-database.icns
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-database.dataset/oasis-database.icns
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-database.dataset/oasis-database.icns
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-database.dataset/oasis-database.icns
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-drawing-template.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-drawing-template.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-drawing-template.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-drawing-template.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-drawing-template.dataset/oasis-drawing-template.ico
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-drawing-template.dataset/oasis-drawing-template.ico
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-drawing-template.dataset/oasis-drawing-template.ico
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-drawing-template.dataset/oasis-drawing-template.ico
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-drawing.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-drawing.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-drawing.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-drawing.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-drawing.dataset/oasis-drawing.icns
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-drawing.dataset/oasis-drawing.icns
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-drawing.dataset/oasis-drawing.icns
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-drawing.dataset/oasis-drawing.icns
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-formula.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-formula.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-formula.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-formula.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-formula.dataset/oasis-formula.ico
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-formula.dataset/oasis-formula.ico
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-formula.dataset/oasis-formula.ico
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-formula.dataset/oasis-formula.ico
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-master-document-template.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-master-document-template.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-master-document-template.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-master-document-template.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-master-document-template.dataset/oasis-master-document-template.icns
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-master-document-template.dataset/oasis-master-document-template.icns
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-master-document-template.dataset/oasis-master-document-template.icns
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-master-document-template.dataset/oasis-master-document-template.icns
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-master-document.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-master-document.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-master-document.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-master-document.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-master-document.dataset/oasis-master-document.ico
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-master-document.dataset/oasis-master-document.ico
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-master-document.dataset/oasis-master-document.ico
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-master-document.dataset/oasis-master-document.ico
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-presentation-template.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-presentation-template.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-presentation-template.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-presentation-template.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-presentation-template.dataset/oasis-presentation-template.icns
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-presentation-template.dataset/oasis-presentation-template.icns
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-presentation-template.dataset/oasis-presentation-template.icns
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-presentation-template.dataset/oasis-presentation-template.icns
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-presentation.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-presentation.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-presentation.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-presentation.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-presentation.dataset/oasis-presentation.ico
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-presentation.dataset/oasis-presentation.ico
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-presentation.dataset/oasis-presentation.ico
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-presentation.dataset/oasis-presentation.ico
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-spreadsheet-template.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-spreadsheet-template.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-spreadsheet-template.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-spreadsheet-template.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-spreadsheet-template.dataset/oasis-spreadsheet-template.icns
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-spreadsheet-template.dataset/oasis-spreadsheet-template.icns
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-spreadsheet-template.dataset/oasis-spreadsheet-template.icns
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-spreadsheet-template.dataset/oasis-spreadsheet-template.icns
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-spreadsheet.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-spreadsheet.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-spreadsheet.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-spreadsheet.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-spreadsheet.dataset/oasis-spreadsheet.icns
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-spreadsheet.dataset/oasis-spreadsheet.icns
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-spreadsheet.dataset/oasis-spreadsheet.icns
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-spreadsheet.dataset/oasis-spreadsheet.icns
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-text-template.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-text-template.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-text-template.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-text-template.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-text-template.dataset/oasis-text-template.ico
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-text-template.dataset/oasis-text-template.ico
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-text-template.dataset/oasis-text-template.ico
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-text-template.dataset/oasis-text-template.ico
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-text.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-text.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-text.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-text.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-text.dataset/oasis-text.ico
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-text.dataset/oasis-text.ico
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-text.dataset/oasis-text.ico
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-text.dataset/oasis-text.ico
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-web-template.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-web-template.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-web-template.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-web-template.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-web-template.dataset/oasis-web-template.icns
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-web-template.dataset/oasis-web-template.icns
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-web-template.dataset/oasis-web-template.icns
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-web-template.dataset/oasis-web-template.icns
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/open.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/open.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/open.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/open.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/open.dataset/open.ico
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/open.dataset/open.ico
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/open.dataset/open.ico
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/open.dataset/open.ico
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/presentation-template.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/presentation-template.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/presentation-template.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/presentation-template.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/presentation-template.dataset/presentation-template.ico
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/presentation-template.dataset/presentation-template.ico
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/presentation-template.dataset/presentation-template.ico
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/presentation-template.dataset/presentation-template.ico
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/presentation.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/presentation.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/presentation.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/presentation.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/presentation.dataset/presentation.ico
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/presentation.dataset/presentation.ico
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/presentation.dataset/presentation.ico
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/presentation.dataset/presentation.ico
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/soffice.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/soffice.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/soffice.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/soffice.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/soffice.dataset/soffice.ico
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/soffice.dataset/soffice.ico
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/soffice.dataset/soffice.ico
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/soffice.dataset/soffice.ico
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/spreadsheet-template.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/spreadsheet-template.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/spreadsheet-template.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/spreadsheet-template.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/spreadsheet-template.dataset/spreadsheet-template.icns
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/spreadsheet-template.dataset/spreadsheet-template.icns
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/spreadsheet-template.dataset/spreadsheet-template.icns
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/spreadsheet-template.dataset/spreadsheet-template.icns
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/spreadsheet.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/spreadsheet.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/spreadsheet.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/spreadsheet.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/spreadsheet.dataset/spreadsheet.icns
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/spreadsheet.dataset/spreadsheet.icns
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/spreadsheet.dataset/spreadsheet.icns
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/spreadsheet.dataset/spreadsheet.icns
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/text-template.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/text-template.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/text-template.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/text-template.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/text-template.dataset/text-template.icns
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/text-template.dataset/text-template.icns
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/text-template.dataset/text-template.icns
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/text-template.dataset/text-template.icns
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/text.dataset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/text.dataset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/text.dataset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/text.dataset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/text.dataset/text.icns
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/text.dataset/text.icns
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/text.dataset/text.icns
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/text.dataset/text.icns
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/intro.imageset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/intro.imageset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/intro.imageset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/intro.imageset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/intro.imageset/intro.png
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/intro.imageset/intro.png
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/intro.imageset/intro.png
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/intro.imageset/intro.png
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/Contents.json
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/Contents.json
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/Contents.json
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/menu.png
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/menu.png
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/menu.png
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/menu.png
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/m...@2x.png
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/m...@2x.png
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/m...@2x.png
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/m...@2x.png
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/m...@3x.png
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/m...@3x.png
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/m...@3x.png
rename to
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/m...@3x.png
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
b/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
rename to ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist
b/ios/LibreOfficeLight/LibreOfficeLight/Info.plist
similarity index 100%
rename from ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist
rename to ios/LibreOfficeLight/LibreOfficeLight/Info.plist
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight-Prefix.pch
b/ios/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight-Prefix.pch
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight-Prefix.pch
rename to ios/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight-Prefix.pch
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.entitlements
b/ios/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.entitlements
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.entitlements
rename to ios/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.entitlements
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.xcdatamodeld/.xccurrentversion
b/ios/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.xcdatamodeld/.xccurrentversion
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.xcdatamodeld/.xccurrentversion
rename to
ios/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.xcdatamodeld/.xccurrentversion
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.xcdatamodeld/LibreOfficeLight.xcdatamodel/contents
b/ios/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.xcdatamodeld/LibreOfficeLight.xcdatamodel/contents
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.xcdatamodeld/LibreOfficeLight.xcdatamodel/contents
rename to
ios/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.xcdatamodeld/LibreOfficeLight.xcdatamodel/contents
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Settings.bundle/Root.plist
b/ios/LibreOfficeLight/LibreOfficeLight/Settings.bundle/Root.plist
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Settings.bundle/Root.plist
rename to ios/LibreOfficeLight/LibreOfficeLight/Settings.bundle/Root.plist
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Settings.bundle/en.lproj/Root.strings
b/ios/LibreOfficeLight/LibreOfficeLight/Settings.bundle/en.lproj/Root.strings
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/Settings.bundle/en.lproj/Root.strings
rename to
ios/LibreOfficeLight/LibreOfficeLight/Settings.bundle/en.lproj/Root.strings
diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/SideMenu.swift
b/ios/LibreOfficeLight/LibreOfficeLight/SideMenu.swift
similarity index 100%
rename from ios/experimental/LibreOfficeLight/LibreOfficeLight/SideMenu.swift
rename to ios/LibreOfficeLight/LibreOfficeLight/SideMenu.swift
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewPrintManager.swift
b/ios/LibreOfficeLight/LibreOfficeLight/ViewPrintManager.swift
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewPrintManager.swift
rename to ios/LibreOfficeLight/LibreOfficeLight/ViewPrintManager.swift
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewProperties.swift
b/ios/LibreOfficeLight/LibreOfficeLight/ViewProperties.swift
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewProperties.swift
rename to ios/LibreOfficeLight/LibreOfficeLight/ViewProperties.swift
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/InfoPlist.strings
b/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/InfoPlist.strings
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/InfoPlist.strings
rename to ios/LibreOfficeLight/LibreOfficeLight/en.lproj/InfoPlist.strings
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/LaunchScreen.xib
b/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/LaunchScreen.xib
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/LaunchScreen.xib
rename to ios/LibreOfficeLight/LibreOfficeLight/en.lproj/LaunchScreen.xib
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
b/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
rename to ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
diff --git
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h
b/ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h
similarity index 100%
rename from
ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h
rename to ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h
diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.mm
b/ios/LibreOfficeLight/LibreOfficeLight/lokit.mm
similarity index 100%
rename from ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.mm
rename to ios/LibreOfficeLight/LibreOfficeLight/lokit.mm
diff --git a/ios/LibreOfficeLight/lo_app.xcconfig.in
b/ios/LibreOfficeLight/lo_app.xcconfig.in
new file mode 100644
index 000000000000..08623d8a9067
--- /dev/null
+++ b/ios/LibreOfficeLight/lo_app.xcconfig.in
@@ -0,0 +1,32 @@
+// -*- Mode: text; tab-width: 4; indent-tabs-mode: nil; word-wrap: nil -*-
+//
+// 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
+
+// To avoid confusion, the LO-specific ones that aren't as such used
+// by Xcode (but only expanded in option values) are prefixed with
+// LO_.
+
+LO_BUILDDIR = @BUILDDIR@
+LO_INSTDIR = @INSTDIR@
+LO_SRCDIR = @SRC_ROOT@
+LO_WORKDIR = @WORKDIR@
+
+// These are actual Xcode-known settings. The corresponding autoconf
+// variables are prefixed with XCODE_ to make it clear in configure.ac
+// what they will be used for.
+ARCHS = @XCODE_ARCHS@
+VALID_ARCHS = @XCODE_ARCHS@
+CLANG_CXX_LIBRARY = @XCODE_CLANG_CXX_LIBRARY@
+DEBUG_INFORMATION_FORMAT=@XCODE_DEBUG_INFORMATION_FORMAT@
+
+// These settings are edited in CustomTarget_Lo_Xcconfig.mk.
+LINK_LDFLAGS =
+OTHER_CFLAGS =
+OTHER_CPLUSPLUSFLAGS =
+SYMROOT = @WORKDIR@/ios/build
diff --git a/ios/README b/ios/README
index 533ad1dd1761..ba9c5d5c95bc 100644
--- a/ios/README
+++ b/ios/README
@@ -1 +1,57 @@
-experimental iOS apps that use LibreOffice code.
+iOS experimental app and LibreOfficeKit.
+
+-- experiments/LibreOfficeKit
+prelink all LO libraries into one to facilitate easier linking
+
+-- experiments/LibreOfficeLight
+a swift based UI, very much work in progress
+
+-- support
+the arm64 and simulator are the only supported processsors,
+old 32 bit iPhones are not supported.
+
+The swift app are done for 3 structures
+ simulator + full debug libraries
+ arm64 + full debug libraries
+ arm64 + optimized libraries
+
+-- SETUP
+Due to the 3 modes, at lease 3 workdir are needed together with a
+seperate UI workdir.
+
+Because the main work is done on the UI, where it is convinient to
+swift fast between arm64 and simulator, it is advanteous to compile
+the 3 configurations of LO first, and then link against those.
+
+Due to the multiple workdirs a distint directory setup is needed
+ ./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-app - workdir for UI, NO autogen.input
+
+-- 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)
+2) run ../core/autogen.sh in ios-arm64, ios-arm64-debug and ios-simulator
+ this will generate ./*/ios/lo.xcconfig and prepare LO to be compiled
+3) run make in ios-arm64, ios-arm64-debug and ios-simulator
+ this will build LO is 3 configurations and store the LibreOfficeKit
+ libraries in ./ios-app/libraries as:
+ ./ios-app/Library/LibreOfficeKit-arm64.a
+ ./ios-app/Library/LibreOfficeKit-arm64-debug.a
+ ./ios-app/Library/LibreOfficeKit-simulator.a
+4) open xcode with LibreOfficeLight and enjoy
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
