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

Harlan Stenn stenn at whimsy.udel.edu
Mon May 8 22:06:54 UTC 2006


This BitKeeper patch contains the following changesets:
burnicki at pogo.udel.edu|ChangeSet|20060508105236|58330

# 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:	whimsy.udel.edu
# Root:	/deacon/backroom/ntp-dev

#
#--- 1.60/BitKeeper/etc/logging_ok	2006-02-28 22:32:00 -05:00
#+++ 1.61/BitKeeper/etc/logging_ok	2006-05-08 06:52:36 -04:00
#@@ -4,6 +4,7 @@
# blu at corwin.
# blu at jedi.east.sun.com
# bruckman at pogo.udel.edu
#+burnicki at pogo.udel.edu
# claas at nixfix.(none)
# claas at webfix.linum.ein
# clemens at pogo.udel.edu
#
#--- 1.7/ports/winnt/scripts/mkver.bat	2005-03-09 22:22:30 -05:00
#+++ 1.8/ports/winnt/scripts/mkver.bat	2006-05-08 06:51:53 -04:00
#@@ -171,33 +171,60 @@
# REM Now grab the Version number out of the source code (using the version.m4 file...)
# REM *****************************************************************************************************************
# 
#-	REM First, get the main ntp version number 
#-	IF NOT EXIST ..\..\..\version.m4 goto ERRNOVERF
#-	IF NOT EXIST ..\include\config.h goto ERRNOCONF
#+	REM First, get the main NTP version number. In recent versions this must be extracted 
#+	REM from a packageinfo.sh file while in earlier versions the info was available from 
#+	REM a version.m4 file.
#+	SET F_PACKAGEINFO_SH=..\..\..\packageinfo.sh
#+	SET F_VERSION_M4=..\..\..\version.m4
#+	IF EXIST %F_PACKAGEINFO_SH% goto VER_FROM_PACKAGE_INFO
#+	IF EXIST ..\..\..\version.m4 goto VER_FROM_M4
#+        goto ERRNOVERF
#+
#+:VER_FROM_PACKAGE_INFO
#+	REM Get version from packageinfo.sh file, which contains lines reading e.g.
#+	FOR /F "eol=# TOKENS=2 DELIMS==" %%a IN ('findstr  "proto=" %%F_PACKAGEINFO_SH%%') DO SET PROTO=%%a
#+	FOR /F "eol=# TOKENS=2 DELIMS==" %%a IN ('findstr  "major=" %%F_PACKAGEINFO_SH%%') DO SET MAJOR=%%a
#+	FOR /F "eol=# TOKENS=2 DELIMS==" %%a IN ('findstr  "minor=" %%F_PACKAGEINFO_SH%%') DO SET MINOR=%%a
#+
#+	FOR /F "eol=# TOKENS=2 DELIMS==" %%a IN ('findstr  "point=" %%F_PACKAGEINFO_SH%%') DO SET POINT=%%a
#+	IF NOT "%POINT%"=="" set POINT=p%POINT%
#+
#+	FOR /F "eol=# TOKENS=2 DELIMS==" %%a IN ('findstr  "special=" %%F_PACKAGEINFO_SH%%') DO SET SPECIAL=%%a
#+	IF NOT "%SPECIAL%"=="" set SPECIAL=-%SPECIAL%
#+
#+	FOR /F "eol=# TOKENS=2 DELIMS==" %%a IN ('findstr  "releasecandidate=" %%F_PACKAGEINFO_SH%%') DO SET REL_CAND_STR=%%a
#+	IF /I "%REL_CAND_STR%"=="yes" set REL_CAND=-RC
#+	SET VER=%PROTO%.%MAJOR%.%MINOR%%POINT%%SPECIAL%%REL_CAND%
#+	goto VER_GET_CSET
#+
#+:VER_FROM_M4
#+	REM Get version from version.m4 file, which contains a line reading e.g.
#+	REM m4_define([VERSION_NUMBER],[4.2.0b-rc1])
# 	FOR /F "TOKENS=4 DELIMS==[] " %%a IN ('findstr  "VERSION_NUMBER" ..\..\..\version.m4') DO @SET VER=%%a
#+
#+:VER_GET_CSET
#+	REM Now we have the version info, try to add a BK ChangeSet version number
# 	
#-	REM Now, try to add a BK ChangeSet version number
#-	
#-		REM ** Check if BK is installed ...
#-                bk -R prs -hr+ -nd:I: ChangeSet 2> NUL > NUL
#-		IF ERRORLEVEL 1 GOTO NOBK
#+	REM ** Check if BK is installed ...
#+	bk -R prs -hr+ -nd:I: ChangeSet 2> NUL > NUL
#+	IF ERRORLEVEL 1 GOTO NOBK
# 
#-		REM ** Try to get the CSet rev directly from BK
#-		FOR /F "TOKENS=1 DELIMS==" %%a IN ('bk.exe -R prs -hr+ -nd:I: ChangeSet') DO @SET CSET=%%a
#+	REM ** Try to get the CSet rev directly from BK
#+	FOR /F "TOKENS=1 DELIMS==" %%a IN ('bk.exe -R prs -hr+ -nd:I: ChangeSet') DO @SET CSET=%%a
# 
# :NOBK
#-
#-		REM ** If that was not successful, we'll take a look into a version file, if available
#-		IF EXIST ..\..\..\version ( 
#-			IF "%CSET%"=="" FOR /F "TOKENS=1" %%a IN ('type ..\..\..\version') DO @SET CSET=%%a
#-		)
#+	REM ** If that was not successful, we'll take a look into a version file, if available
#+	IF EXIST ..\..\..\version ( 
#+		IF "%CSET%"=="" FOR /F "TOKENS=1" %%a IN ('type ..\..\..\version') DO @SET CSET=%%a
#+	)
# 
# 	REM ** Now, expand our version number with the CSet revision, if we managed to get one
#-		IF NOT "%CSET%"=="" SET VER=%VER%@%CSET%
#+	IF NOT "%CSET%"=="" SET VER=%VER%@%CSET%
# 		
# 	REM We can add a "crypto" identifier (-o) if we see that Crypto support is included in our build
#-		FOR /F "TOKENS=1-3 " %%a IN ('findstr /R "^#define\ OPENSSL" ..\include\config.h') DO @SET SSL=%%c
#-		IF "%SSL%"=="1" SET VER=%VER%-o
#+	IF NOT EXIST ..\include\config.h goto ERRNOCONF
#+	FOR /F "TOKENS=1-3 " %%a IN ('findstr /R "^#define\ OPENSSL" ..\include\config.h') DO @SET SSL=%%c
#+	IF "%SSL%"=="1" SET VER=%VER%-o
# 
# 
# REM *****************************************************************************************************************
#

# Diff checksum=9421ab15


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20060508093400|57212
D 1.1503 06/05/08 10:52:36+00:00 burnicki at pogo.udel.edu +2 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Retrieve version info from packageinfo.sh also under Windows.
K 58330
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ports/winnt/scripts/mkver.bat|19990728020516|01289|29080509 burnicki at pogo.udel.edu|ports/winnt/scripts/mkver.bat|20060508105153|37718
> stenn at whimsy.udel.edu|BitKeeper/etc/logging_ok|20010815091324|19348|bebb84d857254496 burnicki at pogo.udel.edu|BitKeeper/etc/logging_ok|20060508105236|23849

== BitKeeper/etc/logging_ok ==
stenn at whimsy.udel.edu|BitKeeper/etc/logging_ok|20010815091324|19348|bebb84d857254496
stenn at pogo.udel.edu|BitKeeper/etc/logging_ok|20060301033200|21647
D 1.61 06/05/08 10:52:36+00:00 burnicki at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Logging to repologs at ntp.isc.org accepted
K 23849
O -rw-rw-r--
P BitKeeper/etc/logging_ok
------------------------------------------------

I6 1
burnicki at pogo.udel.edu

== ports/winnt/scripts/mkver.bat ==
stenn at whimsy.udel.edu|ports/winnt/scripts/mkver.bat|19990728020516|01289|29080509
mayer at tecotoo.|ports/winnt/scripts/mkver.bat|20050310032230|65068
D 1.8 06/05/08 10:51:53+00:00 burnicki at pogo.udel.edu +45 -18
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Retrieve version info from packageinfo.sh.
K 37718
O -rwxrwxr-x
P ports/winnt/scripts/mkver.bat
------------------------------------------------

D174 3
I176 29
	REM First, get the main NTP version number. In recent versions this must be extracted 
	REM from a packageinfo.sh file while in earlier versions the info was available from 
	REM a version.m4 file.
	SET F_PACKAGEINFO_SH=..\..\..\packageinfo.sh
	SET F_VERSION_M4=..\..\..\version.m4
	IF EXIST %F_PACKAGEINFO_SH% goto VER_FROM_PACKAGE_INFO
	IF EXIST ..\..\..\version.m4 goto VER_FROM_M4
        goto ERRNOVERF
\
:VER_FROM_PACKAGE_INFO
	REM Get version from packageinfo.sh file, which contains lines reading e.g.
	FOR /F "eol=# TOKENS=2 DELIMS==" %%a IN ('findstr  "proto=" %%F_PACKAGEINFO_SH%%') DO SET PROTO=%%a
	FOR /F "eol=# TOKENS=2 DELIMS==" %%a IN ('findstr  "major=" %%F_PACKAGEINFO_SH%%') DO SET MAJOR=%%a
	FOR /F "eol=# TOKENS=2 DELIMS==" %%a IN ('findstr  "minor=" %%F_PACKAGEINFO_SH%%') DO SET MINOR=%%a
\
	FOR /F "eol=# TOKENS=2 DELIMS==" %%a IN ('findstr  "point=" %%F_PACKAGEINFO_SH%%') DO SET POINT=%%a
	IF NOT "%POINT%"=="" set POINT=p%POINT%
\
	FOR /F "eol=# TOKENS=2 DELIMS==" %%a IN ('findstr  "special=" %%F_PACKAGEINFO_SH%%') DO SET SPECIAL=%%a
	IF NOT "%SPECIAL%"=="" set SPECIAL=-%SPECIAL%
\
	FOR /F "eol=# TOKENS=2 DELIMS==" %%a IN ('findstr  "releasecandidate=" %%F_PACKAGEINFO_SH%%') DO SET REL_CAND_STR=%%a
	IF /I "%REL_CAND_STR%"=="yes" set REL_CAND=-RC
	SET VER=%PROTO%.%MAJOR%.%MINOR%%POINT%%SPECIAL%%REL_CAND%
	goto VER_GET_CSET
\
:VER_FROM_M4
	REM Get version from version.m4 file, which contains a line reading e.g.
	REM m4_define([VERSION_NUMBER],[4.2.0b-rc1])
I177 3
\
:VER_GET_CSET
	REM Now we have the version info, try to add a BK ChangeSet version number
D179 5
I183 3
	REM ** Check if BK is installed ...
	bk -R prs -hr+ -nd:I: ChangeSet 2> NUL > NUL
	IF ERRORLEVEL 1 GOTO NOBK
D185 2
I186 2
	REM ** Try to get the CSet rev directly from BK
	FOR /F "TOKENS=1 DELIMS==" %%a IN ('bk.exe -R prs -hr+ -nd:I: ChangeSet') DO @SET CSET=%%a
D189 5
I193 4
	REM ** If that was not successful, we'll take a look into a version file, if available
	IF EXIST ..\..\..\version ( 
		IF "%CSET%"=="" FOR /F "TOKENS=1" %%a IN ('type ..\..\..\version') DO @SET CSET=%%a
	)
D196 1
I196 1
	IF NOT "%CSET%"=="" SET VER=%VER%@%CSET%
D199 2
I200 3
	IF NOT EXIST ..\include\config.h goto ERRNOCONF
	FOR /F "TOKENS=1-3 " %%a IN ('findstr /R "^#define\ OPENSSL" ..\include\config.h') DO @SET SSL=%%c
	IF "%SSL%"=="1" SET VER=%VER%-o

# Patch checksum=10a9a209


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