[PATCH v2 util-macros] XORG_GIT_MODULE_VERSION: writes module version in xorg-git-version.h

[Gaetan Nadon]

Generates the git module version according to the "git describe HEAD"
The module version number may be appended "with-uncommitted-changes"
If not building under git, #undef XORG_GIT_VERSION is written

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 xorg-macros.m4.in |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
index 916b472..66c8e98 100644
--- a/xorg-macros.m4.in
+++ b/xorg-macros.m4.in
@@ -1009,3 +1009,23 @@ mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
 echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
 AC_SUBST([INSTALL_CMD])
 ]) # XORG_INSTALL
+
+# XORG_GIT_MODULE_VERSION()
+# -------------------------
+# Minimum version: 1.8.0
+#
+# Generates the git module version according to the "git describe HEAD"
+# The module version number may be appended "with-uncommitted-changes"
+# If not building under git, #undef XORG_GIT_VERSION is written
+#
+AC_DEFUN([XORG_GIT_MODULE_VERSION], [
+GIT_MODULE_VERSION_CMD="VER=\`GIT_DIR=\$(top_srcdir)/.git git describe HEAD 2>/dev/null\`; \
+DVER=\`GIT_DIR=\$(top_srcdir)/.git git diff-index HEAD 2>/dev/null\`; \
+OUTSTR=\"\#undef XORG_GIT_VERSION\" ; \
+OUTFILE=\$(@); \
+test -n \"\$\$VER\" && OUTSTR=\"\#define XORG_GIT_VERSION \$\$VER\"; \
+test -n \"\$\$DVER\" && OUTSTR=\"\$\$OUTSTR-with-uncommitted-changes\"; \
+test -e \"\$\$OUTFILE\" || echo \"\$\$OUTSTR\" > \"\$\$OUTFILE\"; \
+CONTENT=\`cat \$\$OUTFILE\` && test \"\$\$CONTENT\" = \"\$\$OUTSTR\" || echo \$\$OUTSTR > \$\$OUTFILE;"
+AC_SUBST([GIT_MODULE_VERSION_CMD])
+]) # XORG_GIT_MODULE_VERSION
-- 
1.6.0.4

Second edition

Use $@ for OUTFILE
Replace -dirty with "-with-uncommitted-changes"
Split test for VER and DVER