XXX Add GIT_COMMIT_HASH to autoconf version message

Add the GIT_COMMIT_HASH to the version message printed by
"avrdude -?" and in the avrdude.conf avrdude_conf_version line.

This should produce the same version message as cmake builds
produce.

TODO: Code basically works, but needs cleanups, tests and fixes.

Author: ndim

src/GNUmakefile.in

@@ -4,7 +4,7 @@ include Makefile
 AUTORECONF ?= autoreconf
 AUTORECONF_OPTS ?= -vis
 
-script_version := $(shell $(top_srcdir)/build-helpers/package-version $(top_srcdir) version-stamp)
+script_version := $(shell $(top_srcdir)/build-helpers/package-version $(top_srcdir) version-stamp git-commit-hash-stamp | { read version hash; echo "$$version"; })
 ifneq ($(PACKAGE_VERSION),$(script_version))
 $(info autoconf and script versions do not match: $(PACKAGE_VERSION) vs $(script_version))
 $(info Removing autom4te.cache and related files and re-running autoreconf)

src/build-helpers/package-version

@@ -21,40 +21,50 @@ prog="$(basename "$0")"
 top_srcdir="${1-.}"
 test -d "$top_srcdir" || { \
     echo "$prog: Error: Could not change to top_srcdir '$1'" >&2; \
-    echo "version_error_1" | ${TR-tr} -d '\012'
+    echo "version_error_01" | ${TR-tr} -d '\012'
     exit 2; \
 }
 version_stamp="${2-version-stamp}"
+git_commit_hash_stamp="${3-git-commit-hash-stamp}"
 
 # echo "$prog: Error: Some error happend." >&2
-# echo "version_error_2" | ${TR-tr} -d '\012'
+# echo "version_error_02" | ${TR-tr} -d '\012'
 # exit 2
 
 # Is this a dist source tree?
 # If so, use the version number from the version_stamp file.
 if test -f "$top_srcdir/$version_stamp"; then
-    cat "$top_srcdir/$version_stamp" | ${TR-tr} -d '\012'
-    exit
+    if test -f "$top_srcdir/$git_commit_hash_stamp"; then
+        echo "$(cat "$top_srcdir/$version_stamp") $(cat "$top_srcdir/$git_commit_hash_stamp")" | ${TR-tr} -d '\012'
+        exit
+    else
+        cat "$top_srcdir/$version_stamp" | ${TR-tr} -d '\012'
+        exit
+    fi
+elif test -f "$top_srcdir/$git_commit_hash_stamp"; then
+    echo "$prog: Error: Found git-commit-hash-stamp file, but not version-stamp file.." >&2
+    echo "version_error_11" | ${TR-tr} -d '\012'
+    exit 2
 fi
 
 # Is this part of a git checkout or an expanded github snapshot tarball?
 test -f "$top_srcdir/../CMakeLists.txt" || { \
     echo "$prog: Error: top-level avrdude CMakeLists.txt file not found" >&2; \
-    echo "version_error_3" | ${TR-tr} -d '\012'
+    echo "version_error_21" | ${TR-tr} -d '\012'
     exit 2; \
 }
 
 if PROJECT_VERSION="$(${SED-sed} -n 's/project(avrdude[[:space:]]\{1,\}VERSION[[:space:]]\{1,\}\([0-9\.]\{1,\}\)[[:space:]]\{1,\}.*/\1/p' "$top_srcdir/../CMakeLists.txt")"; then
     :
 else
     echo "$prog: Error parsing top-level avrdude 'CMakeLists.txt'." >&2
-    echo "version_error_4" | ${TR-tr} -d '\012'
+    echo "version_error_22" | ${TR-tr} -d '\012'
     exit 2
 fi
 
 test -n "$PROJECT_VERSION" || { \
     echo "$prog: Error: Could not find project(...) in top-level avrdude 'CMakeLists.txt'" >&2; \
-    echo "version_error_5" | ${TR-tr} -d '\012'
+    echo "version_error_23" | ${TR-tr} -d '\012'
     exit 2; \
 }
 
@@ -85,7 +95,7 @@ if test -d "$GIT_DIR"; then
         echo "${PROJECT_VERSION}" | ${TR-tr} -d '\012'
         exit
     else
-        echo "${PROJECT_VERSION}-${GIT_COMMIT_DATE}" | ${TR-tr} -d '\012'
+        echo "${PROJECT_VERSION}-${GIT_COMMIT_DATE} ${GIT_COMMIT_HASH}" | ${TR-tr} -d '\012'
         exit
     fi
 else
@@ -97,6 +107,6 @@ else
     exit
 fi
 
-# If everything else has failed, call this version "devel"
-echo "devel" | ${TR-tr} -d '\012'
+# This should never be reached
+echo "version_error_99" | ${TR-tr} -d '\012'
 exit 2

src/build-helpers/package-version.mk

@@ -8,7 +8,7 @@ distcheck-hook: cur-version-check
 #       restart the whole dist process from the start and there is none.
 EXTRA_DIST += $(top_srcdir)/$(BUILD_SCRIPT_DIR)/package-version
 cur-version-check:
-	@cur_ver=`$(top_srcdir)/$(BUILD_SCRIPT_DIR)/package-version $(top_srcdir) version-stamp`; \
+	@cur_ver="$$($(top_srcdir)/$(BUILD_SCRIPT_DIR)/package-version $(top_srcdir) version-stamp git-commit-hash-stamp | { read version hash; echo "$$version"; })"; \
 	if test "x$${cur_ver}" = "x$(PACKAGE_VERSION)"; then :; else \
 		echo "ERROR: Recorded PACKAGE_VERSION and current version do not match:"; \
 		echo "         current  version:         $${cur_ver}"; \
@@ -24,3 +24,4 @@ cur-version-check:
 # up anywhere.
 cur-version-stamp:
 	echo "$(PACKAGE_VERSION)" > "$(distdir)/version-stamp"
+	test "x$(GIT_COMMIT_HASH)" = x || echo "$(GIT_COMMIT_HASH)" > "$(distdir)/git-commit-hash-stamp"

src/configure.ac

@@ -35,11 +35,22 @@ dnl 2013-06-20 automake 1.14
 dnl 2018-02-25 automake 1.16
 dnl 2018-03-11 automake 1.16.1  install-sh symlink fix
 
+m4_pattern_forbid([ndim4_])
+m4_define([ndim4_COMBINED], m4_esyscmd(./build-helpers/package-version . version-stamp git-commit-hash-stamp))
+m4_define([ndim4_SPLIT], m4_split(ndim4_COMBINED))
+m4_define([ndim4_VERSION], m4_car(ndim4_SPLIT))
+m4_define([ndim4_GIT_COMMIT_HASH], m4_argn(2, ndim4_SPLIT))
 AC_PREREQ([2.69])
 AC_INIT([avrdude],
-        [m4_esyscmd(./build-helpers/package-version . version-stamp)],
+        m4_defn([ndim4_VERSION]),
         [https://github.com/avrdudes/avrdude/issues])
 
+ndim_COMBINED=m4_defn([ndim4_COMBINED])
+ndim_SPLIT=m4_defn([ndim4_SPLIT])
+ndim_VERSION=m4_defn([ndim4_VERSION])
+ndim_GIT_COMMIT_HASH=m4_defn([ndim4_GIT_COMMIT_HASH])
+AC_SUBST([GIT_COMMIT_HASH], [m4_defn([ndim4_GIT_COMMIT_HASH])])
+
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
@@ -598,8 +609,11 @@ AC_CONFIG_FILES([
 ])
 
 # Pass version number into avrdude.conf
-dnl AVRDUDE_FULL_VERSION="${PACKAGE_VERSION} (${GIT_COMMIT_HASH})"
-AVRDUDE_FULL_VERSION="$PACKAGE_VERSION"
+AS_VAR_IF([GIT_COMMIT_HASH], [], [dnl
+	AVRDUDE_FULL_VERSION="$PACKAGE_VERSION"
+], [dnl
+	AVRDUDE_FULL_VERSION="$PACKAGE_VERSION ($GIT_COMMIT_HASH)"
+])
 AC_DEFINE_UNQUOTED([AVRDUDE_FULL_VERSION], ["$AVRDUDE_FULL_VERSION"],
                    [The full avrdude version as displayed in -? and avrdude.conf])
 AC_SUBST([AVRDUDE_FULL_VERSION])