haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Propagate core and online git hashes to the Settings for the iOS app 

The git hashes now show up in the Settings app, without having to run
the Collabora Office app, open a document, and check the About dialog.

The core git hash is taken from the core build directory's
instdir/program/setuprc.

Also, drop the fairly pointless lone Finnish localisation of the
Settings strings.

Change-Id: I56631f8facde017ed99038209c55f516386eab99
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91073
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
distro/collabora/co-4-2-2
Tor Lillqvist 2020-03-25 22:49:42 +02:00
parent 98c08b50ce
commit 4dd95f833d
4 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -332,6 +332,7 @@ POCOINCLUDE_ARM64_V8A=
POCOLIB=
POCOLIB_ARM64_V8A=
POCODEBUG=
CORE_VERSION_HASH=""
if test \( "$enable_iosapp" = "yes" -a `uname -s` = "Darwin" \) -o \( "$enable_androidapp" = "yes" \); then
AC_MSG_CHECKING([for LibreOffice build tree to build against])
if test -z "$with_lo_builddir"; then
@ -356,6 +357,9 @@ if test \( "$enable_iosapp" = "yes" -a `uname -s` = "Darwin" \) -o \( "$enable_a
fi
fi
# Get the git hash of the core build
CORE_VERSION_HASH=`cd $LOBUILDDIR && grep buildid instdir/program/setuprc | sed -e 's/buildid=//' -e 's/............................$//'`
# Sanity check, just a random object file in the LibreOffice build tree
if test \( "$enable_iosapp" = "yes" -a -f "$LOBUILDDIR/workdir/CxxObject/vcl/ios/iosinst.o" \) -o \( "$enable_androidapp" = "yes" -a -f "$LOBUILDDIR/workdir/LinkTarget/StaticLibrary/liblibpng.a" \); then
AC_MSG_RESULT([$LOBUILDDIR])
@ -433,6 +437,9 @@ AC_SUBST(POCOINCLUDE_ARM64_V8A)
AC_SUBST(POCOLIB)
AC_SUBST(POCOLIB_ARM64_V8A)
AC_SUBST(POCODEBUG)
AC_SUBST([CORE_VERSION_HASH])
AC_DEFINE_UNQUOTED([CORE_VERSION_HASH],[["$CORE_VERSION_HASH"]],[LibreOffice core git hash if present])
LIBPNG_INCLUDES="$with_libpng_includes"
LIBPNG_LIBS="$with_libpng_libs"
@ -1020,6 +1027,7 @@ AC_CONFIG_FILES([Makefile
gtk/Makefile
ios/config.h
ios/Mobile/Info.plist
ios/Mobile/Resources/Settings.bundle/Root.plist
test/Makefile
loleaflet/Makefile
loleaflet/npm-shrinkwrap.json

18
ios/Mobile/Resources/Settings.bundle/Root.plist → ios/Mobile/Resources/Settings.bundle/Root.plist.in
View File

@ -10,15 +10,27 @@
<key>Type</key>
<string>PSGroupSpecifier</string>
<key>Title</key>
<string>App info</string>
<string>Version information</string>
</dict>
<dict>
<key>Type</key>
<string>PSTitleValueSpecifier</string>
<key>Title</key>
<string>Version</string>
<string>Online git hash</string>
<key>Key</key>
<string>version</string>
<string>onlineVersion</string>
<key>DefaultValue</key>
<string>@LOOLWSD_VERSION_HASH@</string>
</dict>
<dict>
<key>Type</key>
<string>PSTitleValueSpecifier</string>
<key>Title</key>
<string>Core git hash</string>
<key>Key</key>
<string>coreVersion</string>
<key>DefaultValue</key>
<string>@CORE_VERSION_HASH@</string>
</dict>
<dict>
<key>Type</key>

5
ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings
View File

@ -1,6 +1,7 @@
/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */
"App info" = "App info";
"Version" = "Version";
"Version information" = "Version information";
"Online git hash" = "Online git hash";
"Core git hash" = "Core git hash";
"Settings" = "Settings";
"Template list URL" = "Template list URL";

6
ios/Mobile/Resources/Settings.bundle/fi.lproj/Root.strings
View File

@ -1,6 +0,0 @@
/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */
"App info" = "Tietoa appista";
"Version" = "Versio";
"Settings" = "Asetukset";
"Template list URL" = "Mallilistan URL";