configure.ac | 1 +
ios/config.h.in | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 8dee7815428e5895bb4876901fa58f9afe2231ed
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Tue Nov 27 01:03:00 2018 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Tue Nov 27 01:05:04 2018 +0200
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
diff --git a/configure.ac b/configure.ac
index cc23e8c31..bc7353d42 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 "."
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
