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

[Dan Nicholson]

On Mon, Apr 19, 2010 at 11:52 AM, Gaetan Nadon <memsize at videotron.ca> wrote:
> Generates the git module version according to the "git describe HEAD"
> If the git module has pending changes, it appends "-dirty" to the version tag
>
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
>  xorg-macros.m4.in |   18 ++++++++++++++++++
>  1 files changed, 18 insertions(+), 0 deletions(-)
>
> diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
> index 916b472..efb2e53 100644
> --- a/xorg-macros.m4.in
> +++ b/xorg-macros.m4.in
> @@ -1009,3 +1009,21 @@ 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"
> +# If the git module has pending changes, it appends "-dirty" to the version tag
> +#
> +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=\"xorg-git-version.h\"; \

IMO, OUTFILE should just be $@. Then the module has flexibility over
what the header is called.

> +test -n \"\$\$VER\" && OUTSTR=\"\#define XORG_GIT_VERSION \$\$VER\" && test -n \"\$\$DVER\" && OUTSTR=\"\#define XORG_GIT_VERSION \$\$VER-dirty\"; \

I don't I like "dirty" going in the version since it doesn't really
provide any further information. That could be one string change or it
could be a revamp of a subsystem.

However, if it is kept, can we split this in two lines?

test -n \"\$\$VER\" && OUTSTR=\"\#define XORG_GIT_VERSION \$\$VER\"; \
test -n \"\$\$DVER\" && OUTSTR=\"\$\$OUTSTR-dirty\"; \

If VER isn't set, DVER won't be either.

> +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

I wish it didn't have to be done this way. This is absolutely nasty.
That said, it seems like it would work.

--
Dan