[Libreoffice-commits] online.git: Branch 'libreoffice-6-2' - configure.ac ios/config.h ios/config.h.in

[Libreoffice Gerrit user]

 configure.ac    |    1 +
 ios/config.h.in |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 77ff86ca0fba1ade5165ff7cc2f6da4ea78d377b
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Nov 27 01:03:00 2018 +0200
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Thu Jan 10 11:58:06 2019 +0100

    Use the right version name and git hash for the iOS app
    
    Propagate the information to the otherwise pre-canned iOS version of
    config.h, too.
    
    Change-Id: Ia459a20b529e2ea02b4e00894521a085a8806d57
    (cherry picked from commit 8dee7815428e5895bb4876901fa58f9afe2231ed)
    Reviewed-on: https://gerrit.libreoffice.org/66079
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/configure.ac b/configure.ac
index 5bc613b5e..d23a5da2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -602,6 +602,7 @@ AC_LINK_FILES([loleaflet/node_shrinkwrap], [loleaflet/node_shrinkwrap])
 
 AC_CONFIG_FILES([Makefile
                  gtk/Makefile
+                 ios/config.h
                  ios/Mobile/Info.plist
                  test/Makefile
                  loleaflet/Makefile
diff --git a/ios/config.h b/ios/config.h.in
similarity index 96%
rename from ios/config.h
rename to ios/config.h.in
index 9f4751035..0911b21fc 100644
--- a/ios/config.h
+++ b/ios/config.h.in
@@ -70,10 +70,10 @@
 #define LOOLWSD_CACHEDIR lo_ios_app_getCacheDir()
 
 /* LibreOffice Online WebSocket server version */
-#define LOOLWSD_VERSION "master" // ???
+#define LOOLWSD_VERSION "@LOOLWSD_VERSION@"
 
 /* LibreOffice Online git hash if present */
-#define LOOLWSD_VERSION_HASH "xxxxxx" // ???
+#define LOOLWSD_VERSION_HASH "@LOOLWSD_VERSION_HASH@"
 
 /* Path to LibreOffice installation */
 #define LO_PATH "."