[Bug 2187] Update version number generation scripts

bk: 54c2fb5crgo_E9fhdVrU409Gikpzzw

diff --git a/ChangeLog b/ChangeLog
index 8c3f8108296d6dfc7045d4dd711e9d93846710c3..c015480942d99580752ae21cc2380cc9cc807f40 100644 (file)
--- 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 e3c5957dc6bc232df3e0ed6477675664ddaa2900..61c034983b6c17ce8ec0158efc21f5477860cf4b 100755 (executable)
--- 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 71e31a948ff0bc17e950d9136a4bff5e8053e2c9..84b5972261ac4c74e9b9ba0eb2f0373639671350 100755 (executable)
--- 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