1 files changed, 157 insertions, 61 deletions

diff --git a/linden/indra/SConstruct b/linden/indra/SConstruct
index 39b50bc..68c8fc7 100644
--- a/linden/indra/SConstruct
+++ b/linden/indra/SConstruct
@@ -1,12 +1,21 @@
 ################################################# -*- python -*-
 #
-#  SConstruct makefile for Second Life viewer
-#  and servers.
+#  SConstruct makefile for Second Life viewer and servers.
 #
 #  To build everything:
 #
 #    scons ARCH=all BTARGET=all DISTCC=yes
 #
+# To build a standalone viewer, you'll need the following packages
+# installed, with headers.  We pick up the correct flags to use for
+# these libraries using the "pkg-config" command.
+#
+#    cairo glib-2.0 gtk+-2.0 sdl vorbis vorbisenc vorbisfile
+#
+# Then build as follows:
+#
+#    scons BTARGET=client STANDALONE=yes MOZLIB=no ELFIO=no DISTCC=no
+#
 #  For help on options:
 #
 #    scons -h
@@ -73,6 +82,8 @@ try:
 except:
     debian_sarge = False
 
+fedora = os.path.exists('/etc/fedora-release')
+
 #########################
 # COMMAND LINE OPTIONS  #
 #########################
@@ -91,6 +102,8 @@ opts.AddOptions(
     BoolOption('COLORGCC', 'Enabled colorgcc', True),
     EnumOption('GRID', 'Client package\'s default grid', 'default',
         allowed_values=('default', 'aditi', 'agni', 'dmz', 'durga', 'firstlook', 'ganga', 'shakti', 'siva', 'soma', 'uma', 'vaak')),
+    BoolOption('ELFIO', 'Enabled enhanced backtraces with libELFIO symbol extraction support', True),
+    BoolOption('STANDALONE', 'Build using system packages (implies OPENSOURCE)', False),
     BoolOption('OPENSOURCE', 'Build using only non-proprietary dependencies', True) # OPENSOURCE: do not edit this line
 )
 optenv = Environment(options = opts)
@@ -101,16 +114,39 @@ arch = optenv['ARCH']
 target_param = optenv['BTARGET']
 enable_distcc = optenv['DISTCC']
 enable_mozlib = optenv['MOZLIB']
-enable_fmod = optenv['FMOD']
 enable_colorgcc = optenv['COLORGCC']
 grid = optenv['GRID']
-opensource = optenv['OPENSOURCE']
+standalone = optenv['STANDALONE']
+opensource = standalone or optenv['OPENSOURCE']
+enable_fmod = not opensource and optenv['FMOD']
+elfio = optenv['ELFIO']
 
 targets = [ target_param ]
 
 if target_param == 'all':
     targets = [ 'client', 'server' ]
 
+# Set this to False if you don't want your source files copied into
+# the object directory in /tmp.
+duplicate = True
+
+if standalone and platform != 'linux':
+    print >> sys.stderr, 'Warning: standalone builds have only been tested on Linux'
+
+standalone_pkgs = 'cairo glib-2.0 gtk+-2.0 sdl vorbis vorbisenc vorbisfile'
+
+def pkgconfig(opt, pkgs=None):
+    return os.popen('pkg-config %s %s' %
+                    (opt, pkgs or standalone_pkgs)).read().strip()
+
+if standalone:
+    missing = [pkg for pkg in standalone_pkgs.split()
+               if os.system('pkg-config --exists ' + pkg)]
+    if missing:
+        print >> sys.stderr, ('Error: pkg-config cannot find these '
+                              'packages: %s' % ' '.join(missing))
+        sys.exit(2)
+
 #####################
 # ITERATE TARGETS   #
 #####################
@@ -125,6 +161,7 @@ for build_target in targets:
     print 'Building ' + build_target + ' ' + version + ' on ' + system_str + ' (' + buildtype + ')'
 
     system_lib_dir = '../libraries/' + system_str 
+
     if build_target == 'client':
         system_lib_dir += '/lib_release_client'
     elif buildtype == 'debug':
@@ -153,7 +190,7 @@ for build_target in targets:
         """ +
         '../libraries/' + system_str + '/include' )
 
-    client_external_libs = []
+    client_external_libs = ['resolv']
     system_link_flags = ''
 
     if platform != 'linux' and build_target == 'client' and enable_mozlib:
@@ -184,74 +221,94 @@ for build_target in targets:
     ##############
 
     # Generic GCC flags
-    flags = '-g -pipe -Wall -Wno-trigraphs '
-
-    if opensource:
-        flags += '-DLL_USE_KDU=0 '
-    else:
-        flags += '-DLL_USE_KDU=1 '
+    cflags = '-g -pipe -Wall -Wno-trigraphs -Wno-sign-compare -Werror '
+    cxxflags = ''
+    cppflags = ''
 
     if build_target == 'server':
         # Server flags
-        flags += '-D_GNU_SOURCE -ftemplate-depth-60 -DLL_MESA_HEADLESS=1 -DLL_MESA=1 '
+        cppflags += '-D_GNU_SOURCE -DLL_MESA_HEADLESS=1 -DLL_MESA=1 '
+        cxxflags += '-ftemplate-depth-60 '
         if arch == 'i686':
-            flags += '-march=pentiumpro '
+            cflags += '-march=pentiumpro '
         if debian_sarge:
             def_server_cppflags = ''
         else:
             def_server_cppflags = '-DCTYPE_WORKAROUND'
         server_cppflags = os.environ.get('SERVER_CPPFLAGS',
                                          def_server_cppflags)
-        flags += server_cppflags + ' '
+        cppflags += server_cppflags + ' '
     else:
         # Viewer flags
-        flags += '-falign-loops=16 -fno-math-errno -fexceptions -fsigned-char -fno-strict-aliasing -ffast-math '
-        flags += '-DLL_MESA_HEADLESS=0 -DLL_MESA=0 '
+        cflags += '-falign-loops=16 -fno-math-errno -fexceptions -fsigned-char -fno-strict-aliasing -ffast-math '
+        cppflags += '-DLL_MESA_HEADLESS=0 -DLL_MESA=0 '
         try:
             client_cppflags = os.environ['CLIENT_CPPFLAGS']
         except:
             client_cppflags = ''
-        flags += client_cppflags + ' '
+        cppflags += client_cppflags + ' '
 
     if platform == 'linux':
         # Linux-only flags
-        flags += '-DLL_LINUX=1 '
+        cppflags += '-DLL_LINUX=1 '
         if build_target == 'client':
-            flags += '-DAPPID=secondlife -DLL_SDL=1 '
+            cppflags += '-DAPPID=secondlife -DLL_SDL=1 '
             if arch == 'x86_64' or arch == 'x86_64cross' or not enable_fmod:
-                flags += '-DLL_FMOD=0 '
-            flags += '-DLL_X11=1 -DLL_GTK=1 '
-            client_external_libs += [ 'gtk-x11-2.0', 'elfio' ]
-            include_dirs += [ '../libraries/' + system_str + '/include/gtk-2.0' ]
-            include_dirs += [ '../libraries/' + system_str + '/include/glib-2.0']
-            include_dirs += [ '../libraries/' + system_str + '/include/pango-1.0' ]
-            include_dirs += [ '../libraries/' + system_str + '/include/atk-1.0' ]
-            include_dirs += [ '../libraries/' + system_str + '/include/ELFIO' ]
-            include_dirs += [ '../libraries/' + system_str + '/include/llfreetype2' ]
+                cppflags += '-DLL_FMOD=0 '
+            cppflags += '-DLL_X11=1 -DLL_GTK=1 '
+            if standalone:
+                include_dirs += [d[2:] for d in
+                                 pkgconfig('--cflags-only-I').split()]
+            else:
+                client_external_libs += [ 'gtk-x11-2.0' ]
+                incdirs = [ 'ELFIO', 'atk-1.0', 'glib-2.0', 'gtk-2.0',
+                            'llfreetype2', 'pango-1.0' ]
+                include_dirs += ['../libraries/' + system_str + '/include/' + d
+                                 for d in incdirs]
+
+            if elfio:
+                client_external_libs += [ 'elfio' ]
+            else:
+                cppflags += '-DLL_ELFBIN=0 '
 
             # llmozlib stuff
             if enable_mozlib:
-                flags += '-DLL_LIBXUL_ENABLED=1 '
+                cppflags += '-DLL_LIBXUL_ENABLED=1 '
                 client_external_libs += [ 'llmozlib' ]
                 client_external_libs += [ 'mozjs', 'nspr4', 'plc4', 'plds4', 'profdirserviceprovider_s', 'xpcom', 'xul' ]
             else:
-                flags += '-DLL_LIBXUL_ENABLED=0 '
+                cppflags += '-DLL_LIBXUL_ENABLED=0 '
     else:
         # Mac-only flags
-        flags += '-x c++ -arch ppc -pipe -Wno-trigraphs -fpascal-strings -faltivec -fasm-blocks -g -fmessage-length=0 -mtune=G4 -Wno-deprecated-declarations -Wno-invalid-offsetof -mmacosx-version-min=10.3 -DLL_DARWIN=1 -Wmost -Wno-sign-compare -Wno-switch -fpch-preprocess -F./newview/build/Deployment -fconstant-cfstrings -ffor-scope -Wno-reorder -isysroot /Developer/SDKs/MacOSX10.3.9.sdk '
+        cflags += '-x c++ -arch ppc -pipe -Wno-trigraphs -fpascal-strings -faltivec -fasm-blocks -g -fmessage-length=0 -mtune=G4 -Wno-deprecated-declarations -Wno-invalid-offsetof -mmacosx-version-min=10.3 -Wmost -Wno-sign-compare -Wno-switch -fconstant-cfstrings -ffor-scope -Wno-reorder '
+        cppflags += '-x c++ -DLL_DARWIN=1 -fpch-preprocess -F./newview/build/Deployment -fconstant-cfstrings -isysroot /Developer/SDKs/MacOSX10.3.9.sdk '
+
+    cxxflags += cflags
 
     ### Build type-specific flags ###
 
-    debug_opts = flags + '-fno-inline -O0 -D_DEBUG -DLL_DEBUG=1 '
-    release_opts = flags + '-O2 -DNDEBUG -DLL_RELEASE=1 '
-    releasenoopt_opts = flags + '-O0 -DNDEBUG -DLL_RELEASE=1 '
-    releasefordownload_opts = flags + '-O2 -DNDEBUG -DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 '
+    debug_cflags = cflags + '-fno-inline -O0 '
+    debug_cppflags = cppflags + '-D_DEBUG -DLL_DEBUG=1 '
+    debug_cxxflags = cxxflags
+    release_cflags = cflags + '-O2 '
+    release_cppflags = cppflags + '-DNDEBUG -DLL_RELEASE=1 '
+    release_cxxflags = cxxflags
+    releasenoopt_cflags = cflags + '-O0 '
+    releasenoopt_cppflags = cppflags + '-DNDEBUG -DLL_RELEASE=1 '
+    releasenoopt_cxxflags = cxxflags
+    releasefordownload_cflags = cflags + '-O2 '
+    releasefordownload_cppflags = cppflags + '-DNDEBUG -DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 '
+    releasefordownload_cxxflags = cxxflags
 
     ################
     # ENVIRONMENT  #
     ################
 
-    gcc_bin = 'g++-3.4'
+    if standalone:
+        gcc_bin = 'g++'
+    else:
+        gcc_bin = 'g++-3.4'
+
     # If you strip more aggressively than -S then the quality of crash-
     # logger backtraces deteriorates.
     strip_cmd = 'strip -S -o $TARGET $SOURCE'
@@ -285,6 +342,10 @@ for build_target in targets:
     if os.path.isdir(mysql_lib_dir):
         lib_path.append(mysql_lib_dir)
 
+    if standalone:
+        system_link_flags += pkgconfig('--libs-only-L') + ' '
+        system_link_flags += pkgconfig('--libs-only-other') + ' '
+
     base_env = Environment(CXX = compiler,
             CPPPATH = include_dirs,
             LIBPATH = lib_path,
@@ -292,16 +353,24 @@ for build_target in targets:
 
     ### Environments for various build types ###
 
-    env = base_env.Copy(CPPFLAGS = releasefordownload_opts)
+    env = base_env.Copy(CFLAGS=releasefordownload_cflags,
+                        CPPFLAGS=releasefordownload_cppflags,
+                        CXXFLAGS=releasefordownload_cxxflags)
 
     if buildtype == 'debug':
-        env = base_env.Copy(CPPFLAGS = debug_opts)
+        env = base_env.Copy(CFLAGS=debug_cflags,
+                            CPPFLAGS=debug_cppflags,
+                            CXXFLAGS=debug_cxxflags)
 
     if buildtype == 'release':
-        env = base_env.Copy(CPPFLAGS = release_opts)
+        env = base_env.Copy(CFLAGS=release_cflags,
+                            CPPFLAGS=release_cppflags,
+                            CXXFLAGS=release_cxxflags)
 
     if buildtype == 'releasenoopt':
-        env = base_env.Copy(CPPFLAGS = releasenoopt_opts)
+        env = base_env.Copy(CFLAGS=releasenoopt_cflags,
+                            CPPFLAGS=releasenoopt_cppflags,
+                            CXXFLAGS=releasenoopt_cxxflags)
 
     # ccache needs this to be set
     try:
@@ -381,7 +450,7 @@ for build_target in targets:
         source_files = 'files.lst',
         extra_depends=None):
         files_list = load_files(input_dir, source_files)
-        BuildDir(build_dir + '/' + input_dir, input_dir)
+        BuildDir(build_dir + '/' + input_dir, input_dir, duplicate=duplicate)
         local_env = env.Copy(CPPFLAGS = env['CPPFLAGS'] + ' ' + local_flags)
         if extra_depends:
             for x in files_list:
@@ -395,20 +464,26 @@ for build_target in targets:
     def create_dynamic_module(
         module,
         local_flags="",
-        module_libs = None,
+        module_libs = [],
         source_files = 'files.lst'):
         files_list = load_files(module, source_files)
-        BuildDir(build_dir + '/' + module, module)
+        BuildDir(build_dir + '/' + module, module, duplicate=duplicate)
         local_env = env.Copy(CPPFLAGS = env['CPPFLAGS'] + ' ' + local_flags)
         tgt = local_env.SharedLibrary(lib_dir + '/' + module, files_list, LIBS = module_libs)
         Default(tgt)
 
+    def create_cond_module(module, module_libs=[]):
+        if build_target != 'client' or not opensource:
+            create_static_module(module=module)
+        else:
+            create_dynamic_module(module=module, module_libs=module_libs)
+
     ### Create an executable from the module ###
 
     def create_executable(
         exec_file, module, module_libs, source_files = 'files.lst'):
         files_list = load_files(module, source_files)
-        BuildDir(build_dir + '/' + module, module)
+        BuildDir(build_dir + '/' + module, module, duplicate=duplicate)
         tgt = env.Program(exec_file, files_list, LIBS = module_libs)
         Default(tgt)
 
@@ -417,11 +492,12 @@ for build_target in targets:
     # BUILD LIBRARIES  #
     ####################
 
-    create_static_module('llcommon')
-    create_static_module('llmath')
+    create_cond_module('llcommon')
+    create_cond_module('llmath')
+    create_cond_module('llvfs')
+    create_cond_module('llimagej2coj', module_libs=['openjpeg'])
+    create_cond_module('llimage', module_libs=['llimagej2coj', 'jpeg', 'png12'])
     create_static_module('llmessage')
-    create_static_module('llvfs')
-    create_static_module('llimage')
     create_static_module('llinventory')
     create_static_module('llcharacter')
     create_static_module('llprimitive')
@@ -431,7 +507,11 @@ for build_target in targets:
     create_static_module('lscript', extra_depends=build_dir + '/lscript/lscript_compile/indra.y.h')
 
     net_external_libs = [ 'curl', 'cares', 'ssl', 'crypto', 'expat', 'aprutil-1', 'apr-1' ]
-    common_external_libs = net_external_libs + [ 'xmlrpc', 'z' ]
+    common_external_libs = net_external_libs + [ 'z' ]
+    if standalone and fedora:
+        common_external_libs += [ 'xmlrpc-epi' ]
+    else:
+        common_external_libs += [ 'xmlrpc' ]
 
     if build_target == 'client':
         if platform == 'linux':
@@ -439,16 +519,22 @@ for build_target in targets:
             # BUILD LINUX_CRASH_LOGGER  #
             #############################
             output_crashlogger_bin = 'linux_crash_logger/linux-crash-logger-' + arch + '-bin'
-            external_libs = net_external_libs + [ 'db-4.2', 'gtk-x11-2.0' ]
+            if standalone:
+                external_libs = net_external_libs + [ 'db' ]
+                external_libs += [d[2:] for d in
+                                  pkgconfig('--libs-only-l', 'gtk+-2.0').split()]
+            else:
+                external_libs = net_external_libs + [ 'db-4.2', 'gtk-x11-2.0' ]
             external_libs.remove('cares')
             internal_libs = [ 'llvfs', 'llmath', 'llcommon' ]
-            create_executable(output_crashlogger_bin + '-globalsyms', 'linux_crash_logger', internal_libs + external_libs)
+            create_executable(output_crashlogger_bin + '-globalsyms',
+                              'linux_crash_logger',
+                              internal_libs + external_libs)
             env.Command(output_crashlogger_bin, output_crashlogger_bin + '-globalsyms', hidesyms_cmd)
 
         create_static_module('llaudio')
         create_static_module('llmedia')
         create_static_module('llui')
-        create_static_module('llimagej2coj')
 
         if not opensource:
             create_dynamic_module('llkdu', '', ['llimage', 'llvfs', 'llmath', 'llcommon', 'apr-1', 'kdu_v42R'])
@@ -458,7 +544,17 @@ for build_target in targets:
         ##################
         output_bin = 'newview/secondlife-' + arch + '-bin'
 
-        external_libs = client_external_libs + common_external_libs + [ 'freetype', 'jpeg', 'SDL', 'GL', 'GLU', 'ogg', 'vorbisenc', 'vorbisfile', 'vorbis', 'db-4.2', 'openjpeg' ]
+        external_libs = client_external_libs + common_external_libs
+
+        if standalone:
+            external_libs += [ 'db' ]
+            external_libs += [ d[2:] for d in
+                              pkgconfig('--libs-only-l').split() ]
+        else:
+            external_libs += [ 'freetype', 'SDL', 'ogg', 'vorbisenc',
+                               'vorbisfile', 'vorbis', 'db-4.2' ]
+
+        external_libs += [ 'jpeg', 'openjpeg', 'png12', 'GL', 'GLU' ]
 
         if arch != 'x86_64' and arch != 'x86_64cross':
             if enable_fmod:
@@ -540,7 +636,7 @@ for build_target in targets:
         # Dataserver
         Depends('dataserver/dataserver', 'launcher/launcher' + file_suffix)
         external_libs = common_external_libs + ['boost_regex-gcc-mt', 'mysqlclient', 'tcmalloc', 'stacktrace']
-        internal_libs = [ 'llcharacter', 'lldatabase', 'llimage', 'llinventory',
+        internal_libs = [ 'llcharacter', 'lldatabase', 'llimage', 'llimagej2coj', 'llinventory',
                 'llscene', 'llmessage', 'llvfs', 'llxml', 'llcommon', 'llmath' ]
         create_executable('dataserver/dataserver' + file_suffix, 'dataserver', 
                             internal_libs + external_libs)
@@ -563,8 +659,7 @@ for build_target in targets:
 
         # Rpcserver
         Depends('rpcserver/rpcserver', 'userserver/userserver' + file_suffix)
-        external_libs = common_external_libs + ['xmlrpc', 
-            'mysqlclient']
+        external_libs = common_external_libs + ['xmlrpc', 'mysqlclient']
         internal_libs = ['llscene', 'llmessage', 'lldatabase', 'llvfs', 
                 'llmath', 'llcommon']
         create_executable('rpcserver/rpcserver' + file_suffix, 'rpcserver',
@@ -573,27 +668,28 @@ for build_target in targets:
         # Mapserver
         Depends('mapserver/mapserver', 'rpcserver/rpcserver' + file_suffix)
         external_libs = common_external_libs + ['OSMesa16', 'kdu', 
-                'boost_regex-gcc-mt', 'iconv', 'jpeg', 'GL',
+                'boost_regex-gcc-mt', 'iconv', 'jpeg', 'openjpeg', 'GL',
                 'mysqlclient', 'pthread', 'dl']
-        internal_libs = ['llrender', 'llwindow', 'llimage', 'lldatabase', 'llprimitive', 'llmessage', 'llkdustatic',
+        internal_libs = ['llrender', 'llwindow', 'llimage', 'llimagej2coj', 'lldatabase', 'llprimitive', 'llmessage', 'llkdustatic',
                 'llxml', 'llvfs', 'llmath', 'llcommon']
         create_executable('mapserver/mapserver' + file_suffix, 'mapserver',
                             internal_libs + external_libs)
         
         # Simulator
         Depends('newsim/simulator' + file_suffix, 'mapserver/mapserver' + file_suffix)
-        external_libs = common_external_libs + ['hkdynamics', 'hkgeometry', 'hkmath', 'hkbase', 'hkcollide', 'hkactions', 'boost_regex-gcc-mt', 'dl', 'kdu', 'mysqlclient', 'iconv', 'tcmalloc', 'stacktrace']
+        external_libs = common_external_libs + ['hkdynamics', 'hkgeometry', 'hkmath', 'hkbase', 'hkcollide', 'hkactions', 'boost_regex-gcc-mt', 'openjpeg', 'dl', 'kdu', 'mysqlclient', 'iconv', 'tcmalloc', 'stacktrace']
         internal_libs = [ 'lscript', 'llprimitive',
-                 'llscene', 'llhavok', 'llinventory', 'llimage',
+                 'llscene', 'llhavok', 'llinventory', 'llimage', 'llimagej2coj',
                  'llcharacter', 'llxml', 'lldatabase', 'llkdustatic',
                  'llmessage', 'llvfs', 'llmath', 'llcommon' ]
         create_executable('newsim/simulator' + file_suffix, 'newsim', 
                             internal_libs + external_libs)
 
         # texture upload verifier
-        external_libs = common_external_libs + [ 'kdu', 'dl' ]
+        external_libs = common_external_libs + [ 'kdu', 'openjpeg', 'dl' ]
         internal_libs = [
             'llimage',
+            'llimagej2coj',
             'llkdustatic',
             'llinventory',
             'llmessage',