From: John Ellson <john.ellson@gmail.com>
Date: Mon, 15 Jul 2019 14:28:38 +0000 (-0400)
Subject: some cleanup of versioning info
X-Git-Tag: 2.42.2~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7736a775c14069b893998e610e2ca4e14dc07306;p=graphviz

some cleanup of versioning info
---

diff --git a/.gitignore b/.gitignore
index 4305e2916..55e4cde6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ CMakeCache.txt
 # product of: make dist
 graphviz-*.tar.gz
 VERSION
+COLLECTION
 
 lib/rxspencer/re
 lib/rxspencer/*.oo
diff --git a/Makefile.am b/Makefile.am
index 4e943c00d..3b31f5117 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,7 @@ doxygen:
 
 dist-hook:
 	echo "@VERSION@" >VERSION
+	echo "@GRAPHVIZ_COLLECTION@" >COLLECTION
 #	find $(distdir) -name CVS -type d -prune -exec rm -rf {} \;
 #	rm -f ToPAS
 #	find $(distdir) -type f -exec md5sum {} >>ToPAS \;
diff --git a/autogen.sh b/autogen.sh
index 893df6095..59d4f3df1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -31,21 +31,24 @@ dnl For the minor number: odd => unstable series
 dnl                       even => stable series
 dnl For the micro number: 0 => in-progress development
 dnl                       timestamp => tar-file snapshot or release
+
+dnl uncomment the next 4 lines for development releases, minor version must be odd
 m4_define([graphviz_version_major],[2])
 m4_define([graphviz_version_minor],[43])
+m4_define([graphviz_version_micro],[$GRAPHVIZ_VERSION_DATE])
+m4_define([graphviz_collection],[development])
 
-dnl NB: The next line is for hard-coding the micro version for stable releases
+dnl uncomment the next 4 lines for stable releases, minor version must be even
+dnl m4_define([graphviz_version_major],[2])
+dnl m4_define([graphviz_version_minor],[43])
 dnl m4_define([graphviz_version_micro],[0])
-
-dnl NB: the next line gets changed to a date/time string for development releases
-m4_define([graphviz_version_micro],[$GRAPHVIZ_VERSION_DATE])
+dnl m4_define([graphviz_collection],[stable])
 
 m4_define([graphviz_version_date],[$GRAPHVIZ_VERSION_DATE])
 m4_define([graphviz_change_date],["$GRAPHVIZ_CHANGE_DATE"])
 m4_define([graphviz_git_date],["$GRAPHVIZ_GIT_DATE"])
 m4_define([graphviz_author_name],["$GRAPHVIZ_AUTHOR_NAME"])
 m4_define([graphviz_author_email],[$GRAPHVIZ_AUTHOR_EMAIL])
-m4_define([graphviz_collection],[development])
 m4_define([graphviz_version_commit],[$GRAPHVIZ_VERSION_COMMIT])
 
 EOF