From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 4 May 2006 09:38:51 +0000 (-0400)
Subject: clean up the version generation stuff.
X-Git-Tag: NTP_4_2_1P242_RC~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1e923235cbb32736119072ede4cc5a291388b86;p=thirdparty%2Fntp.git

clean up the version generation stuff.

bk: 4459cbabgBypeErEyj1uZzn1V4xi8A
---

diff --git a/Makefile.am b/Makefile.am
index f6435f462..cbbbbcbed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,6 +60,7 @@ EXTRA_DIST = \
 	excludes \
 	flock-build \
 	install-sh \
+	packageinfo.sh \
 	readme.y2kfixes \
 	results.y2kfixes \
 	\
@@ -68,7 +69,8 @@ EXTRA_DIST = \
 	libisc \
 	ports \
 	\
-	version
+	version \
+	version.m4
 
 DISTCLEANFILES = .gcc-warning
 
@@ -79,7 +81,7 @@ ETAGS_ARGS = Makefile.am configure.ac
 # DIST_HOOK_DIRS = conf html scripts ports
 
 # HMS: Keep .gcc-warning first, as that way it gets printed first.
-BUILT_SOURCES = .gcc-warning $(srcdir)/COPYRIGHT $(srcdir)/version
+BUILT_SOURCES = .gcc-warning $(srcdir)/COPYRIGHT $(srcdir)/version $(srcdir)/version.m4 $(srcdir)/include/version.def
 
 $(srcdir)/COPYRIGHT: $(srcdir)/html/copyright.html
 	( echo "This file is automatically generated from html/copyright.html" ; lynx -dump $(srcdir)/html/copyright.html ) > $(srcdir)/COPYRIGHT.new && mv $(srcdir)/COPYRIGHT.new $(srcdir)/COPYRIGHT
@@ -96,6 +98,14 @@ $(srcdir)/version: FRC.version
 	    y=`cat version 2>/dev/null` || true && \
 	    case "$$x" in ''|$$y) ;; *) echo $$x > version ;; esac
 
+$(srcdir)/version.m4: $(srcdir)/packageinfo.sh
+	cd $(srcdir) && \
+	./scripts/genver version.m4
+
+$(srcdir)/include/version.def: $(srcdir)/packageinfo.sh
+	cd $(srcdir) && \
+	./scripts/genver include/version.def
+
 dist-hook:
 	@find $(distdir) -type d -name CVS -print | xargs rm -rf
 	@find $(distdir) -type d -name SCCS -print | xargs rm -rf
diff --git a/bootstrap b/bootstrap
index 7191931de..b4769d08b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -27,9 +27,9 @@
 
 set -e
 
-. ./packageinfo.sh
+#. ./packageinfo.sh
 
-dversion=`scripts/VersionName`
+scripts/genver
 
 #rm -rf sntp/libopts*
 #gunzip -c $(autoopts-config --libsrc) | (
@@ -41,10 +41,6 @@ dversion=`scripts/VersionName`
 #    egrep -l '^prog.name' $(
 #        find * -type f -name *.def|fgrep -v /SCCS/))
 
-echo "m4_define([VERSION_NUMBER],[${dversion}])" > version.m4
-
-echo "version = '${dversion}';" > include/version.def
-
 incdir=${PWD}/include
 
 #for f in ${prog_opt_files}
diff --git a/include/Makefile.am b/include/Makefile.am
index 6c53029b7..c0f73376d 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,7 +1,7 @@
 #AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 ETAGS_ARGS = $(srcdir)/Makefile.am
-#EXTRA_DIST = TAGS
+EXTRA_DIST = version.def
 
 SUBDIRS = isc
 
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 48dad395b..1f8724c79 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,4 +1,4 @@
 bin_SCRIPTS=	ntp-wait ntptrace
 noinst_SCRIPTS=	calc_tickadj checktime freq_adj html2man mkver ntpsweep ntpver plot_summary summary
-EXTRA_DIST = fixautomakedepsmagic hpadjtime.sh monitoring ntp-close \
-	ntp-groper ntp-restart ntp-status rc1 rc2 stats
+EXTRA_DIST = VersionName fixautomakedepsmagic genver hpadjtime.sh monitoring \
+	ntp-close ntp-groper ntp-restart ntp-status rc1 rc2 stats
diff --git a/scripts/genver b/scripts/genver
new file mode 100755
index 000000000..3a6bb8367
--- /dev/null
+++ b/scripts/genver
@@ -0,0 +1,59 @@
+#! /bin/sh
+
+# possible usage: $0 [-f] [version.m4] [version.def]
+#
+# -f would be 'force the update'
+
+usecmp=true
+outputs=
+for i in $*
+do
+    case "$i" in
+     -f) usecmp=false ;;
+     version.m4)
+	outputs="version.m4 $outputs"
+	;;
+     *version.def)
+	outputs="include/version.def $outputs"
+	;;
+     *) echo "Unrecognized option: $i"
+	exit 1
+	;;
+    esac
+done
+
+case "$outputs" in
+ '') outputs="version.m4 include/version.def" ;;
+esac
+
+set -e
+
+. ./packageinfo.sh
+
+dversion=`scripts/VersionName`
+
+set +e
+
+case "$outputs" in
+ *version.m4*)
+    echo "m4_define([VERSION_NUMBER],[${dversion}])" > version.m4+
+    if $usecmp || cmp version.m4+ version.m4
+    then
+	rm -f version.m4+
+    else
+	mv version.m4+ version.m4
+    fi
+    ;;
+esac
+
+case "$outputs" in
+ *version.def*)
+    echo "version = '${dversion}';" > include/version.def+
+    if $usecmp || cmp include/version.def+ include/version.def
+    then
+	rm -f include/version.def+
+    else
+	mv include/version.def+ include/version.def
+    fi
+    ;;
+esac