From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 24 Jan 2015 01:54:36 +0000 (+0000)
Subject: [Bug 2187] Update version number generation scripts
X-Git-Tag: NTP_4_2_8P1_RC1~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2632fbf2c07c6a854a0b759a6b4df2ddba963ec3;p=thirdparty%2Fntp.git

[Bug 2187] Update version number generation scripts

bk: 54c2fb5crgo_E9fhdVrU409Gikpzzw
---

diff --git a/ChangeLog b/ChangeLog
index 8c3f81082..c01548094 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 ---
 
+* [Bug 2187] Update version number generation scripts.
 * [Bug 2617] Fix sntp Usage documentation section.
 * [Sec 2672] Code cleanup: On some OSes ::1 can be spoofed...
 * Fix the package name.
diff --git a/scripts/build/UpdatePoint b/scripts/build/UpdatePoint
index e3c5957dc..61c034983 100755
--- a/scripts/build/UpdatePoint
+++ b/scripts/build/UpdatePoint
@@ -217,20 +217,26 @@ case "$repo" in
     ;;
 esac
 
-case "$bp::$point" in
- 0::*)
+case "$repo::$bp::$point" in
+ *::0::*)
     newpoint=$point
     ;;
- 1::[1-9]*)
+ dev::1::0)
+    newpoint=`expr $point + 1`
+    ;;
+ *::1::[1-9]*)
     newpoint=`expr $point + 1`
     ;;
- 1::)
+ dev::1::)
+    newpoint=0
+    ;;
+ stable::1::)
     newpoint=1
     ;;
- 1::[Nn][Ee][Ww])
+ *::1::[Nn][Ee][Ww])
     newpoint=
     ;;
- *) echo "Unexpected value for 'point' <$point>!"
+ *) echo "Unexpected value for 'point' <$point>! (repo::bp::point is $repo::$bp::$point)"
     exit 1
     ;;
 esac
diff --git a/scripts/build/VersionName b/scripts/build/VersionName
index 71e31a948..84b597226 100755
--- a/scripts/build/VersionName
+++ b/scripts/build/VersionName
@@ -19,8 +19,17 @@ esac
 . "$packageinfo"
 
 NAME="$version"
-case $point in
- [1-9]*)
+case "$repotype::$point" in
+ dev::)
+    case "${proto}.${major}" in
+     4.[012])
+	NAME="${NAME}p${point}"
+        ;;
+     *) NAME="${NAME}"
+        ;;
+    esac
+    ;;
+ stable::[1-9]* | dev::[0-9]*)
     case "${proto}.${major}" in
      4.[012])
 	NAME="${NAME}p${point}"
@@ -31,7 +40,7 @@ case $point in
     ;;
  NEW) ;;
  '') ;;
- *) echo "Unexpected value for 'point' <$point>!"
+ *) echo "Unexpected value for 'point' <$point>! (repotype is <$repotype>)"
     exit 1
     ;;
 esac