From 734360a29a89a36d458d1eba624e7cf31d031416 Mon Sep 17 00:00:00 2001 From: John Ellson Date: Wed, 20 May 2015 15:50:16 -0400 Subject: [PATCH] always use date of last commit in version, even for stable --- autogen.sh | 7 +++---- configure.ac | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/autogen.sh b/autogen.sh index 764823cae..36d25385a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -5,9 +5,8 @@ if test $? -eq 0; then GRAPHVIZ_VERSION_DATE=$( date -u +%Y%m%d.%H%M -d @$GRAPHVIZ_VERSION_DATE ) echo "Version date is based on time of last commit: $GRAPHVIZ_VERSION_DATE" else - GRAPHVIZ_VERSION_DATE=$( date -u +%Y%m%d.%H%M ) - echo "Warning: we do not appear to be running in a git clone." - echo "Version date is based on time now: $GRAPHVIZ_VERSION_DATE" + GRAPHVIZ_VERSION_DATE="0" + echo "Warning: we do not appear to be running in a git clone." >$2 fi # initialize version for a "stable" build @@ -20,7 +19,7 @@ dnl timestamp => tar-file snapshot or release m4_define(graphviz_version_major, 2) m4_define(graphviz_version_minor, 39) dnl NB: the next line gets changed to a date/time string for development releases -m4_define(graphviz_version_micro, 0) +m4_define(graphviz_version_micro, $GRAPHVIZ_VERSION_DATE) m4_define(graphviz_version_date, $GRAPHVIZ_VERSION_DATE) m4_define(graphviz_collection, test) m4_define(graphviz_version_commit, unknown) diff --git a/configure.ac b/configure.ac index b9ad708cb..e70f874a3 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ GRAPHVIZ_VERSION_MICRO=graphviz_version_micro() #NB: "stable" or "development" GRAPHVIZ_COLLECTION=graphviz_collection() -#NB: date/time of last commit - or "now" +#NB: date/time of last commit - or "0" GRAPHVIZ_VERSION_DATE=graphviz_version_date() #NB: git commit hash of last commit -- 2.40.0