[Libreoffice-commits] online.git: configure.ac ios/Mobile

[Tor Lillqvist (via logerrit)]

 configure.ac                                               |    8 +++++
 ios/Mobile/Resources/Settings.bundle/Root.plist.in         |   18 ++++++++++---
 ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings |    5 ++-
 ios/Mobile/Resources/Settings.bundle/fi.lproj/Root.strings |    6 ----
 4 files changed, 26 insertions(+), 11 deletions(-)

New commits:
commit 4dd95f833de4d559d69735bffcc70bee5625ff80
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Mar 25 22:49:42 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Mar 26 00:26:58 2020 +0100

    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 at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/configure.ac b/configure.ac
index efd54b872..a90ee2d62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/ios/Mobile/Resources/Settings.bundle/Root.plist b/ios/Mobile/Resources/Settings.bundle/Root.plist.in
similarity index 65%
rename from ios/Mobile/Resources/Settings.bundle/Root.plist
rename to ios/Mobile/Resources/Settings.bundle/Root.plist.in
index f7e9d7653..0d7966f1e 100644
--- a/ios/Mobile/Resources/Settings.bundle/Root.plist
+++ b/ios/Mobile/Resources/Settings.bundle/Root.plist.in
@@ -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>
diff --git a/ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings b/ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings
index 08caa0eba..9459fe693 100644
--- a/ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings
+++ b/ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings
@@ -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";
diff --git a/ios/Mobile/Resources/Settings.bundle/fi.lproj/Root.strings b/ios/Mobile/Resources/Settings.bundle/fi.lproj/Root.strings
deleted file mode 100644
index 041205243..000000000
--- a/ios/Mobile/Resources/Settings.bundle/fi.lproj/Root.strings
+++ /dev/null
@@ -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";