Improved regex and formatting in build_version.py.

Handles empty test version strings better.

2 files changed, 14 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 987aed7..ba6bd17 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
 2009-06-06  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+        * Improved regex and formatting in build_version.py.
+          Handles empty test version strings better.
+
+            modified: linden/scripts/build_version.py
+
+
         * Pie menu for HUD and Attachment should use "Attachment Touch".
 
             modified: linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
diff --git a/linden/scripts/build_version.py b/linden/scripts/build_version.py
index 3d66a65..908c57d 100755
--- a/linden/scripts/build_version.py
+++ b/linden/scripts/build_version.py
@@ -26,10 +26,16 @@ def get_version(filename):
     vals['minor'] = m.group(1)
     m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', data)
     vals['patch'] = m.group(1)
-    m = re.search('const char \* const IMP_VERSION_TEST = "(.+)";', data)
+    m = re.search('const char \* const IMP_VERSION_TEST = "(.*)";', data)
     vals['test'] = m.group(1)
 
-    return "%(major)s.%(minor)s.%(patch)s-%(test)s" % vals
+    version = "%(major)s.%(minor)s.%(patch)s" % vals
+
+    if len(vals['test']) > 0:
+        version += "-%(test)s" % vals
+
+    return version
+
 
 if __name__ == '__main__':
     import sys