[ntp:bk-ntp-dev-send] BitKeeper patch

Harlan Stenn stenn at mail.eecis.udel.edu
Thu May 4 09:40:06 UTC 2006


This BitKeeper patch contains the following changesets:
stenn at deacon.udel.edu|ChangeSet|20060504093851|43958

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# ID:	stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
# User:	stenn
# Host:	deacon.udel.edu
# Root:	/deacon/backroom/ntp-dev

#--- New file ---
#+++ scripts/genver	06/05/04 05:33:24
##! /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
#
#
#--- 1.50/Makefile.am	2006-03-01 04:19:58 -05:00
#+++ 1.51/Makefile.am	2006-05-04 05:34:46 -04:00
#@@ -60,6 +60,7 @@
# 	excludes \
# 	flock-build \
# 	install-sh \
#+	packageinfo.sh \
# 	readme.y2kfixes \
# 	results.y2kfixes \
# 	\
#@@ -68,7 +69,8 @@
# 	libisc \
# 	ports \
# 	\
#-	version
#+	version \
#+	version.m4
# 
# DISTCLEANFILES = .gcc-warning
# 
#@@ -79,7 +81,7 @@
# # 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
#@@ -95,6 +97,14 @@
#             x=`bk -R prs -hr+ -nd:I: ChangeSet` && \
# 	    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
#
#--- 1.2/bootstrap	2006-04-13 04:14:03 -04:00
#+++ 1.3/bootstrap	2006-05-04 05:35:44 -04:00
#@@ -27,9 +27,9 @@
# 
# set -e
# 
#-. ./packageinfo.sh
#+#. ./packageinfo.sh
# 
#-dversion=`scripts/VersionName`
#+scripts/genver
# 
# #rm -rf sntp/libopts*
# #gunzip -c $(autoopts-config --libsrc) | (
#@@ -40,10 +40,6 @@
# #prog_opt_files=$(
# #    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
# 
#
#--- 1.20/include/Makefile.am	2005-08-26 17:12:02 -04:00
#+++ 1.21/include/Makefile.am	2006-05-04 05:36:21 -04:00
#@@ -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
# 
#
#--- 1.12/scripts/Makefile.am	2005-07-21 15:40:00 -04:00
#+++ 1.13/scripts/Makefile.am	2006-05-04 05:36:55 -04:00
#@@ -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 checksum=c2c9a06a


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20060421040943|32614
D 1.1499 06/05/04 05:38:51-04:00 stenn at deacon.udel.edu +5 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c clean up the version generation stuff.
K 43958
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|Makefile.am|19990526004810|01635|3aed0663 stenn at deacon.udel.edu|Makefile.am|20060504093446|42397
> stenn at whimsy.udel.edu|bootstrap|20060411084755|36539|dc4e8af8b51a337d stenn at deacon.udel.edu|bootstrap|20060504093544|46798
> stenn at whimsy.udel.edu|include/Makefile.am|19990526004814|01635|3aed0663 stenn at deacon.udel.edu|include/Makefile.am|20060504093621|10823
> stenn at whimsy.udel.edu|scripts/Makefile.am|19990824045401|11799|bd702e17 stenn at deacon.udel.edu|scripts/Makefile.am|20060504093655|25268
> stenn at deacon.udel.edu|scripts/genver|20060504093324|22233|f7100ac4e61c056e stenn at deacon.udel.edu|scripts/genver|20060504093325|14598

== scripts/genver ==
New file: scripts/genver
V 4

stenn at deacon.udel.edu|scripts/genver|20060504093324|22233|f7100ac4e61c056e
D 1.0 06/05/04 05:33:24-04:00 stenn at deacon.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
c BitKeeper file /deacon/backroom/ntp-dev/scripts/genver
K 22233
P scripts/genver
R f7100ac4e61c056e
X 0x821
------------------------------------------------


stenn at deacon.udel.edu|scripts/genver|20060504093324|22233|f7100ac4e61c056e
D 1.1 06/05/04 05:33:24-04:00 stenn at deacon.udel.edu +59 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
F 1
K 14598
O -rwxrwxr-x
P scripts/genver
------------------------------------------------

I0 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

== Makefile.am ==
stenn at whimsy.udel.edu|Makefile.am|19990526004810|01635|3aed0663
stenn at deacon.udel.edu|Makefile.am|20060301091958|17360
D 1.51 06/05/04 05:34:46-04:00 stenn at deacon.udel.edu +12 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Deal with packageinfo.sh, version.m4, and include/version.def
K 42397
O -rw-rw-r--
P Makefile.am
------------------------------------------------

I62 1
	packageinfo.sh \
D71 1
I71 2
	version \
	version.m4
D82 1
I82 1
BUILT_SOURCES = .gcc-warning $(srcdir)/COPYRIGHT $(srcdir)/version $(srcdir)/version.m4 $(srcdir)/include/version.def
I97 8
\
$(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

== bootstrap ==
stenn at whimsy.udel.edu|bootstrap|20060411084755|36539|dc4e8af8b51a337d
stenn at whimsy.udel.edu|bootstrap|20060413081403|58405
D 1.3 06/05/04 05:35:44-04:00 stenn at deacon.udel.edu +2 -6
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Use the new scripts/genver to generate the version files
K 46798
O -rwxrwxr-x
P bootstrap
------------------------------------------------

D30 1
I30 1
#. ./packageinfo.sh
D32 1
I32 1
scripts/genver
D43 4

== include/Makefile.am ==
stenn at whimsy.udel.edu|include/Makefile.am|19990526004814|01635|3aed0663
mayer at pogo.udel.edu|include/Makefile.am|20050826211202|10038
D 1.21 06/05/04 05:36:21-04:00 stenn at deacon.udel.edu +1 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c distribute inclue/version.def
K 10823
O -rw-rw-r--
P include/Makefile.am
------------------------------------------------

D4 1
I4 1
EXTRA_DIST = version.def

== scripts/Makefile.am ==
stenn at whimsy.udel.edu|scripts/Makefile.am|19990824045401|11799|bd702e17
kardel at pogo.udel.edu|scripts/Makefile.am|20050721194000|23430
D 1.13 06/05/04 05:36:55-04:00 stenn at deacon.udel.edu +2 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Distribute VersionName and genver.
K 25268
O -rw-rw-r--
P scripts/Makefile.am
------------------------------------------------

D3 2
I4 2
EXTRA_DIST = VersionName fixautomakedepsmagic genver hpadjtime.sh monitoring \
	ntp-close ntp-groper ntp-restart ntp-status rc1 rc2 stats

# Patch checksum=73a012ff


More information about the bk-ntp-dev-send mailing list