From 5f3875018ee9977917d6fff5f2c2cf87db41ce3e Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 10 Oct 2008 16:04:02 +0000 Subject: svn merge -r99056:99248 svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge --- indra/cmake/GooglePerfTools.cmake | 4 + indra/cmake/LLKDU.cmake | 2 - indra/develop.py | 29 ++- indra/lib/python/indra/ipc/mysql_pool.py | 23 +- indra/llcommon/llstring.h | 7 - indra/llprimitive/lltree_common.h | 13 + indra/newview/viewer_manifest.py | 4 +- indra/test/CMakeLists.txt | 1 + install.xml | 426 ++++++++++++++++++++++++++++++- scripts/install.py | 19 +- scripts/template_verifier.py | 32 ++- scripts/update_version_files.py | 15 +- 12 files changed, 519 insertions(+), 56 deletions(-) diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 05aefaf522..25e9f6d4f4 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -19,6 +19,10 @@ if (GOOGLE_PERFTOOLS_FOUND) set(USE_GOOGLE_PERFTOOLS ON CACHE BOOL "Build with Google PerfTools support.") endif (GOOGLE_PERFTOOLS_FOUND) +# XXX Disable temporarily, until we have compilation issues on 64-bit +# Etch sorted. +set(USE_GOOGLE_PERFTOOLS OFF) + if (USE_GOOGLE_PERFTOOLS) set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1) include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR}) diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index a02b5d958e..f103dcf664 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -5,8 +5,6 @@ if (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu) use_prebuilt_binary(kdu) if (WINDOWS) set(KDU_LIBRARY debug kdu_cored optimized kdu_core) - elseif (LINUX) - set(KDU_LIBRARY kdu_v42R) else (WINDOWS) set(KDU_LIBRARY kdu) endif (WINDOWS) diff --git a/indra/develop.py b/indra/develop.py index c3b1b12652..5078820eaa 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -218,11 +218,15 @@ class UnixSetup(PlatformSetup): elif cpu == 'Power Macintosh': cpu = 'ppc' return cpu - + class LinuxSetup(UnixSetup): def __init__(self): super(LinuxSetup, self).__init__() + try: + self.debian_sarge = open('/etc/debian_version').read().strip() == '3.1' + except: + self.debian_sarge = False def os(self): return 'linux' @@ -234,6 +238,11 @@ class LinuxSetup(UnixSetup): if self.arch() == 'i686' and self.is_internal_tree(): return ['viewer-' + platform_build, 'server-' + platform_build] + elif self.arch() == 'x86_64' and self.is_internal_tree(): + # the viewer does not build in 64bit -- kdu5 issues + # we can either use openjpeg, or overhaul our viewer to handle kdu5 or higher + # doug knows about kdu issues + return ['server-' + platform_build] else: return ['viewer-' + platform_build] @@ -265,18 +274,16 @@ class LinuxSetup(UnixSetup): distcc = [] baseonly = False if 'server' in build_dir: - gcc33 = distcc + self.find_in_path('g++-3.3', 'g++', baseonly) - args.update({'cxx':' '.join(gcc33), 'server':'ON', - 'viewer':'OFF'}) + gcc = distcc + self.find_in_path( + self.debian_sarge and 'g++-3.3' or 'g++-4.1', + 'g++', baseonly) + args.update({'cxx': ' '.join(gcc), 'server': 'ON', + 'viewer': 'OFF'}) else: gcc41 = distcc + self.find_in_path('g++-4.1', 'g++', baseonly) - args.update({'cxx': ' '.join(gcc41), 'server':'OFF', - 'viewer':'ON'}) - #if simple: - # return (('cmake %(opts)s ' - # '-DSERVER:BOOL=%(server)s ' - # '-DVIEWER:BOOL=%(viewer)s ' - # '%(dir)r') % args) + args.update({'cxx': ' '.join(gcc41), + 'server': 'OFF', + 'viewer': 'ON'}) cmd = (('cmake -DCMAKE_BUILD_TYPE:STRING=%(type)s ' '-G %(generator)r -DSERVER:BOOL=%(server)s ' '-DVIEWER:BOOL=%(viewer)s -DSTANDALONE:BOOL=%(standalone)s ' diff --git a/indra/lib/python/indra/ipc/mysql_pool.py b/indra/lib/python/indra/ipc/mysql_pool.py index a2324cf956..9793e24a10 100644 --- a/indra/lib/python/indra/ipc/mysql_pool.py +++ b/indra/lib/python/indra/ipc/mysql_pool.py @@ -30,8 +30,10 @@ import MySQLdb from eventlet import db_pool class DatabaseConnector(db_pool.DatabaseConnector): - def __init__(self, credentials, min_size = 0, max_size = 4, *args, **kwargs): - super(DatabaseConnector, self).__init__(MySQLdb, credentials, min_size, max_size, conn_pool=db_pool.ConnectionPool, *args, **kwargs) + def __init__(self, credentials, *args, **kwargs): + super(DatabaseConnector, self).__init__(MySQLdb, credentials, + conn_pool=db_pool.ConnectionPool, + *args, **kwargs) # get is extended relative to eventlet.db_pool to accept a port argument def get(self, host, dbname, port=3306): @@ -42,7 +44,7 @@ class DatabaseConnector(db_pool.DatabaseConnector): new_kwargs['host'] = host new_kwargs['port'] = port new_kwargs.update(self.credentials_for(host)) - dbpool = ConnectionPool(self._min_size, self._max_size, *self._args, **new_kwargs) + dbpool = ConnectionPool(*self._args, **new_kwargs) self._databases[key] = dbpool return self._databases[key] @@ -51,8 +53,8 @@ class ConnectionPool(db_pool.TpooledConnectionPool): """A pool which gives out saranwrapped MySQLdb connections from a pool """ - def __init__(self, min_size = 0, max_size = 4, *args, **kwargs): - super(ConnectionPool, self).__init__(MySQLdb, min_size, max_size, *args, **kwargs) + def __init__(self, *args, **kwargs): + super(ConnectionPool, self).__init__(MySQLdb, *args, **kwargs) def get(self): conn = super(ConnectionPool, self).get() @@ -77,14 +79,3 @@ class ConnectionPool(db_pool.TpooledConnectionPool): conn.connection_parameters = converted_kwargs return conn - def clear(self): - """ Close all connections that this pool still holds a reference to, leaving it empty.""" - for conn in self.free_items: - try: - conn.close() - except: - pass # even if stuff happens here, we still want to at least try to close all the other connections - self.free_items.clear() - - def __del__(self): - self.clear() diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index a3a5f40414..9f2cb8b71b 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -1161,13 +1161,6 @@ BOOL LLStringUtilBase::convertToU32(const std::basic_string& string, U32& std::basic_istringstream i_stream((std::basic_string)temp); if(i_stream >> v) { - //TODO: figure out overflow reporting here - //if( ULONG_MAX == v ) - //{ - // // Underflow or overflow - // return FALSE; - //} - value = v; return TRUE; } diff --git a/indra/llprimitive/lltree_common.h b/indra/llprimitive/lltree_common.h index 302e9385f6..7860571ccf 100644 --- a/indra/llprimitive/lltree_common.h +++ b/indra/llprimitive/lltree_common.h @@ -36,6 +36,19 @@ struct LLTree_gene_0 { + LLTree_gene_0() + : scale(0), + branches(0), + twist(0), + droop(0), + species(0), + trunk_depth(0), + branch_thickness(0), + max_depth(0), + scale_step(0) + { + } + // // The genome for a tree, species 0 // diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 978d70c646..c250350745 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -622,8 +622,8 @@ class Linux_i686Manifest(LinuxManifest): if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"): self.path("libkdu_v42R.so") self.path("libfmod-3.75.so") - self.path("libapr-1.so.0") - self.path("libaprutil-1.so.0") + self.path("libapr-1.so.0*") + self.path("libaprutil-1.so.0*") self.path("libdb-4.2.so") self.path("libcrypto.so.0.9.7") self.path("libexpat.so.1") diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt index cb5f1d6c2c..c8b8846466 100644 --- a/indra/test/CMakeLists.txt +++ b/indra/test/CMakeLists.txt @@ -112,6 +112,7 @@ target_link_libraries(test ${LLCOMMON_LIBRARIES} ${PTHREAD_LIBRARY} ${WINDOWS_LIBRARIES} + ${DL_LIBRARY} ) if (WINDOWS) diff --git a/install.xml b/install.xml index 6b3c7176f7..c118ed6fd8 100644 --- a/install.xml +++ b/install.xml @@ -27,6 +27,20 @@ url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-linux-20080812.tar.bz2 + linux32 + + md5sum + 301c05472d5d6f3303cfa1f9e4b78660 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + 9c3dff3817f1105f9054401fdef1fe50 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-linux64-20080909.tar.bz2 + windows md5sum @@ -60,6 +74,13 @@ url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-linux-20080818.tar.bz2 + linux32 + + md5sum + 45e8fca9a6e7ae7d36b0c5a21dfbe3b9 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-linux-i686-gcc-4.1-20080915.tar.bz2 + windows md5sum @@ -89,6 +110,20 @@ url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.2.8-linux-20080812.tar.bz2 + linux32 + + md5sum + e97eb40a283165e3ddc7556f698b4e01 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.2.8-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + 1a7e1186855d48d8316ce86803095f70 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.2.8-linux64-20080909a.tar.bz2 + windows md5sum @@ -122,6 +157,20 @@ url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.4.0-linux-20080729.tar.bz2 + linux32 + + md5sum + 247987b147e1c856d96e97d685e5b666 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.3.0-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + c4242416e0b2e642c0bf062a19a250e4 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.3.0-linux64-20080909.tar.bz2 + windows md5sum @@ -164,6 +213,20 @@ url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.32.0-linux-20080812.tar.bz2 + linux32 + + md5sum + cdc0cb3e9bfb90517507a0df591f5c0b + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.0-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + b97ae0855e77cc25b37ca63df093bb9b + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.0-linux64-20080909.tar.bz2 + windows md5sum @@ -197,6 +260,20 @@ url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.0-linux-20080812.tar.bz2 + linux32 + + md5sum + 3a8475b8990d17d8c9dc2a32980d2968 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.4-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + 6e9242d11d785f643f34d925a29967e7 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.4-linux64-20080909.tar.bz2 + windows md5sum @@ -238,6 +315,13 @@ url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/elfio-1.0.3-linux-20080812.tar.bz2 + linux32 + + md5sum + 3576f904306fba0edc659eaaa1a1159e + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/elfio-1.0.3-linux-i686-gcc-4.1-20080915.tar.bz2 + expat @@ -264,6 +348,20 @@ url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-linux-20080812.tar.bz2 + linux32 + + md5sum + af1f225afe6cd0c5d2e08ff578839794 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + 278c61871419b9a4d50a4f88b7922403 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-linux64-20080909.tar.bz2 + windows md5sum @@ -297,6 +395,13 @@ url scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-linux-20080818.tar.bz2 + linux32 + + md5sum + 96eea0855dffefcbbd98e9e629b81275 + url + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-linux-i686-gcc-4.1-20080915.tar.bz2 + windows md5sum @@ -319,6 +424,13 @@ url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/fontconfig-2.2.3-linux-20080613.tar.bz2 + linux32 + + md5sum + 53b09eee725de92b715b898388e06115 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/fontconfig-2.2.3-linux-i686-gcc-4.1-20080915.tar.bz2 + freetype @@ -345,6 +457,20 @@ url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.1.5-linux-20080812.tar.bz2 + linux32 + + md5sum + c22a667d4b6b518cc7f942e2c861ca77 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.1.5-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + 35f6fa557ba90f9cda0a18d1af2055a4 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.1.5-linux64-20080909.tar.bz2 + windows md5sum @@ -378,6 +504,20 @@ url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-linux-20080812.tar.bz2 + linux32 + + md5sum + 865d10ce141cdc7e07334486441d3e30 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + 2965646aea1d2a6aec1fbc431c02733f + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-linux-20080613.tar.bz2 + windows md5sum @@ -446,6 +586,20 @@ url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gstreamer-linux-20080613.tar.bz2 + linux32 + + md5sum + 45eaa378465831e114a7406aa4d2ef35 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gstreamer-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + befc7520fe01250f39458f65c29bc584 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gstreamer-linux64-20080909.tar.bz2 + gtk-atk-pango-glib @@ -465,6 +619,20 @@ url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-linux-20080616.tar.bz + linux32 + + md5sum + 21c16a74f8fc9a62e3ab944a6eb7403d + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-linux-20080616.tar.bz + + windows + + md5sum + d963750bcd333a108b3697d220c87d09 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-windows-20080613.tar.bz2 + havok @@ -487,16 +655,30 @@ linux md5sum - f69cc3e069cce66d268b03a9ec918b1c + e398a04adb84796072dcc1f5efc69f4a + url + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/havok-4.6.1-linux-20080912.tar.bz2 + + linux32 + + md5sum + 5a7821cb8aa471051e0361a74d115613 + url + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/havok-4.6.1-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + b2095827a940c791240339dac677ef2d url - scp:install-packages.lindenlab.com:/local/www/install-packages/doc/havok-4.6-linux-20080812.tar.bz2 + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/havok-4.6.1-linux64-20080909.tar.bz2 windows md5sum - b63a2f20df43c68062c6b8e77a2da455 + d4870e9ec615b221c4b5891b6e11235e url - scp:install-packages.lindenlab.com:/local/www/install-packages/doc/havok-4.6-windows-20080611.tar.bz2 + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/havok-4.6.1-windows-20081009.tar.bz2 @@ -524,6 +706,20 @@ url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-linux-20080812.tar.bz2 + linux32 + + md5sum + 3896cfbf5e44450532101f9ab833be61 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + 0e7facf7d48531d20c0cd6a3c3f04021 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-linux64-20080909.tar.bz2 + windows md5sum @@ -546,23 +742,37 @@ darwin md5sum - 9a91ecd80203a24fb347b1436155b013 + 3b40e7170dea82c1443e8d90cd44a13d url - scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-5.2.1-darwin-20080716.tar.bz2 + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-4.2.1-darwin-20080926.tar.bz2 linux md5sum - daadd8c268e16f8c5f6145be8596b8b8 + a6d2f0995c25d7f53bd12b8ec0d6b462 url - scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-5.2.1-linux-20080716.tar.bz2 + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-4.2.1-linux-20080930.tar.bz2 + + linux32 + + md5sum + 0f4f1eb22ea6a4d242614d146fd176a1 + url + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-4.2.1-linux32-20080926.tar.bz2 + + linux64 + + md5sum + f4e2e2b3440594527729a8c85119e508 + url + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-5.2.1-linux64-20080926.tar.bz2 windows md5sum - 15528c24ca657b524d9ab3ccbb33c766 + 1b9f61140f8b599cdae5e00d21dbb177 url - scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-5.2.1-windows-20080613.tar.bz2 + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-4.2.1-windows-20080926.tar.bz2 @@ -590,6 +800,13 @@ url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/kdu-binaries-5.2.1-linux-20080617.tar.bz2 + linux32 + + md5sum + ca87644e377a6cf16db4ba6dbd2f8689 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/kdu-binaries-5.2.1-linux-20080617.tar.bz2 + windows md5sum @@ -624,6 +841,20 @@ anguage Infrstructure (CLI) international standard url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libmono-1.2.6-linux-20080816a.tar.bz2 + linux32 + + md5sum + 8b5810b9b40e8ce4243487fe33b62f56 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libmono-1.2.6-linux32-20080926.tar.bz2 + + linux64 + + md5sum + 451521b4cb57c35caf3efb8dcf99b99e + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libmono-1.2.6-linux64-20080926.tar.bz2 + windows md5sum @@ -657,6 +888,20 @@ anguage Infrstructure (CLI) international standard url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.18-linux-20080812.tar.bz2 + linux32 + + md5sum + 3c631ee1a4556c3a28b5490a53d86603 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.15-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + fbc162f986c869d158633ccdba6ee6e4 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.18-linux64-20080909.tar.bz2 + windows md5sum @@ -683,6 +928,20 @@ anguage Infrstructure (CLI) international standard url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libstdc++-6.0-linux-20080812.tar.bz2 + linux32 + + md5sum + 1218347dd70c3b471530793d0fc09b69 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libstdc++-6.4.1-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + 9a191dc453017b19c5803b046d82f32a + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libstdc++-6.4.1-linux64-20080909.tar.bz2 + libuuid @@ -702,6 +961,13 @@ anguage Infrstructure (CLI) international standard url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libuuid-linux-20080812.tar.bz2 + linux32 + + md5sum + cdc0778d924c6162c1f553274b72ba15 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libuuid-linux-i686-gcc-4.1-20080915.tar.bz2 + libxml @@ -717,6 +983,20 @@ anguage Infrstructure (CLI) international standard url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libxml-2.6.24-linux-20080613.tar.bz2 + linux32 + + md5sum + 0e16b7794811407c387d360282c5d7b3 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libxml-2.6.24-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + 921d7f980519101afb74623e29e9d175 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libxml-2.6.24-linux64-20080909.tar.bz2 + llmozlib @@ -739,6 +1019,20 @@ anguage Infrstructure (CLI) international standard url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llmozlib-linux-20080922.tar.bz2 + linux32 + + md5sum + 0af042c01975df3b127b742f4aad0c5c + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llmozlib-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + c2ae53462b56e0999ba386774ab0b789 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llmozlib-linux64-20080909.tar.bz2 + windows md5sum @@ -765,6 +1059,20 @@ anguage Infrstructure (CLI) international standard url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-7.0-linux-20080812.tar.bz2 + linux32 + + md5sum + 854f3dae9e048305a0fe77eaee0195d6 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-6.2.1-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + 5bbdd1bc93c6cee4b6eca377fc4868ff + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-6.5-linux64-20080909.tar.bz2 + windows md5sum @@ -820,6 +1128,13 @@ anguage Infrstructure (CLI) international standard url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ndofdev-linux-20080618.tar.bz2 + linux32 + + md5sum + c980300c14dddf47ba0c46608b29a027 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ndofdev-linux-i686-gcc-4.1-20080915.tar.bz2 + windows md5sum @@ -853,6 +1168,13 @@ anguage Infrstructure (CLI) international standard url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.03-1.1.2-linux-20080812.tar.bz2 + linux64 + + md5sum + 964c71e6ee22be1bcaf6d480e74cdd14 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.2.0-linux64-20080909.tar.bz2 + windows md5sum @@ -882,6 +1204,20 @@ anguage Infrstructure (CLI) international standard url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.7c-linux-20080812.tar.bz2 + linux32 + + md5sum + 1037114c5b7ad906daca2b4820080b5b + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8g-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + 00b23f28a2457d9dabbaff0b29ee7323 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8g-linux64-20080909.tar.bz2 + windows md5sum @@ -915,6 +1251,20 @@ anguage Infrstructure (CLI) international standard url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2-linux-20080812.tar.bz2 + linux32 + + md5sum + dc1f50c6570cef2d45d40ccc7ac76013 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2.0-linux-i686-gcc-4.1-20080919.tar.bz2 + + linux64 + + md5sum + 44f1bc9d47e4a54fc274c213f2cb565f + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2.0-linux64-20080909.tar.bz2 + windows md5sum @@ -967,6 +1317,13 @@ anguage Infrstructure (CLI) international standard url scp:install-packages.lindenlab.com:/local/www/install-packages/doc/smartheap-6.0.2-linux-20080610.tar.bz2 + linux32 + + md5sum + 499208522bf7d7843e1d014d64214e06 + url + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/smartheap-6.0.2-linux-20080610.tar.bz2 + windows md5sum @@ -1000,6 +1357,20 @@ anguage Infrstructure (CLI) international standard url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/tut-linux-20080812.tar.bz2 + linux32 + + md5sum + f410e4acdf4696c90d3fc708c41e6226 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/tut-2006-06-22-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + 728f4d8f74df8e84d0781b9ee9fc47ed + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/tut-2006-06-22-linux64-20080909.tar.bz2 + windows md5sum @@ -1050,6 +1421,13 @@ anguage Infrstructure (CLI) international standard url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-linux-20080613.tar.bz2 + linux32 + + md5sum + 7d6e9727edba3556015edf492d35e394 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-linux-i686-gcc-4.1-20080915.tar.bz2 + windows md5sum @@ -1083,6 +1461,20 @@ anguage Infrstructure (CLI) international standard url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-linux-20080812.tar.bz2 + linux32 + + md5sum + 06ad9cbb166b89dcc0c62fd987cc34ce + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + dc67b896c56116df8e18f2d1bbd07031 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-linux64-20080909.tar.bz2 + windows md5sum @@ -1116,6 +1508,20 @@ anguage Infrstructure (CLI) international standard url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.1.4-linux-20080818.tar.bz2 + linux32 + + md5sum + cb800ce00f9a5bdeff3371f14481fa38 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.3-linux-i686-gcc-4.1-20080915.tar.bz2 + + linux64 + + md5sum + 4bddfb2c6dd7b1470a3ed675ac14bd9a + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.3-linux64-20080909.tar.bz2 + windows md5sum diff --git a/scripts/install.py b/scripts/install.py index 522fa6e9d9..bb22d16a1a 100755 --- a/scripts/install.py +++ b/scripts/install.py @@ -37,6 +37,7 @@ import copy import md5 import optparse import os +import platform import pprint import shutil import sys @@ -737,7 +738,23 @@ def _get_platform(): 'cygwin' : 'windows', 'solaris' : 'solaris' } - return platform_map[sys.platform] + this_platform = platform_map[sys.platform] + if this_platform == 'linux': + if platform.architecture()[0] == '64bit': + # TODO -- someday when install.py accepts a platform of the form + # 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' + this_platform = 'linux32' + return this_platform def _getuser(): "Get the user" diff --git a/scripts/template_verifier.py b/scripts/template_verifier.py index a7dbda9e3b..581f1168ff 100755 --- a/scripts/template_verifier.py +++ b/scripts/template_verifier.py @@ -38,13 +38,35 @@ If [FILE] [FILE] is specified, two local files will be checked against each other. """ -from os.path import realpath, dirname, join, exists -setup_path = join(dirname(realpath(__file__)), "setup-path.py") -if exists(setup_path): - execfile(setup_path) +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. + +root = os.path.abspath(__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) + break +else: + print >>sys.stderr, "This script is not inside a valid installation." + sys.exit(1) + import optparse import os -import sys import urllib from indra.ipc import compatibility diff --git a/scripts/update_version_files.py b/scripts/update_version_files.py index 528eedc23a..87a3b6f389 100755 --- a/scripts/update_version_files.py +++ b/scripts/update_version_files.py @@ -5,10 +5,21 @@ # import sys -import os 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. + root = os.path.abspath(__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') @@ -20,7 +31,7 @@ else: print >>sys.stderr, "This script is not inside a valid installation." sys.exit(1) -import getopt, sys, os, re, commands +import getopt, os, re, commands from indra.util import llversion svn = os.path.expandvars("${SVN}") -- cgit v1.2.3