From c355cd633a5b9bc70fbbc8ee2e047bf4df6ffab3 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 2 Nov 2008 23:36:52 -0600
Subject: Script finds Imprudence version numbers for packaging.

---
 linden/scripts/build_version.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'linden/scripts/build_version.py')

diff --git a/linden/scripts/build_version.py b/linden/scripts/build_version.py
index 4bef290..46587e8 100755
--- a/linden/scripts/build_version.py
+++ b/linden/scripts/build_version.py
@@ -20,16 +20,14 @@ def get_version(filename):
     fp.close()
 
     vals = {}
-    m = re.search('const S32 LL_VERSION_MAJOR = (\d+);', data)
+    m = re.search('const S32 IMP_VERSION_MAJOR = (\d+);', data)
     vals['major'] = m.group(1)
-    m = re.search('const S32 LL_VERSION_MINOR = (\d+);', data)
+    m = re.search('const S32 IMP_VERSION_MINOR = (\d+);', data)
     vals['minor'] = m.group(1)
-    m = re.search('const S32 LL_VERSION_PATCH = (\d+);', data)
+    m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', data)
     vals['patch'] = m.group(1)
-    m = re.search('const S32 LL_VERSION_BUILD = (\d+);', data)
-    vals['build'] = m.group(1)
 
-    return "%(major)s.%(minor)s.%(patch)s.%(build)s" % vals
+    return "%(major)s.%(minor)s.%(patch)s" % vals
 
 if __name__ == '__main__':
     import sys
-- 
cgit v1.1


From abeaf736d06c57f28f19360f3be202bae75f1da2 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 13 Dec 2008 22:53:52 -0600
Subject: Version string generator now includes test label.

This is used for naming packages on Linux, among other things.
---
 linden/scripts/build_version.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'linden/scripts/build_version.py')

diff --git a/linden/scripts/build_version.py b/linden/scripts/build_version.py
index 46587e8..3d66a65 100755
--- a/linden/scripts/build_version.py
+++ b/linden/scripts/build_version.py
@@ -26,8 +26,10 @@ 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)
+    vals['test'] = m.group(1)
 
-    return "%(major)s.%(minor)s.%(patch)s" % vals
+    return "%(major)s.%(minor)s.%(patch)s-%(test)s" % vals
 
 if __name__ == '__main__':
     import sys
-- 
cgit v1.1