Use the app name more generally, not only on iOS.
Preparation for using it on Android too. Change-Id: Iee7778b2625a02a98daff5df87c39f4ab1d18144 Reviewed-on: https://gerrit.libreoffice.org/70651 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>private/mmeeks/thread-png
parent
1385f11f6e
commit
ea659b3d99
20
configure.ac
20
configure.ac
|
@ -73,10 +73,6 @@ AC_ARG_ENABLE([iosapp],
|
|||
to be copied to a Mac where the iOS app is being built, *or* in a tree where
|
||||
you will build the iOS app.]))
|
||||
|
||||
AC_ARG_WITH([iosapp-name],
|
||||
AS_HELP_STRING([--with-iosapp-name=<name>],
|
||||
[Set the user-visible name of the iOS app you build. Default "Mobile".]))
|
||||
|
||||
AC_ARG_WITH([iosapp-appicon],
|
||||
AS_HELP_STRING([--with-iosapp-appicon=<path>],
|
||||
[Point to a directory containing an icon set to use instead of the default empty one.]))
|
||||
|
@ -98,6 +94,10 @@ AC_ARG_ENABLE([androidapp],
|
|||
to work similarly to the iOS app, from the JavaScript and the pseudo WebSocket
|
||||
message plumbing point of view.]))
|
||||
|
||||
AC_ARG_WITH([app-name],
|
||||
AS_HELP_STRING([--with-app-name=<name>],
|
||||
[Set the user-visible name of the app you build.]))
|
||||
|
||||
AC_ARG_ENABLE([seccomp],
|
||||
AS_HELP_STRING([--disable-seccomp],
|
||||
[Disable use of linux/seccomp.h header when kernel on target system does not support it.
|
||||
|
@ -320,15 +320,18 @@ AC_SUBST(LIBPNG_INCLUDES)
|
|||
AC_SUBST(LIBPNG_LIBS)
|
||||
AC_SUBST(LOKIT_PATH)
|
||||
|
||||
APP_NAME="LOOL"
|
||||
if test -n "$with_app_name"; then
|
||||
APP_NAME="$with_app_name"
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([APP_NAME],["$APP_NAME"],[The user-visible name of the app you build.])
|
||||
AC_SUBST(APP_NAME)
|
||||
|
||||
ENABLE_IOSAPP=
|
||||
MOBILE_APP_NAME="Mobile"
|
||||
IOSAPP_BUNDLE_VERSION=
|
||||
|
||||
if test "$enable_iosapp" = "yes"; then
|
||||
ENABLE_IOSAPP=true
|
||||
if test -n "$with_iosapp_name"; then
|
||||
MOBILE_APP_NAME="$with_iosapp_name"
|
||||
fi
|
||||
|
||||
if test -f BUNDLE-VERSION; then
|
||||
IOSAPP_BUNDLE_VERSION=$(cat BUNDLE-VERSION)
|
||||
|
@ -340,7 +343,6 @@ fi
|
|||
|
||||
AC_SUBST(ENABLE_IOSAPP)
|
||||
AM_CONDITIONAL([ENABLE_IOSAPP], [test "$ENABLE_IOSAPP" = "true"])
|
||||
AC_SUBST(MOBILE_APP_NAME)
|
||||
AC_SUBST(IOSAPP_BUNDLE_VERSION)
|
||||
|
||||
ENABLE_GTKAPP=
|
||||
|
|
|
@ -210,7 +210,7 @@
|
|||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>$(DEVELOPMENT_LANGUAGE)</string>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>@MOBILE_APP_NAME@</string>
|
||||
<string>@APP_NAME@</string>
|
||||
<key>CFBundleDocumentTypes</key>
|
||||
<array>
|
||||
<!-- Document sub-types are listed in order ODF, OOXML, MSO, other -->
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
/* config.h. Manually edited from config.h.in. */
|
||||
/* config.h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
#define APP_NAME "@APP_NAME@"
|
||||
|
||||
/* Whether to disable SECCOMP */
|
||||
#define DISABLE_SECCOMP 1
|
||||
|
||||
|
|
|
@ -222,7 +222,7 @@ $(builddir)/dist/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HT
|
|||
-DIOSAPP=$(ENABLE_IOSAPP) \
|
||||
-DGTKAPP=$(ENABLE_GTKAPP) \
|
||||
-DANDROIDAPP=$(ENABLE_ANDROIDAPP) \
|
||||
-DMOBILEAPPNAME="$(MOBILE_APP_NAME)" \
|
||||
-DMOBILEAPPNAME="$(APP_NAME)" \
|
||||
-DLOLEAFLET_CSS="$(subst $(SPACE),$(COMMA),$(LOLEAFLET_CSS_M4))" \
|
||||
-DBUNDLE_CSS="$(abs_builddir)/dist/bundle.css" \
|
||||
-DGLOBAL_JS="$(abs_builddir)/dist/global.js" \
|
||||
|
|
|
@ -2780,6 +2780,9 @@ private:
|
|||
// Hint to encourage use on mobile devices
|
||||
capabilities->set("hasMobileSupport", true);
|
||||
|
||||
// Set the product name
|
||||
capabilities->set("productName", APP_NAME);
|
||||
|
||||
std::ostringstream ostrJSON;
|
||||
capabilities->stringify(ostrJSON);
|
||||
return ostrJSON.str();
|
||||
|
|
Loading…
Reference in New Issue