From f286bb2bf6f860419f73983233d4f747feb06300 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 17 May 2010 10:57:59 -0700
Subject: Made CMake find the viewer version in xml

---
 linden/indra/cmake/BuildVersion.cmake           |  2 +-
 linden/indra/lib/python/indra/util/llversion.py | 14 +++++++-------
 linden/scripts/build_version.py                 |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/cmake/BuildVersion.cmake b/linden/indra/cmake/BuildVersion.cmake
index 60a519c..59b36ff 100644
--- a/linden/indra/cmake/BuildVersion.cmake
+++ b/linden/indra/cmake/BuildVersion.cmake
@@ -5,7 +5,7 @@ include(Python)
 macro (build_version _target)
   execute_process(
       COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/build_version.py
-        llversion${_target}.h ${LLCOMMON_INCLUDE_DIRS}
+        viewerversion.xml ${CMAKE_CURRENT_SOURCE_DIR}/app_settings/
       OUTPUT_VARIABLE ${_target}_VERSION
       OUTPUT_STRIP_TRAILING_WHITESPACE
       )
diff --git a/linden/indra/lib/python/indra/util/llversion.py b/linden/indra/lib/python/indra/util/llversion.py
index aedb947..5d164fc 100644
--- a/linden/indra/lib/python/indra/util/llversion.py
+++ b/linden/indra/lib/python/indra/util/llversion.py
@@ -30,14 +30,14 @@ $/LicenseInfo$
 import re, sys, os, commands
 
 # Methods for gathering version information from
-# llversionviewer.h and llversionserver.h
+# viewerversion.xml
 
 def get_src_root():
     indra_lib_python_indra_path = os.path.dirname(__file__)
     return os.path.abspath(os.path.realpath(indra_lib_python_indra_path + "/../../../../../"))
 
 def get_version_file_contents(version_type):
-    filepath = get_src_root() + '/indra/llcommon/llversion%s.h' % version_type
+    filepath = get_src_root() + '/indra/newview/app_settings/viewerversion.xml'
     file = open(filepath,"r")
     file_str = file.read()
     file.close()
@@ -45,15 +45,15 @@ def get_version_file_contents(version_type):
 
 def get_version(version_type, revision=0):
     file_str = get_version_file_contents(version_type)
-    m = re.search('const S32 IMP_VERSION_MAJOR = (\d+);', file_str)
+    m = re.search('<viewer version_major="(\d+)" />', file_str)
     VER_MAJOR = m.group(1)
-    m = re.search('const S32 IMP_VERSION_MINOR = (\d+);', file_str)
+    m = re.search('<viewer version_minor="(\d+)" />', file_str)
     VER_MINOR = m.group(1)
-    m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', file_str)
+    m = re.search('<viewer version_patch="(\d+)" />', file_str)
     VER_PATCH = m.group(1)
-    m = re.search('const S32 IMP_VERSION_TEST = (\d+);', file_str)
+    m = re.search('<viewer version_test="(.*)" />', file_str)
     VER_BUILD = m.group(1)
-    version = "%(VER_MAJOR)s.%(VER_MINOR)s.%(VER_PATCH)s.%(VER_TEST)s" % locals()
+    version = "%(VER_MAJOR)s.%(VER_MINOR)s.%(VER_PATCH)s-%(VER_TEST)s" % locals()
     return version
 
 def get_channel(version_type):
diff --git a/linden/scripts/build_version.py b/linden/scripts/build_version.py
index 908c57d..9746b7c 100755
--- a/linden/scripts/build_version.py
+++ b/linden/scripts/build_version.py
@@ -20,13 +20,13 @@ def get_version(filename):
     fp.close()
 
     vals = {}
-    m = re.search('const S32 IMP_VERSION_MAJOR = (\d+);', data)
+    m = re.search('<viewer version_major="(\d+)" />', data)
     vals['major'] = m.group(1)
-    m = re.search('const S32 IMP_VERSION_MINOR = (\d+);', data)
+    m = re.search('<viewer version_minor="(\d+)" />', data)
     vals['minor'] = m.group(1)
-    m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', data)
+    m = re.search('<viewer version_patch="(\d+)" />', data)
     vals['patch'] = m.group(1)
-    m = re.search('const char \* const IMP_VERSION_TEST = "(.*)";', data)
+    m = re.search('<viewer version_test="(.*)" />', data)
     vals['test'] = m.group(1)
 
     version = "%(major)s.%(minor)s.%(patch)s" % vals
-- 
cgit v1.1