Makefile.am | 3 +++
configure.ac | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 8f1d039aa347b637065929a6053a6054bf28c777
Author: Jan Holesovsky <ke...@collabora.com>
Date: Fri Apr 28 11:54:18 2017 +0200
Distribute the git hash for easier identification.
Change-Id: I57084231d0878de15b4b0478122f49e94af563bf
Reviewed-on: https://gerrit.libreoffice.org/37061
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/Makefile.am b/Makefile.am
index a348f3f4..9091f993 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -185,6 +185,9 @@ noinst_HEADERS = $(wsd_headers) $(shared_headers)
$(kit_headers) \
test/countloolkits.hpp \
test/helpers.hpp
+dist-hook:
+ git log -1 --format=%h > $(distdir)/dist_git_hash 2> /dev/null || rm
$(distdir)/dist_git_hash
+
EXTRA_DIST = discovery.xml \
favicon.ico \
loolkitconfig.xcu \
diff --git a/configure.ac b/configure.ac
index b04b8ea9..bff85872 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@
AC_DEFINE_UNQUOTED([LOOLWSD_VERSION],[["$LOOLWSD_VERSION"]],[LibreOffice Online
# try to add a git hash for a version if we're developing
LOOLWSD_VERSION_HASH="$LOOLWSD_VERSION"
-git_hash=`cd ${srcdir} && git log -1 --format=%h 2> /dev/null`
+git_hash=`cd ${srcdir} && ( cat dist_git_hash 2> /dev/null || git log -1
--format=%h 2> /dev/null )`
if test "z$git_hash" != "z"; then
LOOLWSD_VERSION_HASH=$git_hash
fi
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
