Second Life viewer sources 1.23.0-RC

1 files changed, 47 insertions, 28 deletions

diff --git a/linden/scripts/install.py b/linden/scripts/install.py
index f886a6e..5069918 100755
--- a/linden/scripts/install.py
+++ b/linden/scripts/install.py
@@ -33,6 +33,36 @@ THE SOFTWARE.
 $/LicenseInfo$
 """
 
+import sys
+import os.path
+
+# Look for indra/lib/python in all possible parent directories ...
+# This is an improvement over the setup-path.py method used previously:
+#  * the script may blocated anywhere inside the source tree
+#  * it doesn't depend on the current directory
+#  * it doesn't depend on another file being present.
+
+def add_indra_lib_path():
+    root = os.path.realpath(__file__)
+    # always insert the directory of the script in the search path
+    dir = os.path.dirname(root)
+    if dir not in sys.path:
+        sys.path.insert(0, dir)
+
+    # Now go look for indra/lib/python in the parent dies
+    while root != os.path.sep:
+        root = os.path.dirname(root)
+        dir = os.path.join(root, 'indra', 'lib', 'python')
+        if os.path.isdir(dir):
+            if dir not in sys.path:
+                sys.path.insert(0, dir)
+            return root
+    else:
+        print >>sys.stderr, "This script is not inside a valid installation."
+        sys.exit(1)
+
+base_dir = add_indra_lib_path()
+
 import copy
 import md5
 import optparse
@@ -40,7 +70,6 @@ import os
 import platform
 import pprint
 import shutil
-import sys
 import tarfile
 import tempfile
 import urllib2
@@ -48,20 +77,21 @@ import urlparse
 
 from sets import Set as set, ImmutableSet as frozenset
 
-# Locate -our- python library relative to our install location.
-from os.path import realpath, dirname, join
-
-# Walk back to checkout base directory
-base_dir = dirname(dirname(realpath(__file__)))
-# Walk in to libraries directory
-lib_dir = join(join(join(base_dir, 'indra'), 'lib'), 'python')
-
-if lib_dir not in sys.path:
-    sys.path.insert(0, lib_dir)
-
 from indra.base import llsd
 from indra.util import helpformatter
 
+# *HACK: Necessary for python 2.3. Consider removing this code wart
+# after etch has deployed everywhere. 2008-12-23 Phoenix
+try:
+    sorted = sorted
+except NameError:
+    def sorted(in_list):
+        "Return a list which is a sorted copy of in_list."
+        # Copy the source to be more functional and side-effect free.
+        out_list = copy.copy(in_list)
+        out_list.sort()
+        return out_list
+
 class InstallFile(object):
     "This is just a handy way to throw around details on a file in memory."
     def __init__(self, pkgname, url, md5sum, cache_dir, platform_path):
@@ -291,7 +321,7 @@ class Installer(object):
 
     def list_installables(self):
         "Return a list of all known installables."
-        return self._installables.keys()
+        return sorted(self._installables.keys())
 
     def detail_installable(self, name):
         "Return a installable definition detail"
@@ -299,7 +329,7 @@ class Installer(object):
 
     def list_licenses(self):
         "Return a list of all known licenses."
-        return self._licenses.keys()
+        return sorted(self._licenses.keys())
 
     def detail_license(self, name):
         "Return a license definition detail"
@@ -307,7 +337,7 @@ class Installer(object):
 
     def list_installed(self):
         "Return a list of installed packages."
-        return self._installed.keys()
+        return sorted(self._installed.keys())
 
     def detail_installed(self, name):
         "Return file list for specific installed package."
@@ -750,17 +780,6 @@ def _get_platform():
             # os/arch/compiler/compiler_version then we can replace the 
             # 'linux64' platform with 'linux/x86_64/gcc/4.1'
             this_platform = 'linux64'
-        else:
-            gcc_version = os.popen("g++ -dumpversion", 'r').read()[:-3]
-            if gcc_version == '4.1':
-                # the 'linux32' platform is a HACK until we can figure
-                # out how to make the install.py script accept a platform of
-                # the form os/arch/compiler/compiler_version for the download
-                # and extract stage
-                #this_platform = 'linux/i686/gcc/4.1'
-                # NOTE: disabled linux32 as it hasn't been tested well
-                #this_platform = 'linux32'
-                this_platform = this_platform
     return this_platform
 
 def _getuser():
@@ -832,13 +851,13 @@ darwin/universal/gcc/4.0
     parser.add_option(
         '--install-manifest', 
         type='string',
-        default=join(base_dir, 'install.xml'),
+        default=os.path.join(base_dir, 'install.xml'),
         dest='install_filename',
         help='The file used to describe what should be installed.')
     parser.add_option(
         '--installed-manifest', 
         type='string',
-        default=join(base_dir, 'installed.xml'),
+        default=os.path.join(base_dir, 'installed.xml'),
         dest='installed_filename',
         help='The file used to record what is installed.')
     parser.add_option(