[Libreoffice-commits] online.git: 4 commits - Mobile/Mobile Mobile/Mobile.xcodeproj
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Oct 29 22:24:21 UTC 2018
Mobile/Mobile.xcodeproj/project.pbxproj | 51 ++++++++++++++++++++++++++++----
Mobile/Mobile/Info.plist | 14 +++++---
Mobile/Mobile/Mobile.entitlements | 20 ++++++++++++
3 files changed, 74 insertions(+), 11 deletions(-)
New commits:
commit 15bd148f26b1597bf158f1dd61407c42091abea7
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Oct 29 21:17:36 2018 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Oct 30 00:22:45 2018 +0200
Add source files from vcl/headless for easier breakpointing
Change-Id: Iae08ef264ba8e03f478c16ea60a5dd46d06e4930
diff --git a/Mobile/Mobile.xcodeproj/project.pbxproj b/Mobile/Mobile.xcodeproj/project.pbxproj
index adaba7441..22dcfd753 100644
--- a/Mobile/Mobile.xcodeproj/project.pbxproj
+++ b/Mobile/Mobile.xcodeproj/project.pbxproj
@@ -80,6 +80,18 @@
BE58E12E217F295B00249358 /* Protocol.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Protocol.hpp; sourceTree = "<group>"; };
BE58E12F217F295B00249358 /* Session.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Session.hpp; sourceTree = "<group>"; };
BE58E13021874A2E00249358 /* Mobile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Mobile.entitlements; sourceTree = "<group>"; };
+ BE58E132218793B500249358 /* svpbmp.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpbmp.cxx; path = "../../ios-device/vcl/headless/svpbmp.cxx"; sourceTree = "<group>"; };
+ BE58E133218793B500249358 /* svpglyphcache.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpglyphcache.cxx; path = "../../ios-device/vcl/headless/svpglyphcache.cxx"; sourceTree = "<group>"; };
+ BE58E134218793B600249358 /* svpgdi.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpgdi.cxx; path = "../../ios-device/vcl/headless/svpgdi.cxx"; sourceTree = "<group>"; };
+ BE58E135218793B600249358 /* headlessinst.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = headlessinst.cxx; path = "../../ios-device/vcl/headless/headlessinst.cxx"; sourceTree = "<group>"; };
+ BE58E136218793B600249358 /* svpcairotextrender.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpcairotextrender.cxx; path = "../../ios-device/vcl/headless/svpcairotextrender.cxx"; sourceTree = "<group>"; };
+ BE58E137218793B600249358 /* svpprn.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpprn.cxx; path = "../../ios-device/vcl/headless/svpprn.cxx"; sourceTree = "<group>"; };
+ BE58E138218793B600249358 /* svpdummies.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpdummies.cxx; path = "../../ios-device/vcl/headless/svpdummies.cxx"; sourceTree = "<group>"; };
+ BE58E139218793B600249358 /* svpinst.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpinst.cxx; path = "../../ios-device/vcl/headless/svpinst.cxx"; sourceTree = "<group>"; };
+ BE58E13A218793B600249358 /* svpdata.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpdata.cxx; path = "../../ios-device/vcl/headless/svpdata.cxx"; sourceTree = "<group>"; };
+ BE58E13B218793B600249358 /* svptext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svptext.cxx; path = "../../ios-device/vcl/headless/svptext.cxx"; sourceTree = "<group>"; };
+ BE58E13C218793B600249358 /* svpvd.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpvd.cxx; path = "../../ios-device/vcl/headless/svpvd.cxx"; sourceTree = "<group>"; };
+ BE58E13D218793B600249358 /* svpframe.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpframe.cxx; path = "../../ios-device/vcl/headless/svpframe.cxx"; sourceTree = "<group>"; };
BE5EB5B9213FE29900E0826C /* Log.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Log.cpp; sourceTree = "<group>"; };
BE5EB5BA213FE29900E0826C /* SpookyV2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpookyV2.cpp; sourceTree = "<group>"; };
BE5EB5BB213FE29900E0826C /* Session.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Session.cpp; sourceTree = "<group>"; };
@@ -314,6 +326,25 @@
name = Frameworks;
sourceTree = "<group>";
};
+ BE58E1312187938700249358 /* headless */ = {
+ isa = PBXGroup;
+ children = (
+ BE58E135218793B600249358 /* headlessinst.cxx */,
+ BE58E132218793B500249358 /* svpbmp.cxx */,
+ BE58E136218793B600249358 /* svpcairotextrender.cxx */,
+ BE58E13A218793B600249358 /* svpdata.cxx */,
+ BE58E138218793B600249358 /* svpdummies.cxx */,
+ BE58E13D218793B600249358 /* svpframe.cxx */,
+ BE58E134218793B600249358 /* svpgdi.cxx */,
+ BE58E133218793B500249358 /* svpglyphcache.cxx */,
+ BE58E139218793B600249358 /* svpinst.cxx */,
+ BE58E137218793B600249358 /* svpprn.cxx */,
+ BE58E13B218793B600249358 /* svptext.cxx */,
+ BE58E13C218793B600249358 /* svpvd.cxx */,
+ );
+ name = headless;
+ sourceTree = "<group>";
+ };
BE5EB5B5213FE1F900E0826C /* Online */ = {
isa = PBXGroup;
children = (
@@ -370,6 +401,7 @@
BE93D43C216D555C007A39F4 /* sfx2 */,
BEB6524B216FD09400B8C09A /* tools */,
BE93D420216CAA52007A39F4 /* vcl */,
+ BE58E1312187938700249358 /* headless */,
);
name = Core;
sourceTree = "<group>";
commit 19361772c1e2884fb6a0d02c398e39eef3fb3a37
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Oct 29 16:17:57 2018 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Oct 30 00:22:45 2018 +0200
Change the user visible name of the "Mobile" app to "Collabora Office Mobile"
Change-Id: I3a80caaefcb601df80b89d63786c0f19c4471e32
diff --git a/Mobile/Mobile/Info.plist b/Mobile/Mobile/Info.plist
index d1e18e428..f8401cede 100644
--- a/Mobile/Mobile/Info.plist
+++ b/Mobile/Mobile/Info.plist
@@ -2,21 +2,21 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>UIFileSharingEnabled</key>
- <true/>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
+ <key>CFBundleDisplayName</key>
+ <string>Collabora Office Mobile</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
- <key>LSItemContentTypes</key>
- <array>
- <string>com.collabora.office.uti.fodt</string>
- </array>
<key>CFBundleTypeName</key>
<string>OpenDocument Flat Text</string>
<key>LSHandlerRank</key>
<string>Default</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>com.collabora.office.uti.fodt</string>
+ </array>
</dict>
<dict>
<key>CFBundleTypeIconFiles</key>
@@ -87,6 +87,8 @@
<string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
+ <key>UIFileSharingEnabled</key>
+ <true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
commit 6bb5353d33a674179335e920b33142dac7d80554
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Oct 29 16:14:05 2018 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Oct 30 00:22:22 2018 +0200
Add iCloud entitlements that probably will be needed
Change-Id: I19e82484a53622a836bba70877ff52203d6b6866
diff --git a/Mobile/Mobile.xcodeproj/project.pbxproj b/Mobile/Mobile.xcodeproj/project.pbxproj
index 3785f40f1..adaba7441 100644
--- a/Mobile/Mobile.xcodeproj/project.pbxproj
+++ b/Mobile/Mobile.xcodeproj/project.pbxproj
@@ -79,6 +79,7 @@
BE58E12D217F295B00249358 /* MessageQueue.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = MessageQueue.hpp; sourceTree = "<group>"; };
BE58E12E217F295B00249358 /* Protocol.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Protocol.hpp; sourceTree = "<group>"; };
BE58E12F217F295B00249358 /* Session.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Session.hpp; sourceTree = "<group>"; };
+ BE58E13021874A2E00249358 /* Mobile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Mobile.entitlements; sourceTree = "<group>"; };
BE5EB5B9213FE29900E0826C /* Log.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Log.cpp; sourceTree = "<group>"; };
BE5EB5BA213FE29900E0826C /* SpookyV2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpookyV2.cpp; sourceTree = "<group>"; };
BE5EB5BB213FE29900E0826C /* Session.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Session.cpp; sourceTree = "<group>"; };
@@ -395,6 +396,7 @@
BE8D77292136762500AC58EA /* Mobile */ = {
isa = PBXGroup;
children = (
+ BE58E13021874A2E00249358 /* Mobile.entitlements */,
BE5EB5D92140363100E0826C /* ios.mm */,
BE00F8922139494E001CE2D4 /* Resources */,
BE8D772A2136762500AC58EA /* AppDelegate.h */,
@@ -651,6 +653,11 @@
TargetAttributes = {
BE8D77262136762500AC58EA = {
CreatedOnToolsVersion = 9.4.1;
+ SystemCapabilities = {
+ com.apple.iCloud = {
+ enabled = 1;
+ };
+ };
};
};
};
@@ -884,6 +891,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+ CODE_SIGN_ENTITLEMENTS = Mobile/Mobile.entitlements;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = J4FQ687VJK;
ENABLE_BITCODE = NO;
@@ -943,6 +951,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+ CODE_SIGN_ENTITLEMENTS = Mobile/Mobile.entitlements;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = J4FQ687VJK;
ENABLE_BITCODE = NO;
diff --git a/Mobile/Mobile/Mobile.entitlements b/Mobile/Mobile/Mobile.entitlements
new file mode 100644
index 000000000..367dc1be8
--- /dev/null
+++ b/Mobile/Mobile/Mobile.entitlements
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>com.apple.developer.icloud-container-identifiers</key>
+ <array>
+ <string>iCloud.$(CFBundleIdentifier)</string>
+ </array>
+ <key>com.apple.developer.icloud-services</key>
+ <array>
+ <string>CloudDocuments</string>
+ </array>
+ <key>com.apple.developer.ubiquity-container-identifiers</key>
+ <array>
+ <string>iCloud.$(CFBundleIdentifier)</string>
+ </array>
+ <key>com.apple.developer.ubiquity-kvstore-identifier</key>
+ <string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string>
+</dict>
+</plist>
commit 050d9699e5efdcdb75d75687f616fcd22b89b945
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Oct 26 17:27:54 2018 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Oct 30 00:22:22 2018 +0200
Use debug build of Poco libs also in Release configuration for now
Using an optimised build of Poco seems to cause some code to work
incorrectly, sigh. No time to investigate deeper now.
Change-Id: I47e1809d380226d489db35bf4fc97d0f731fd887
diff --git a/Mobile/Mobile.xcodeproj/project.pbxproj b/Mobile/Mobile.xcodeproj/project.pbxproj
index 058e2c13b..3785f40f1 100644
--- a/Mobile/Mobile.xcodeproj/project.pbxproj
+++ b/Mobile/Mobile.xcodeproj/project.pbxproj
@@ -984,11 +984,11 @@
"$(PNGINSTDIR)/lib",
"-L",
"$(POCOINSTDIR)/lib",
- "-lPocoFoundation",
- "-lPocoUtil",
- "-lPocoXML",
- "-lPocoJSON",
- "-lPocoNet",
+ "-lPocoFoundationd",
+ "-lPocoUtild",
+ "-lPocoXMLd",
+ "-lPocoJSONd",
+ "-lPocoNetd",
);
PRODUCT_BUNDLE_IDENTIFIER = com.collabora.office.Mobile;
PRODUCT_NAME = "$(TARGET_NAME)";
More information about the Libreoffice-commits
mailing list