From: Martin Burnicki Date: Mon, 9 Mar 2015 09:57:50 +0000 (+0100) Subject: Update for mkver.bat for Windows from David Taylor. X-Git-Tag: NTP_4_3_8~1^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82360381c6864739b23c3e52e4ac1f05ed7bf542;p=thirdparty%2Fntp.git Update for mkver.bat for Windows from David Taylor. Account for version numbering scheme introduced after 4.2.x. bk: 54fd6e9e3ZhF0jIwi7d52n71d3NHTA --- diff --git a/ChangeLog b/ChangeLog index 5892c7337..9abc73d62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +* [Bug 2752] Update for mkver.bat for Windows from David Taylor. + Account for release numbering scheme for 4.3.x and later. (4.3.7) 2015/03/07 Released by Harlan Stenn (4.3.6) 2015/03/06 Released by Harlan Stenn Below are from 4.2.8p2: diff --git a/ports/winnt/scripts/mkver.bat b/ports/winnt/scripts/mkver.bat index 7b4482996..4d55d2f0a 100755 --- a/ports/winnt/scripts/mkver.bat +++ b/ports/winnt/scripts/mkver.bat @@ -20,6 +20,9 @@ see notes/remarks directly below this header: # # # Changes: +# 02/18/2015 David J Taylor - 4.2.8/4.3.0 +# - change to Proto.Minor.Point +# - replace the "p" before the Point with "." # 02/23/2011 David J Taylor - Use reg instead of regedit so "run as # administrator" is not required. # 12/21/2009 Dave Hart @@ -207,7 +210,7 @@ REM **************************************************************************** FOR /F "eol=# TOKENS=2 DELIMS==" %%a IN ('findstr "point=" %%F_POINT_SH%%') DO SET POINT=%%a IF "%POINT%"=="NEW" set POINT= - IF NOT "%POINT%"=="" set POINT=p%POINT% + IF NOT "%POINT%"=="" set POINT=%POINT% FOR /F "eol=# TOKENS=2 DELIMS==" %%a IN ('findstr "betapoint=" %%F_PACKAGEINFO_SH%%') DO SET BETAPOINT=%%a @@ -227,7 +230,7 @@ REM **************************************************************************** IF "%PR_SUF%"=="-RC" set PR_POINT=%RCPOINT% IF "%PR_SUF%"=="-beta" set PR_POINT=%BETAPOINT% - SET VER=%PROTO%.%MAJOR%.%MINOR%%POINT%%SPECIAL%%PR_SUF%%PR_POINT% + SET VER=%PROTO%.%MINOR%.%POINT%%SPECIAL%%PR_SUF%%PR_POINT% REM Now we have the version info, try to add a BK ChangeSet version number