[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - configure.ac ios/Mobile.xcodeproj loleaflet/html
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Apr 22 13:00:36 UTC 2019
configure.ac | 18 ++++++++++++++++++
ios/Mobile.xcodeproj/project.pbxproj | 4 ++++
loleaflet/html/loleaflet.html.m4 | 2 ++
3 files changed, 24 insertions(+)
New commits:
commit 9ef29fb397b5fe74ab8089978f43392f415a9d00
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Apr 22 15:22:04 2019 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Apr 22 16:00:09 2019 +0300
Add branding to the iOS app
A configure argument, --with-iosapp-branding, should point to a
directory containing a branding.css file and possibly other files that
branding.css references, to be bundled and used by the iOS app. The
directory structure ends upp in the app bundle as Branding. The
generated loleaflet.html for the iOS app references
Branding/branding.css unconditionally.
diff --git a/configure.ac b/configure.ac
index cc8b85a57..394e71f1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,12 @@ AC_ARG_WITH([iosapp-fonts],
[Point to a directory containing .ttf or .otf files to be bundled in the iOS app (and
thus installed on the device for use of the LO core code).]))
+AC_ARG_WITH([iosapp-branding],
+ AS_HELP_STRING([--with-iosapp-branding=<path>],
+ [Point to a directory containing a branding.css file and possibly other files it references,
+ to be bundled and used by the iOS app. The directory structure is copied to
+ "loleaflet/dist/branding" and that directory ends upp in the app bundle as "branding".]))
+
AC_ARG_ENABLE([gtkapp],
AS_HELP_STRING([--enable-gtkapp],
[Use in a tree where the only purpose is to build the gtk+ "app" that is supposed
@@ -626,6 +632,18 @@ AS_IF([test "$ENABLE_IOSAPP" = "true"],
echo '<string>Fonts/'$(basename $fname)'</string>'
done`
fi
+ rm -rf ios/Mobile/Branding
+ mkdir ios/Mobile/Branding
+ if test "$with_iosapp_branding" != no -a -d "$with_iosapp_branding"; then
+ AC_MSG_NOTICE([copying branding files])
+ mkdir -p loleaflet/dist/branding
+ (cd "$with_iosapp_branding" && tar cf - .) | (cd ios/Mobile/Branding && tar xf -)
+ else
+ # A Branding/branding.css file must exist, it is
+ # referenced unconditionally in loleaflet.html in the
+ # iOS app.
+ touch ios/Mobile/Branding/branding.css
+ fi
fi
])
AC_SUBST(IOSAPP_FONTS)
diff --git a/ios/Mobile.xcodeproj/project.pbxproj b/ios/Mobile.xcodeproj/project.pbxproj
index 4172c1fda..75428f7f2 100644
--- a/ios/Mobile.xcodeproj/project.pbxproj
+++ b/ios/Mobile.xcodeproj/project.pbxproj
@@ -15,6 +15,7 @@
BE00F8A821396585001CE2D4 /* images in Resources */ = {isa = PBXBuildFile; fileRef = BE00F89E21396585001CE2D4 /* images */; };
BE00F8B5213ED543001CE2D4 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = BE00F8B4213ED543001CE2D4 /* libiconv.tbd */; };
BE00F8B7213ED573001CE2D4 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = BE00F8B6213ED573001CE2D4 /* libz.tbd */; };
+ BE18C7DE226DE09A001AD27E /* Branding in Resources */ = {isa = PBXBuildFile; fileRef = BE18C7DD226DE09A001AD27E /* Branding */; };
BE5EB5C1213FE29900E0826C /* Log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE5EB5B9213FE29900E0826C /* Log.cpp */; };
BE5EB5C2213FE29900E0826C /* SpookyV2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE5EB5BA213FE29900E0826C /* SpookyV2.cpp */; };
BE5EB5C3213FE29900E0826C /* Session.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE5EB5BB213FE29900E0826C /* Session.cpp */; };
@@ -76,6 +77,7 @@
BE00F89E21396585001CE2D4 /* images */ = {isa = PBXFileReference; lastKnownFileType = folder; name = images; path = ../../../loleaflet/dist/images; sourceTree = "<group>"; };
BE00F8B4213ED543001CE2D4 /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
BE00F8B6213ED573001CE2D4 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+ BE18C7DD226DE09A001AD27E /* Branding */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Branding; path = Mobile/Branding; sourceTree = SOURCE_ROOT; };
BE34D10F218B66B600815297 /* docsh.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docsh.cxx; path = "../../ios-device/sw/source/uibase/app/docsh.cxx"; sourceTree = "<group>"; };
BE34D110218B66B600815297 /* docstyle.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docstyle.cxx; path = "../../ios-device/sw/source/uibase/app/docstyle.cxx"; sourceTree = "<group>"; };
BE34D111218B66B600815297 /* docshdrw.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docshdrw.cxx; path = "../../ios-device/sw/source/uibase/app/docshdrw.cxx"; sourceTree = "<group>"; };
@@ -880,6 +882,7 @@
BE00F8922139494E001CE2D4 /* Resources */ = {
isa = PBXGroup;
children = (
+ BE18C7DD226DE09A001AD27E /* Branding */,
BEB0E5D821C7CA800085A0CF /* Settings.bundle */,
BE80E46721B7066C00859C97 /* Templates */,
BE80E43121AD92F600859C97 /* Fonts */,
@@ -2211,6 +2214,7 @@
BE8D773D2136762600AC58EA /* LaunchScreen.storyboard in Resources */,
BE00F8A121396585001CE2D4 /* bundle.css in Resources */,
BE8D85CF214055F3009F1860 /* udkapi.rdb in Resources */,
+ BE18C7DE226DE09A001AD27E /* Branding in Resources */,
BE8D85D5214055F3009F1860 /* unorc in Resources */,
BE8D85D1214055F3009F1860 /* services.rdb in Resources */,
BE93D41F216B93D8007A39F4 /* discovery.xml in Resources */,
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index bc16fb254..7854ed0c2 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -56,6 +56,8 @@ ifelse(MOBILEAPP,[true],
])dnl
)dnl
<!--%BRANDING_CSS%--> <!-- add your logo here -->
+ifelse(IOSAPP,[true],
+ [<link rel="stylesheet" href="Branding/branding.css">])
ifelse(MOBILEAPP,[true],
[<link rel="localizations" href="l10n/uno-localizations-override.json" type="application/vnd.oftn.l10n+json"/>
<link rel="localizations" href="l10n/localizations.json" type="application/vnd.oftn.l10n+json"/>
More information about the Libreoffice-commits
mailing list