From 8fca0f8b0f56ae6ec54200e22f85d87c53d3ea79 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 8 Sep 2011 19:19:37 -0700
Subject: Create readable version string for installers, based on jacek's
 viewer_info.py script

---
 linden/indra/lib/python/indra/util/llmanifest.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py
index fbd7fea..e27bd8a 100644
--- a/linden/indra/lib/python/indra/util/llmanifest.py
+++ b/linden/indra/lib/python/indra/util/llmanifest.py
@@ -84,7 +84,14 @@ def get_default_version(srctree):
         patch = re.search("PATCH\s=\s([0-9]+)", contents).group(1)
         rleas = re.search("RLEAS\s=\s([0-9]+)", contents).group(1)
         extra = re.search('string\sEXTRA\s=\s"(.*)";', contents).group(1)
-        return major, minor, patch, rleas, extra
+        version = "%s.%s.%s.%s"%(major, minor, patch, rleas)
+        if len(extra) > 0:
+            # Replace spaces and some puncuation with '-' in extra
+            extra = re.sub('[- \t:;,!+/\\"\'`]+', '-', extra)
+            # Strip any leading or trailing "-"s
+            extra = extra.strip('-')
+            version += "-" + extra
+        return version
 
 def get_channel(srctree):
     # look up llversionserver.h and parse out the version info
-- 
cgit v1.1