3 files changed, 16 insertions, 13 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index dfba624..ad4e55d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,11 @@
+2008-11-02  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/scripts/build_version.py: 
+        Script finds Imprudence version numbers for packaging.
+        * linden/indra/lib/python/indra/util/llversion.py:
+        Ditto.
+
+
 2008-11-01  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/llwindow/llwindowsdl.cpp:
diff --git a/linden/indra/lib/python/indra/util/llversion.py b/linden/indra/lib/python/indra/util/llversion.py
index cf4f3c6..666cce4 100644
--- a/linden/indra/lib/python/indra/util/llversion.py
+++ b/linden/indra/lib/python/indra/util/llversion.py
@@ -45,15 +45,12 @@ def get_version_file_contents(version_type):
 
 def get_version(version_type):
     file_str = get_version_file_contents(version_type)
-    m = re.search('const S32 LL_VERSION_MAJOR = (\d+);', file_str)
+    m = re.search('const S32 IMP_VERSION_MAJOR = (\d+);', file_str)
     VER_MAJOR = m.group(1)
-    m = re.search('const S32 LL_VERSION_MINOR = (\d+);', file_str)
+    m = re.search('const S32 IMP_VERSION_MINOR = (\d+);', file_str)
     VER_MINOR = m.group(1)
-    m = re.search('const S32 LL_VERSION_PATCH = (\d+);', file_str)
-    VER_PATCH = m.group(1)
-    m = re.search('const S32 LL_VERSION_BUILD = (\d+);', file_str)
-    VER_BUILD = m.group(1)
-    version = "%(VER_MAJOR)s.%(VER_MINOR)s.%(VER_PATCH)s.%(VER_BUILD)s" % locals()
+    m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', file_str)
+    version = "%(VER_MAJOR)s.%(VER_MINOR)s.%(VER_PATCH)s" % locals()
     return version
 
 def get_channel(version_type):
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