[Libreoffice-commits] core.git: 2 commits - ios/CustomTarget_iOS_setup.mk ios/UnitTest
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Feb 28 18:08:59 UTC 2019
ios/CustomTarget_iOS_setup.mk | 4
ios/UnitTest/UnitTest.xcodeproj/project.pbxproj | 8
ios/UnitTest/UnitTest/Assets.xcassets/AppIcon.appiconset/Contents.json | 98 ++++++++++
ios/UnitTest/UnitTest/Assets.xcassets/Contents.json | 6
ios/UnitTest/UnitTest/Base.lproj/LaunchScreen.storyboard | 25 ++
ios/UnitTest/UnitTest/Base.lproj/Main.storyboard | 24 ++
6 files changed, 160 insertions(+), 5 deletions(-)
New commits:
commit 2538dc89dee754b3b4621371e01b52995fc5e193
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Feb 28 19:31:09 2019 +0200
Commit: Tor Lillqvist <tml at iki.fi>
CommitDate: Thu Feb 28 20:08:06 2019 +0200
I had forgotten to add these files to git
Change-Id: I02ab930c6e3304009c90eef36f55d61a4531af7c
diff --git a/ios/UnitTest/UnitTest/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/UnitTest/UnitTest/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 000000000000..d8db8d65fd79
--- /dev/null
+++ b/ios/UnitTest/UnitTest/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,98 @@
+{
+ "images" : [
+ {
+ "idiom" : "iphone",
+ "size" : "20x20",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "20x20",
+ "scale" : "3x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "29x29",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "29x29",
+ "scale" : "3x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "40x40",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "40x40",
+ "scale" : "3x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "60x60",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "60x60",
+ "scale" : "3x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "20x20",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "20x20",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "29x29",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "29x29",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "40x40",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "40x40",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "76x76",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "76x76",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "83.5x83.5",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "ios-marketing",
+ "size" : "1024x1024",
+ "scale" : "1x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/ios/UnitTest/UnitTest/Assets.xcassets/Contents.json b/ios/UnitTest/UnitTest/Assets.xcassets/Contents.json
new file mode 100644
index 000000000000..da4a164c9186
--- /dev/null
+++ b/ios/UnitTest/UnitTest/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/ios/UnitTest/UnitTest/Base.lproj/LaunchScreen.storyboard b/ios/UnitTest/UnitTest/Base.lproj/LaunchScreen.storyboard
new file mode 100644
index 000000000000..bfa36129419f
--- /dev/null
+++ b/ios/UnitTest/UnitTest/Base.lproj/LaunchScreen.storyboard
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+ <dependencies>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+ <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+ </dependencies>
+ <scenes>
+ <!--View Controller-->
+ <scene sceneID="EHf-IW-A2E">
+ <objects>
+ <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+ <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+ </view>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="53" y="375"/>
+ </scene>
+ </scenes>
+</document>
diff --git a/ios/UnitTest/UnitTest/Base.lproj/Main.storyboard b/ios/UnitTest/UnitTest/Base.lproj/Main.storyboard
new file mode 100644
index 000000000000..942f0bc452d1
--- /dev/null
+++ b/ios/UnitTest/UnitTest/Base.lproj/Main.storyboard
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+ <dependencies>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+ <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+ </dependencies>
+ <scenes>
+ <!--View Controller-->
+ <scene sceneID="tne-QT-ifu">
+ <objects>
+ <viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
+ <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+ </view>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+ </objects>
+ </scene>
+ </scenes>
+</document>
commit 9f8373817ea06a6d921ad720e006c076a5f569ee
Author: Tor Lillqvist <tml at iki.fi>
AuthorDate: Thu Feb 28 19:32:03 2019 +0200
Commit: Tor Lillqvist <tml at iki.fi>
CommitDate: Thu Feb 28 20:08:06 2019 +0200
Current ICU version is 63
Change-Id: I126dbbec9fb6cbb19f848d8317002c69b407a36b
diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 59bf0469b13e..e651dd63f5bb 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -56,7 +56,9 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
cp $(INSTDIR)/program/types/oovbaapi.rdb $(IOSRES)
cp $(INSTDIR)/program/services/services.rdb $(IOSRES)/services
cp $(INSTDIR)/program/services.rdb $(IOSRES)
- cp -R $(INSTDIR)/program/resource $(IOSRES)/program
+ if test -d $(INSTDIR)/program/resource; then \
+ cp -R $(INSTDIR)/program/resource $(IOSRES)/program; \
+ fi
mkdir -p $(IOSRES)/share/config
cp -R $(INSTDIR)/share/config/soffice.cfg $(IOSRES)/share/config
cp $(INSTDIR)/share/filter/oox-drawingml-adj-names $(IOSRES)/filter
diff --git a/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj b/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj
index c8546167fc98..8e9177f60781 100644
--- a/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj
+++ b/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj
@@ -8,7 +8,7 @@
/* Begin PBXBuildFile section */
BE39ADD7215D5470000B0244 /* test.odt in Resources */ = {isa = PBXBuildFile; fileRef = BE39ADD6215D5470000B0244 /* test.odt */; };
- BE39ADEF215D5AA4000B0244 /* icudt62l.dat in Resources */ = {isa = PBXBuildFile; fileRef = BE39ADE0215D5AA3000B0244 /* icudt62l.dat */; };
+ BE39ADEF215D5AA4000B0244 /* icudt63l.dat in Resources */ = {isa = PBXBuildFile; fileRef = BE39ADE0215D5AA3000B0244 /* icudt63l.dat */; };
BE39ADF0215D5AA4000B0244 /* fundamentalrc in Resources */ = {isa = PBXBuildFile; fileRef = BE39ADE1215D5AA3000B0244 /* fundamentalrc */; };
BE39ADF1215D5AA4000B0244 /* services in Resources */ = {isa = PBXBuildFile; fileRef = BE39ADE2215D5AA3000B0244 /* services */; };
BE39ADF2215D5AA4000B0244 /* share in Resources */ = {isa = PBXBuildFile; fileRef = BE39ADE3215D5AA3000B0244 /* share */; };
@@ -36,7 +36,7 @@
/* Begin PBXFileReference section */
BE39ADD6215D5470000B0244 /* test.odt */ = {isa = PBXFileReference; lastKnownFileType = file; name = test.odt; path = ../../../../odk/examples/cpp/DocumentLoader/test.odt; sourceTree = "<group>"; };
- BE39ADE0215D5AA3000B0244 /* icudt62l.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = icudt62l.dat; path = ../../../../workdir/CustomTarget/ios/resources/icudt62l.dat; sourceTree = "<group>"; };
+ BE39ADE0215D5AA3000B0244 /* icudt63l.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = icudt63l.dat; path = ../../../../workdir/CustomTarget/ios/resources/icudt63l.dat; sourceTree = "<group>"; };
BE39ADE1215D5AA3000B0244 /* fundamentalrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fundamentalrc; path = ../../../../workdir/CustomTarget/ios/resources/fundamentalrc; sourceTree = "<group>"; };
BE39ADE2215D5AA3000B0244 /* services */ = {isa = PBXFileReference; lastKnownFileType = folder; name = services; path = ../../../../workdir/CustomTarget/ios/resources/services; sourceTree = "<group>"; };
BE39ADE3215D5AA3000B0244 /* share */ = {isa = PBXFileReference; lastKnownFileType = folder; name = share; path = ../../../../workdir/CustomTarget/ios/resources/share; sourceTree = "<group>"; };
@@ -216,7 +216,7 @@
BE39ADE6215D5AA3000B0244 /* config */,
BE39ADEC215D5AA3000B0244 /* filter */,
BE39ADE1215D5AA3000B0244 /* fundamentalrc */,
- BE39ADE0215D5AA3000B0244 /* icudt62l.dat */,
+ BE39ADE0215D5AA3000B0244 /* icudt63l.dat */,
BE39ADE9215D5AA3000B0244 /* offapi.rdb */,
BE39ADE4215D5AA3000B0244 /* oovbaapi.rdb */,
BE39ADE5215D5AA3000B0244 /* program */,
@@ -544,7 +544,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- BE39ADEF215D5AA4000B0244 /* icudt62l.dat in Resources */,
+ BE39ADEF215D5AA4000B0244 /* icudt63l.dat in Resources */,
BE39ADF7215D5AA4000B0244 /* registry in Resources */,
BE39ADF6215D5AA4000B0244 /* services.rdb in Resources */,
BE39ADF3215D5AA4000B0244 /* oovbaapi.rdb in Resources */,
More information about the Libreoffice-commits
mailing list