[cig-commits] commit: Swapping over to the new SConfigure repo.
Mercurial
hg at geodynamics.org
Mon Nov 24 11:23:04 PST 2008
changeset: 79:1c72512339ff
user: LukeHodkinson
date: Mon Jun 23 04:17:39 2008 +0000
files: SConstruct config/SConfig/Node.py config/SConfig/Package.py config/SConfig/Platform.py config/SConfig/Project.py config/SConfig/SConscript config/SConfig/__init__.py config/SConfig/packages/BlasLapack.py config/SConfig/packages/CompilerFlags.py config/SConfig/packages/HDF5.py config/SConfig/packages/MPI.py config/SConfig/packages/OSMesa.py config/SConfig/packages/OpenGL.py config/SConfig/packages/PETSc.py config/SConfig/packages/PETScExt.py config/SConfig/packages/PICellerator.py config/SConfig/packages/SDL.py config/SConfig/packages/SVNRevision.py config/SConfig/packages/StGermain.py config/SConfig/packages/StgDomain.py config/SConfig/packages/StgFEM.py config/SConfig/packages/X11.py config/SConfig/packages/__init__.py config/SConfig/packages/cmath.py config/SConfig/packages/dl.py config/SConfig/packages/libFAME.py config/SConfig/packages/libJPEG.py config/SConfig/packages/libPNG.py config/SConfig/packages/libTIFF.py config/SConfig/packages/libXML2.py config/SConfig/packages/libavcodec.py config/SConfig/packages/pcu.py
description:
Swapping over to the new SConfigure repo.
diff -r 3eb020887a5a -r 1c72512339ff SConstruct
--- a/SConstruct Fri May 23 04:31:42 2008 +0000
+++ b/SConstruct Mon Jun 23 04:17:39 2008 +0000
@@ -2,14 +2,20 @@ import sys, os
sys.path.insert(0, os.path.abspath(os.path.join(os.getcwd(), 'config')))
import SConfig
-SConscript('config/SConfig/SConscript')
#
# CUSTOMISE THE ENVIRONMENT HERE.
#
-env = Environment(ENV=os.environ)
-env['_abspath'] = lambda x: File(x).abspath # Needed by Darwin.
+import platform
+if platform.platform().find('ia64') != -1:
+ # Hack needed for APAC, damn it all!
+ env = Environment(ENV=os.environ, tools=['gcc', 'gnulink'])
+ import SCons.Tool
+ SCons.Tool.createStaticLibBuilder(env)
+else:
+ env = Environment(ENV=os.environ)
+SConscript('config/SConfig/SConscript', exports='env')
# Determine whether we are configuring, helping or building.
if 'config' in COMMAND_LINE_TARGETS or 'help' in COMMAND_LINE_TARGETS:
@@ -75,3 +81,7 @@ else:
SConscript('Magma/SConscript', exports='env')
if env['with_glucifer']:
SConscript('gLucifer/SConscript', exports='env')
+
+ # Dump package config.
+ filename = env.get_build_path('lib/pkgconfig/stgermain.pc')
+ env.write_pkgconfig(filename, 'StGermain', 'The StGermain Framework')
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/Node.py
--- a/config/SConfig/Node.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,207 +0,0 @@
-import os
-
-class Node(object):
- def __init__(self, scons_env, scons_opts, required=False):
- # Override to give a different name.
- self.name = self.__module__.split('.')[-1]
-
- # Option variables.
- self.command_name = self.name.lower()
- self.environ_name = self.name.upper()
- self.option_map = {} # Maps command-line options to their environment alternatives.
-
- # Override with a list of methods to run during configuration.
- self.checks = []
-
- # Will be set after configuration.
- self.configured = False
- self.result = False
-
- # Private stuff.
- self.env = scons_env
- self.opts = scons_opts
- self.required = required
- self.deps = []
-
- # Setup our option database.
- self.setup_options()
- self.opts.Update(self.env)
-
- def setup_options(self):
- """Setup all the options for this package."""
- pass
-
- def dependency(self, package_module, required=True, **kw):
- """Add another package as a dependency of this package. If required is False, the
- dependent package is not required, and thus will not cause this package to fail if
- it cannot be found."""
- if self.configured:
- print 'Error: Cannot add a dependency during configuration.'
- self.env.Exit()
- pkg = self.env.Package(package_module, required, **kw)
- if pkg not in [d[0] for d in self.deps]:
- self.deps += [(pkg, required)]
- return pkg
-
- def setup(self):
- """Anything that needs to be finalised before continuing with the configuration needs
- to go here."""
- pass
-
- def configure(self, scons_ctx):
- """Perform the configuration of this package."""
- # Basic setup.
- if self.configured:
- return
- self.ctx = scons_ctx
- self.process_options()
- self.configured = True
-
- # Setup basic stuff.
- old_state = self.process_dependencies()
- self.ctx.Message('Configuring package %s ... ' % self.name)
- self.ctx.Display('\n')
- result = True
- for pkg, req in self.deps: # Check we have all dependencies.
- if req and not pkg.result:
- self.ctx.Display(' Missing dependency: ' + pkg.name + '\n')
- result = False
-
- # Perform as many checks as we can without failing.
- if result:
- for check in self.checks:
- result = check()
- if not result:
- break
-
- # If everything succeeded, display configuration results.
- if result:
- self.display_configuration()
-
- # Handle results.
- self.restore_state(self.env, old_state)
- self.result = result
- self.ctx.Display(' ')
- self.ctx.Result(result)
-
- # If this was a critical fail, try and help the user.
- if self.required and not result:
- self.ctx.Display('\nThe required package ' + self.name + ' could not be found.\n')
- self.ctx.Display('The printouts above should provide some information on what went\n')
- self.ctx.Display('wrong. To see further details, please read the \'config.log\' file.\n')
- if len(self.option_map.keys()):
- self.ctx.Display('You can directly specify search parameters for this package via\n')
- self.ctx.Display('the following command line options:\n\n')
- for opt in self.option_map.iterkeys():
- self.ctx.Display(' ' + opt + '\n')
- self.ctx.Display('\nRun \'scons help\' for more details on these options.\n\n')
- self.env.Exit()
-
- def enable(self, scons_env, old_state=None):
- """Modify the SCons environment to have this package enabled. Begin by inserting
- all options on this node into the environment."""
- for pkg, req in self.deps: # Enable dependencies first.
- if pkg.result:
- pkg.enable(scons_env, old_state)
- for opt in self.option_map.iterkeys(): # Now add options.
- if opt in self.env._dict:
- scons_env[opt] = self.env[opt]
-
- def backup_variable(self, scons_env, var_name, old_state):
- if old_state is None:
- return
- if var_name not in old_state:
- if var_name in scons_env._dict:
- old_state[var_name] = scons_env[var_name]
- else:
- old_state[var_name] = None
-
- def restore_state(self, scons_env, old_state):
- for var_name, state in old_state.iteritems():
- if state is None:
- del scons_env[var_name]
- else:
- scons_env[var_name] = state
-
- def process_options(self):
- """Do any initial option processing, including importing any values from
- the environment and validating that all options are consistent."""
- cmd_opts = False
- for opt in self.option_map.iterkeys():
- if opt in self.opts.args:
- cmd_opts = True
- break
- if cmd_opts:
- return
- for cmd, env in self.option_map.iteritems():
- if cmd not in self.opts.args and env in self.env['ENV']:
- self.env[cmd] = self.env['ENV'][env]
-
- def process_dependencies(self):
- """Ensure all dependencies have been configured before this package."""
- old_state = {}
- for pkg, req in self.deps:
- pkg.configure(self.ctx)
- if pkg.result:
- pkg.enable(self.env, old_state)
- return old_state
-
- def compile_source(self, source):
- """At this point we know all our construction environment has been set up,
- so we should be able to compile some source code."""
- result = self.run_scons_cmd(self.ctx.TryCompile, source, '.c')
- return [result[0], result[1]]
-
- def link_source(self, source):
- """At this point we know all our construction environment has been set up,
- so we should be able to build and run the application."""
- result = self.run_scons_cmd(self.ctx.TryLink, source, '.c')
- return [result[0], result[1]]
-
- def run_source(self, source):
- """At this point we know all our construction environment has been set up,
- so we should be able to build and run the application."""
- result = self.run_scons_cmd(self.ctx.TryRun, source, '.c')
- return [result[0][0], result[0][1], result[1]]
-
- def run_scons_cmd(self, cmd, *args, **kw):
- old_log = self.ctx.sconf.logstream
- self.ctx.sconf.logstream = open('sconfig.log', 'w') # Capture the log.
- res = cmd(*args, **kw) # Execute the command.
- try:
- self.ctx.sconf.logstream.close() # Make sure the file is closed.
- finally:
- pass
- self.ctx.sconf.logstream = old_log # Replace the old log.
-
- # Return results.
- log_file = open('sconfig.log', 'r')
- log = log_file.read()
- log_file.close()
- os.remove('sconfig.log')
- old_log.write(log)
- return [res, log]
-
- def display_configuration(self):
- """Print out a brief summary of what options we found/used."""
- pass
-
- def push_state(self, state, append=False):
- old = {}
- copy = dict(state)
- for k, v in copy.iteritems():
- if not v:
- continue
- if not isinstance(v, list):
- copy[k] = [v]
- else:
- copy[k] = v
- old[k] = self.env.get(k, [])
- if append:
- self.env.AppendUnique(**copy)
- else:
- self.env.PrependUnique(**copy)
- return old
-
- def pop_state(self, old):
- self.env.Replace(**old)
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/Package.py
--- a/config/SConfig/Package.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,501 +0,0 @@
-import os, platform, glob
-import SCons.Script
-import SConfig
-
-class Package(SConfig.Node):
- def __init__(self, scons_env, scons_opts, required=False, **kw):
- SConfig.Node.__init__(self, scons_env, scons_opts, required)
-
- # This will be set in the preprocessor.
- self.have_define = kw.get('have_define', '')
-
- # Search options.
- self.base_dirs = [] #['']
- self.base_patterns = [] #['']
- self.sub_dirs = [] #[[[''], ['']]]
- self.header_sub_dir = [] #['']
- self.system_header_dirs = []
- self.system_library_dirs = []
-
- # Which headers do we require?
- self.headers = [[]] #[['']]
-
- # Library options.
- self.libraries = [] #[['']]
- self.extra_libraries = [] #['']
- self.shared_libraries = [] # Only libraries listed here will be considered
- # when checking for shared libraries.
- self.require_shared = False
- self.symbols = [([], '')] #[([''], '')]
- self.symbol_setup = ''
- self.symbol_teardown = ''
- self.symbol_prototypes = [] #['']
- self.symbol_calls = [] #['']
-
- # Framework options.
- self.frameworks = [] #[['']]
-
- # Will be set after configuration.
- self.base_dir = ''
- self.hdr_dirs = []
- self.lib_dirs = []
- self.hdrs = []
- self.libs = []
- self.have_shared = None
- self.fworks = []
- self.cpp_defines = []
-
- # Private stuff.
- self.platform = self.dependency(SConfig.Platform, True) # Need this so we can get
- # access to information about
- # the platform we're running on.
- self.checks = [self.find_package] # The basic package location check.
-
- # Set everything up.
- self.setup_search_defaults()
-
- def setup_options(self):
- SConfig.Node.setup_options(self)
- self.opts.AddOptions(
- SCons.Script.BoolOption('with_' + self.command_name,
- 'Turn on/off package %s' % self.name, 1),
- SCons.Script.PathOption(self.command_name + '_dir',
- '%s installation path' % self.name,
- None, SCons.Script.PathOption.PathIsDir),
- SCons.Script.PathOption(self.command_name + '_inc_dir',
- '%s header installation path' % self.name,
- None, SCons.Script.PathOption.PathIsDir),
- SCons.Script.PathOption(self.command_name + '_lib_dir',
- '%s library installation path' % self.name,
- None, SCons.Script.PathOption.PathIsDir),
- (self.command_name + '_lib',
- '%s libraries' % self.name,
- None, None),
- (self.command_name + '_framework',
- '%s framework' % self.name,
- None, None))
- self.option_map = {'with_' + self.command_name: None,
- self.command_name + '_dir': self.environ_name + '_DIR'}
-
- def setup_search_defaults(self):
- """Setup the usual search paths for packages depending on the kind of system
- we're on."""
- if self.platform.system in ['Darwin', '*ix']:
- self.base_dirs = ['/usr', '/usr/local']
- self.sub_dirs = [[['include'], ['lib']]]
- if self.platform.bits == 64:
- self.sub_dirs = [[['include'], ['lib64']],
- [['include'], [os.path.join('lib', '64')]]] + self.sub_dirs
-
- # Set Darwin specific defaults.
- if self.platform.system == 'Darwin':
- self.base_dirs += ['/sw']
-
- # Set Window specific defaults.
- if self.platform.system == 'Windows':
- pass # TODO
-
- # Combine these guys to build default system paths. We need these to ensure specific
- # include paths are used before generic ones.
- for base_dir in ['/usr', '/sw']:
- for hdr_dirs, lib_dirs in self.combine_sub_dirs(base_dir):
- hdr_dirs = [os.path.join(base_dir, h) for h in hdr_dirs]
- self.system_header_dirs += [h for h in hdr_dirs if h not in self.system_header_dirs]
- lib_dirs = [os.path.join(base_dir, l) for l in lib_dirs]
- self.system_library_dirs += [l for l in lib_dirs if l not in self.system_library_dirs]
-
- def get_check_headers_fail_reason(self, fail_logs):
- return ''
-
- def get_check_symbols_fail_reason(self, fail_logs):
- return ''
-
- def configure(self, scons_ctx):
- if not self.required and not self.env['with_' + self.command_name]:
- return
- SConfig.Node.configure(self, scons_ctx)
-
- def setup(self):
- SConfig.Node.setup(self)
- if self.require_shared:
- self.dependency(SConfig.packages.dl)
-
- def find_package(self):
- """Basic check routine for locating the package."""
- result = False
- any_locs = False
- for loc in self.generate_locations():
- if not any_locs:
- any_locs = True
- self.ctx.Display(' Searching locations:\n')
- self.ctx.Display(' %s\n' % str(loc))
- result = self.check_location(loc)
- if result:
- if self.have_define:
- self.cpp_defines += [self.have_define]
- self.base_dir = loc[0]
- self.hdr_dirs = loc[1]
- self.lib_dirs = loc[2]
- self.fworks = loc[3]
- break
- if not any_locs:
- self.ctx.Display(' No valid locations found\n')
- return result
-
- def check_location(self, location):
- """Check if the currently selected location is a valid installation of the
- required package. At this stage we know that the paths given in the location
- actually exist."""
- old_state = self.enable_location_state(location)
-
- # Check for the headers.
- if not self.check_headers(location):
- self.pop_state(old_state)
- return False
-
- # Scan each set of libraries in turn.
- if not self.check_libraries(location):
- self.pop_state(old_state)
- return False
-
- self.pop_state(old_state)
- return True
-
- def check_headers(self, location):
- """Determine if the required headers are available with the current construction
- environment settings."""
- fail_logs = []
- for hdrs in self.headers:
- src = self.get_header_source(hdrs)
- result = self.compile_source(src)
- if result[0]:
- self.hdrs = list(hdrs)
- break
- fail_logs += [result[1]]
- if not result[0]:
- msg = self.get_check_headers_fail_reason(fail_logs)
- if not msg:
- msg = 'Headers not found.'
- self.ctx.Display(' ' + msg + '\n')
- return result[0]
-
- def check_libraries(self, location):
- """Check if the currently selected location is a valid installation of the
- required package. At this stage we know that the paths given in the location
- actually exist and we need to confirm that the libraries in 'libs' exist."""
- fail_reasons = []
- no_shared = False
- for libs in self.generate_libraries(location):
- old_state = self.enable_library_state(location, libs)
-
- # Check that we can link against the libraries by trying to link against
- # a particular set of symbols.
- result = self.check_symbols(location, libs)
- if not result[0]:
- fail_reasons += [result[1]]
- self.pop_state(old_state)
- continue
-
- # Check if we have shared libraries.
- if not self.require_shared or not libs:
- self.libs = list(libs)
- self.pop_state(old_state)
- return True
- elif self.check_shared(location, libs):
- self.libs = list(libs)
- self.pop_state(old_state)
- return True
- else:
- no_shared = True
-
- # Figure out what to report.
- if no_shared:
- reason = 'No shared libraries.'
- else:
- reason = ''
- for reason in fail_reasons:
- if reason:
- break
- if not reason:
- reason = 'Libraries not found.'
- self.ctx.Display(' ' + reason + '\n')
-
- self.pop_state(old_state)
- return False
-
- def check_symbols(self, location, libraries):
- """We have our paths and libraries setup, now we need to see if we can find
- one of the set of required symbols in the libraries."""
- fail_logs = []
- for syms in self.symbols:
- result = self.link_source(self.get_check_symbols_source(syms[0]))
- if result[0]:
- if syms[1]:
- self.cpp_defines += [syms[1]] # Add the CPP defines.
- break
- fail_logs += [result[1]]
- if not result[0]:
- reason = self.get_check_symbols_fail_reason(fail_logs)
- else:
- reason = ''
- return [result[0], reason]
-
- def check_shared(self, location, libraries):
- """Confirm that there are shared versions of this package's libraries available.
- At this point we know we can link against the libraries."""
- # Build a binary to try and dynamically open the libraries in order.
- result = [1, '', '']
- src = self.get_header_source()
- src += """
-int main(int argc, char* argv[]) {
- void* lib[%d];
-""" % len(libraries)
- for l in libraries:
- if self.shared_libraries and l not in self.shared_libraries:
- continue
- if l in self.extra_libraries:
- continue
- offs = ''
- for p in self.generate_library_paths(location, l):
- offs += ' '
- if len(offs) > 2:
- src += '{\n'
- src += '%slib[%d] = dlopen("%s", RTLD_NOW);\n' % (offs, libraries.index(l), p)
- src += '%sif( !lib[%d] ) ' % (offs, libraries.index(l))
- src += 'return 1;\n'
- while len(offs) > 2:
- offs = offs[:-2]
- src += offs + '}\n'
- src += ' return 0;\n}\n'
- if not self.run_source(src)[0]:
- return False
- return True
-
- def generate_library_paths(self, location, library):
- lib_name = self.env.subst('${SHLIBPREFIX}' + library + '${SHLIBSUFFIX}')
- if location[2]:
- for d in location[2]:
- path = os.path.join(location[0], d, lib_name)
- yield os.path.abspath(path)
- else:
- yield lib_name
-
- def generate_locations(self):
- """Generate a set of potential package locations. Locations are of the form
- ['base_dir', ['header_dirs'], ['lib_dirs'], ['frameworks']]."""
- # If we've been given options directly specifying the location of this
- # package we need to use those in place of searching for locations.
- base_dir = self.env.get(self.command_name + '_dir', '')
- inc_dir = self.env.get(self.command_name + '_inc_dir', '')
- lib_dir = self.env.get(self.command_name + '_lib_dir', '')
- fwork = self.env.get(self.command_name + '_framework', '')
- if inc_dir or lib_dir:
- if not (inc_dir and lib_dir):
- print ' Error: must specify both of'
- print ' ' + self.command_name + '_inc_dir'
- print ' ' + self.command_name + '_lib_dir'
- env.Exit()
- yield ['', [inc_dir], [lib_dir], [fwork]]
- return
- have_loc = base_dir or inc_dir or lib_dir
-
- # Produce an empty location to see if the package exists in a default
- # location.
- if not have_loc:
- yield ['', [], [], []]
-
- # Combine all possible base directories.
- if not base_dir:
- base_dirs = list(self.base_dirs)
- for dir in self.base_dirs:
- for ptrn in self.base_patterns:
- base_dirs += glob.glob(os.path.join(dir, ptrn))
- else:
- base_dirs = [base_dir]
-
- # Add an empty set to the beginning of the frameworks.
- if not fwork:
- frameworks = [[]] + self.frameworks
- else:
- frameworks = [fwork]
-
- for fw in frameworks:
- # If we have some frameworks, try them alone first.
- if not have_loc and fw:
- yield ['', [], [], list(fw)]
-
- # Traverse the list of base directories, using them only if they exist.
- for dir in base_dirs:
- if os.path.exists(dir) and os.path.isdir(dir):
- for hdr, lib in self.combine_sub_dirs(dir):
- yield [dir, list(hdr), list(lib), list(fw)]
- for sub in self.combine_header_sub_dir(dir, hdr):
- yield [dir, list(sub), list(lib), list(fw)]
-
- def combine_sub_dirs(self, base_dir):
- """Take a base directory and combine it with the set of header and library
- subdirectories. Yields (['header_dirs'], ['lib_dirs'])."""
- for hdr, lib in self.sub_dirs:
- loc_okay = True
- hdr_dirs = []
- lib_dirs = []
-
- # Combine header subdirectories.
- for h in hdr:
- dir = self.join_sub_dir(base_dir, h)
- if not (os.path.exists(dir) and os.path.isdir(dir)):
- loc_okay = False
- break
- hdr_dirs += [h]
- if not loc_okay:
- continue
-
- # Combine library subdirectories.
- for l in lib:
- dir = self.join_sub_dir(base_dir, l)
- if not (os.path.exists(dir) and os.path.isdir(dir)):
- loc_okay = False
- break
- lib_dirs += [l]
- if not loc_okay:
- continue
-
- yield (hdr_dirs, lib_dirs)
-
- def combine_header_sub_dir(self, base_dir, hdr_dirs):
- if not self.header_sub_dir or not hdr_dirs:
- return
- for sub_dir in self.header_sub_dir:
- cand = [os.path.join(h, sub_dir) for h in hdr_dirs if h]
- for d in cand:
- path = os.path.join(base_dir, d)
- if not (os.path.exists(path) and os.path.isdir(path)):
- return
- yield cand
-
- def join_sub_dir(self, base_dir, sub_dir):
- if os.path.isabs(sub_dir):
- return sub_dir
- return os.path.join(base_dir, sub_dir)
-
- def generate_libraries(self, location):
- if location[3]: # Try any frameworks by themselves first.
- yield self.extra_libraries
- for libs in self.libraries:
- yield libs + self.extra_libraries
-
- def enable_location_state(self, location):
- """Modify our environment to include search paths for the current location."""
- old_state = {}
- if location[1]:
- old_state['CPPPATH'] = self.env.get('CPPPATH', [])
- self.env.PrependUnique(CPPPATH=[self.join_sub_dir(location[0], l) for l in location[1]])
- if location[2]:
- old_state['LIBPATH'] = self.env.get('LIBPATH', [])
- old_state['RPATH'] = self.env.get('RPATH', [])
- lib_paths = [self.join_sub_dir(location[0], l) for l in location[2]]
- self.env.PrependUnique(LIBPATH=lib_paths)
- self.env.PrependUnique(RPATH=[os.path.abspath(p) for p in lib_paths])
- if location[3]:
- old_state['FRAMEWORKS'] = self.env.get('FRAMEWORKS', [])
- self.env.PrependUnique(FRAMEWORKS=location[3])
- if 'CPPPATH' not in old_state:
- old_state['CPPPATH'] = self.env.get('CPPPATH', [])
- for fw in location[3]: # Sort of a hack for Mac OS X.
- path = '/System/Library/Frameworks/' + fw + '.framework/Headers'
- self.env.PrependUnique(CPPPATH=[path])
- return old_state
-
- def enable_library_state(self, location, libs):
- """Take the current location and libraries and convert them into an SCons
- construction environment state dictionary."""
- old_state = {}
- if libs:
- old_state['LIBS'] = self.env.get('LIBS', [])
- self.env.PrependUnique(LIBS=libs)
- return old_state
-
- def enable(self, scons_env, old_state=None):
- SConfig.Node.enable(self, scons_env, old_state)
- if self.cpp_defines:
- self.backup_variable(scons_env, 'CPPDEFINES', old_state)
- scons_env.AppendUnique(CPPDEFINES=self.cpp_defines)
-
- if self.hdr_dirs:
- self.backup_variable(scons_env, 'CPPPATH', old_state)
- for d in self.hdr_dirs:
- full_dir = self.join_sub_dir(self.base_dir, d)
- if full_dir in self.system_header_dirs:
- if not os.path.isabs(full_dir): full_dir = '#' + full_dir
- scons_env.AppendUnique(CPPPATH=[full_dir])
- else:
- if not os.path.isabs(full_dir): full_dir = '#' + full_dir
- scons_env.PrependUnique(CPPPATH=[full_dir])
-
- if self.fworks:
- self.backup_variable(scons_env, 'FRAMEWORKS', old_state)
- self.backup_variable(scons_env, 'CPPPATH', old_state)
- scons_env.PrependUnique(FRAMEWORKS=self.fworks)
- for fw in self.fworks: # Sort of a hack for Mac OS X.
- path = '/System/Library/Frameworks/' + fw + '.framework/Headers'
- self.env.PrependUnique(CPPPATH=[path])
-
- if self.lib_dirs:
- self.backup_variable(scons_env, 'LIBPATH', old_state)
- self.backup_variable(scons_env, 'RPATH', old_state)
- for d in self.lib_dirs:
- full_dir = self.join_sub_dir(self.base_dir, d)
- abs_dir = os.path.abspath(full_dir)
- if full_dir in self.system_library_dirs:
- if not os.path.isabs(full_dir): full_dir = '#' + full_dir
- scons_env.AppendUnique(LIBPATH=[full_dir])
- scons_env.AppendUnique(RPATH=[abs_dir])
- else:
- if not os.path.isabs(full_dir): full_dir = '#' + full_dir
- scons_env.PrependUnique(LIBPATH=[full_dir])
- scons_env.PrependUnique(RPATH=[abs_dir])
-
- if self.libs:
- self.backup_variable(scons_env, 'LIBS', old_state)
- scons_env.PrependUnique(LIBS=self.libs)
-
- def display_configuration(self):
- SConfig.Node.display_configuration(self)
- if self.have_define:
- self.ctx.Display(' Exporting: %s\n' % self.have_define)
-
- def get_all_headers(self, headers):
- if not self.result:
- return
- for d, r in self.deps:
- if hasattr(d, 'get_all_headers'):
- d.get_all_headers(headers)
- headers += [h for h in self.hdrs if h not in headers]
-
- def get_header_source(self, headers=None):
- src = '#include<stdlib.h>\n#include<stdio.h>\n#include<string.h>\n'
- hdrs = []
- for d, r in self.deps:
- if hasattr(d, 'get_all_headers'):
- d.get_all_headers(hdrs)
- if headers is None:
- hdrs += list(self.hdrs)
- else:
- hdrs += list(headers)
- for h in hdrs:
- src += '#include<' + h + '>\n'
- return src
-
- def get_check_symbols_source(self, symbols):
- src = self.get_header_source()
- for sym, proto in zip(symbols, self.symbol_prototypes):
- src += (proto % sym) + '\n'
- src += 'int main(int argc, char* argv[]) {\n'
- if self.symbol_setup:
- src += self.symbol_setup + '\n'
- for sym, call in zip(symbols, self.symbol_calls):
- src += (call % sym) + '\n'
- if self.symbol_teardown:
- src += self.symbol_teardown + '\n'
- src += 'return 0;\n}\n'
- return src
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/Platform.py
--- a/config/SConfig/Platform.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-import os, platform
-import SCons.Script
-import SConfig
-
-class Platform(SConfig.Node):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Node.__init__(self, scons_env, scons_opts, required)
- self.checks = [self.print_results]
-
- # Will be set after successful configuration.
- self.system = ''
- self.bits = 0
-
- # We need to do these now.
- self.check_system()
- self.check_bits()
- self.check_CC()
-
- def setup_options(self):
- self.opts.AddOptions(
- SCons.Script.BoolOption('with_32bit', 'Generate 32bit code', 0),
- SCons.Script.BoolOption('with_64bit', 'Generate 64bit code', 0),
- )
-
- def check_system(self):
- self.system = platform.system()
- if not self.system or self.system in ['Linux', 'Unix']:
- self.system = '*ix'
-
- # Need to modify building shared libraries when on Mac OS X.
- if self.system == 'Darwin':
- self.env.AppendUnique(SHLINKFLAGS=['-flat_namespace',
- '-single_module',
- '-undefined', 'suppress'])
- import SCons.Util # And fix RPATHs.
- self.env['LINKFLAGS'] = SCons.Util.CLVar('')
- self.env['RPATHPREFIX'] = ''
- self.env['RPATHSUFFIX'] = ''
- self.env['_RPATH'] = ''
-
- # Use 'install_name' instead.
- self.env.Append(SHLINKFLAGS=['-install_name', '${_abspath(TARGET)}'])
-
- self.env.AppendUnique(CONFIGVARS=['SHLINKFLAGS', 'LINKFLAGS',
- 'RPATHPREFIX', 'RPATHSUFFIX', '_RPATH'])
-
- def check_bits(self):
- if (platform.platform().find('x86_64') != -1 or \
- platform.platform().find('ppc64') != -1 or \
- platform.architecture()[0].find('64') != -1 or \
- self.env['with_64bit']) and \
- not self.env['with_32bit']:
- self.bits = 64
- else:
- self.bits = 32
-
- def check_CC(self):
- if 'CC' in self.env['ENV']:
- self.env['CC'] = self.env['ENV']['CC']
- self.CC = self.env['CC']
-
- def print_results(self):
- self.ctx.Display(" Building on a %s platform\n" % self.system)
- self.ctx.Display(" Building for %d bit architecture\n" % self.bits)
- if hasattr(self, 'CC'):
- self.ctx.Display(" Using environment specified C compiler: %s\n" % self.CC)
- return True
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/Project.py
--- a/config/SConfig/Project.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-import os
-import SCons.Script
-import SConfig
-
-class Project(SConfig.Node):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Node.__init__(self, scons_env, scons_opts, required)
- self.checks += [self.check_libs, self.print_results]
-
- def setup_options(self):
- self.opts.AddOptions(
- SCons.Script.BoolOption('with_debug',
- 'Generate debugging symbols', 1),
- SCons.Script.BoolOption('static_libraries',
- 'Build static libraries', 1),
- SCons.Script.BoolOption('shared_libraries',
- 'Build shared libraries', 1),
- SCons.Script.BoolOption('with_profile',
- 'Generate profiling symbols', 0),
- SCons.Script.BoolOption('with_optimise',
- 'Generate optimising (03) symbols', 0),
- ('build_dir', 'Temporary build directory', 'build')
- )
-
- def check_libs(self):
- if not self.env['static_libraries'] and not self.env['shared_libraries']:
- self.ctx.Display(" Both static and shared libraries disabled!\n")
- return False
- return True
-
- def print_results(self):
- self.ctx.Display(" Static libraries: %s\n" % str(bool(self.env['static_libraries'])))
- self.ctx.Display(" Shared libraries: %s\n" % str(bool(self.env['shared_libraries'])))
- self.ctx.Display(" Using build directory: %s\n" % self.env['build_dir'])
- self.ctx.Display(" Debugging symbols: %s\n" % str(bool(self.env['with_debug'])))
- self.ctx.Display(" Profiling symbols: %s\n" % str(bool(self.env['with_profile'])))
- self.ctx.Display(" Optimising symbols: %s\n" % str(bool(self.env['with_optimise'])))
- return True
-
- def setup(self):
- SConfig.Node.setup(self)
- modified = []
- if self.env['shared_libraries']:
- for pkg in self.env.package_list:
- if isinstance(pkg, SConfig.Package):
- pkg.require_shared = True
- modified += [pkg]
- return modified
-
- def enable(self, scons_env, old_state=None):
- SConfig.Node.enable(self, scons_env, old_state)
-
- # Setup debugging flags.
- if self.env['with_debug']:
- scons_env.MergeFlags('-g')
-
- # Setup the profiling flags.
- if self.env['with_profile']:
- scons_env.MergeFlags('-pg')
-
- # Setup the optimising (O3) flags.
- if self.env['with_optimise']:
- scons_env.MergeFlags('-O3')
-
- # Setup the include paths.
- inc_dir = self.env.get_build_path('include')
- self.backup_variable(scons_env, 'CPPPATH', old_state)
- scons_env.PrependUnique(CPPPATH=[inc_dir])
-
- # Setup LIB_DIR.
- lib_dir = self.env.get_build_path('lib')
- self.backup_variable(scons_env, 'LIBPATH', old_state)
- scons_env.PrependUnique(LIBPATH=[lib_dir])
-
- # Setup the RPATH.
- self.backup_variable(scons_env, 'RPATH', old_state)
- scons_env.PrependUnique(RPATH=[scons_env.Dir(lib_dir).abspath])
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/SConscript
--- a/config/SConfig/SConscript Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,186 +0,0 @@
-import os, sys, platform, pickle, shutil
-import glob as pyglob
-import SConfig
-from SCons.Script.SConscript import SConsEnvironment
-
-#
-# Setup the Package system.
-#
-
-def Package(env, pkg_module, required=True, **kw):
- """Create a new package to be configured."""
- if not hasattr(env, 'package_options'):
- env.package_options = Options()
- if not hasattr(env, 'packages'):
- env.packages = {}
- env.package_list = []
- if not pkg_module in env.packages:
- pkg = pkg_module(env, env.package_options, required, **kw)
- for attr, val in kw.iteritems():
- if not hasattr(pkg, attr):
- print 'Package does not have attribute!'
- sys.exit()
- setattr(pkg, attr, val)
- env.packages[pkg_module] = pkg
- env.package_list += [pkg]
- return env.packages[pkg_module]
-
-def CheckPackages(ctx, pkg_list):
- for pkg in pkg_list:
- pkg.configure(ctx)
-
-def configure_packages(env):
- # If we have 'help' given as a target, use that to generate help.
- if 'help' in COMMAND_LINE_TARGETS:
- env.Alias('help', '.')
- print env.package_options.GenerateHelpText(env)
- return
-
- # Get rid of the temporary directory to make sure we're building
- # from scratch.
- if os.path.exists('.sconsign.dblite'):
- os.remove('.sconsign.dblite')
-
- # Finish setting everything up.
- pkgs_rem = list(env.package_list)
- while len(pkgs_rem):
- pkg = pkgs_rem.pop()
- modified = pkg.setup()
- if isinstance(modified, list):
- pkgs_rem += [m for m in modified if m not in pkgs_rem]
-
- # Update dependencies and requirements.
- pkgs_rem = list(env.package_list)
- while len(pkgs_rem):
- pkg = pkgs_rem.pop()
- if pkg.required:
- for d, r in pkg.deps:
- if r and not d.required:
- d.required = True
- pkgs_rem += [d]
-
- # Call the packages checker.
- sconf = Configure(pkg.env, custom_tests={'CheckPackages': CheckPackages})
- sconf.CheckPackages(env.package_list)
- sconf.Finish()
-
- # Print out build message.
- print '\n*****************************************'
- print "* Now run 'scons' to build the project. *"
- print '*****************************************\n'
-
-def save_config(env, filename='config.cfg'):
- # Put the results on this environment.
- for pkg in env.package_list:
- if pkg.result:
- pkg.enable(env)
-
- # Update config variables.
- env.AppendUnique(CONFIGVARS=['CC', 'CFLAGS', 'CCFLAGS',
- 'CPPPATH', 'CPPDEFINES',
- 'LIBPATH', 'LIBS', 'RPATH',
- 'FRAMEWORKS'])
- env.AppendUnique(CONFIGVARS=env.package_options.keys())
-
- # Dump to file.
- d = {}
- for a in env['CONFIGVARS']:
- if a in env._dict:
- d[a] = env[a]
- f = file(filename, 'w')
- import pickle
- pickle.dump(d, f)
- f.close()
-
-def load_config(env, filename='config.cfg'):
- if not os.path.exists(filename):
- print "\nError: project hasn't been configured!"
- print '*******************************************************'
- print "* Run 'scons config' to configure the project. *"
- print "* Run 'scons help' to see what options are available. *"
- print '*******************************************************'
- env.Exit()
- f = file(filename, 'r')
- import pickle
- d = pickle.load(f)
- f.close()
- for k, v in d.iteritems():
- env[k] = v
- for script in env.get('CONFIGSCRIPTS', []):
- env.SConscript(script, 'env')
- if 'build_dir' in env._dict:
- env.Default(env['build_dir'])
-
-SConsEnvironment.Package = Package
-SConsEnvironment.configure_packages = configure_packages
-SConsEnvironment.save_config = save_config
-SConsEnvironment.load_config = load_config
-
-#
-# Useful utilities.
-#
-
-def copy_file(env, dst, src):
- dst = File(dst).abspath
- if os.path.exists(dst):
- return
- dst_dir = os.path.dirname(dst)
- if not os.path.exists(dst_dir):
- os.makedirs(dst_dir)
- shutil.copy(src, dst)
-
-def get_build_path(env, prefix):
- if os.path.isabs(env['build_dir']):
- bld_dir = env['build_dir']
- else:
- bld_dir = '#' + env['build_dir']
- if prefix:
- return os.path.join(bld_dir, prefix)
- else:
- return bld_dir
-
-def get_target_name(env, source, extension=''):
- """Return the destination name for a source file with suffix 'suffix'. This
- is useful for building files into the correct build path. Returns the full
- path to the built source without extension."""
- if extension:
- src = source[:-len(extension)]
- else:
- src = source
- return env.get_build_path(src)
-
-def glob(env, pattern):
- if not os.path.isabs(pattern):
- old = os.getcwd()
- os.chdir(Dir('.').srcnode().abspath)
- res = pyglob.glob(pattern)
- os.chdir(old)
- else:
- res = pyglob.glob(pattern)
- return res
-
-def path_exists(env, path):
- if not os.path.isabs(path):
- old = os.getcwd()
- os.chdir(Dir('.').srcnode().abspath)
- res = os.path.exists(path)
- os.chdir(old)
- else:
- res = os.path.exists(path)
- return res
-
-def strip_dir(env, path, subdir):
- offs = path.find(os.path.sep + subdir + os.path.sep)
- if offs != -1:
- return path[:offs] + path[offs + len(subdir) + 1:]
- offs = path.find(os.path.sep + subdir)
- if offs != -1:
- return path[:-(len(subdir) + 1)]
- return path
-
-SConsEnvironment.strip_dir = strip_dir
-SConsEnvironment.copy_file = copy_file
-SConsEnvironment.get_build_path = get_build_path
-SConsEnvironment.get_target_name = get_target_name
-SConsEnvironment.glob = glob
-SConsEnvironment.path_exists = path_exists
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/__init__.py
--- a/config/SConfig/__init__.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-from Node import Node
-from Package import Package
-from Platform import Platform
-from Project import Project
-import packages
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/BlasLapack.py
--- a/config/SConfig/packages/BlasLapack.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-import os
-import SConfig
-
-class BlasLapack(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
- self.cmath = self.dependency(SConfig.packages.cmath)
- self.libraries = [['blas', 'lapack'],
- ['cblas', 'clapack'],
- ['mkl', 'mkl_lapack']]
- self.frameworks = [['Accelerate']]
- self.symbols = [(['dgeev'], 'FORTRAN_NORMAL'),
- (['dgeev_'], 'FORTRAN_SINGLE_TRAILINGBAR'),
- (['dgeev__'], 'FORTRAN_DOUBLE_TRAILINGBAR'),
- (['DGEEV'], 'FORTRAN_UPPERCASE')]
- self.symbol_setup = '''char jobVecLeft='N';
-char jobVecRight='N';
-int dim=1;
-double* arrayA=NULL;
-double* outputReal=NULL;
-double* outputImag=NULL;
-double* leftEigenVec=NULL;
-double* rightEigenVec=NULL;
-int leadDimVL=1;
-int leadDimVR=1;
-double* workSpace=NULL;
-int dimWorkSpace;
-int INFO=0;
-
-dimWorkSpace=10*dim;
-arrayA=malloc(dim*dim*sizeof(double));
-memset(arrayA, 0, dim*dim*sizeof(double));
-outputReal=malloc(dim*sizeof(double));
-outputImag=malloc(dim*sizeof(double));
-memset(outputReal, 0, dim*sizeof(double));
-memset(outputImag, 0, dim*sizeof(double));
-workSpace=malloc(dimWorkSpace*sizeof(double));
-leftEigenVec=malloc(leadDimVL*dim*sizeof(double));
-rightEigenVec=malloc(leadDimVR*dim*sizeof(double));
-memset(leftEigenVec, 0, leadDimVL*dim*sizeof(double));
-memset(rightEigenVec, 0, leadDimVR*dim*sizeof(double));
-'''
- self.symbol_teardown = '''free(arrayA);
-free(outputReal);
-free(outputImag);
-free(workSpace);
-free(leftEigenVec);
-free(rightEigenVec);
-'''
- self.symbol_prototypes = ['void %s(char*,char*,int*,double*,int*,double*,double*,double*,int*,double*,int*,double*,int*,int*);']
- self.symbol_calls = ['%s(&jobVecLeft, &jobVecRight, &dim, arrayA, &dim, outputReal, outputImag, leftEigenVec, &leadDimVL, rightEigenVec, &leadDimVR, workSpace, &dimWorkSpace, &INFO );']
-
- # Thanks to there not being a C version of Blas/Lapack on edda, we need
- # to be able to search for that installation specifically.
- def generate_locations(self):
- lib_dir = ['/usr/local/IBM_compilers/xlf/9.1/lib64',
- '/opt/ibmcmp/lib64']
- use_dir = True
- for d in lib_dir:
- if not os.path.exists(d):
- use_dir = False
- break
- for loc in SConfig.Package.generate_locations(self):
- yield loc
- if use_dir:
- yield [loc[0], loc[1], loc[2] + lib_dir, loc[3]]
-
- def generate_libraries(self, location):
- lib_dir = '/usr/local/IBM_compilers/xlf/9.1/lib64'
- if lib_dir in location[2]:
- yield ['blas', 'lapack', 'xlf90', 'xlfmath', 'xl']
- else:
- for libs in SConfig.Package.generate_libraries(self, location):
- yield libs
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/CompilerFlags.py
--- a/config/SConfig/packages/CompilerFlags.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-import os, platform
-import SCons.Script
-import SConfig
-
-class CompilerFlags(SConfig.Node):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Node.__init__(self, scons_env, scons_opts, required)
- self.checks = [self.check_bit_flags,
- self.check_architecture]
-
- def setup_options(self):
- SConfig.Node.setup_options(self)
- self.opts.AddOptions(
- SCons.Script.BoolOption('with_32bit', 'Generate 32bit code', 0),
- SCons.Script.BoolOption('with_64bit', 'Generate 64bit code', 0)
- )
-
- def check_architecture(self):
- if (platform.platform().find('x86_64') != -1 or \
- platform.platform().find('ppc64') != -1 or \
- platform.architecture()[0].find('64') != -1 or \
- self.env['with_64bit']) and \
- not self.env['with_32bit']:
- self.bits = 64
- if self.flag_64bit:
- self.env.MergeFlags(self.flag_64bit)
- if self.env.subst('$CC') == self.env.subst('$LINK'):
- self.env.AppendUnique(LINKFLAGS=[self.flag_64bit])
- else:
- self.bits = 32
- if self.flag_32bit:
- self.env.MergeFlags(self.flag_32bit)
- if self.env.subst('$CC') == self.env.subst('$LINK'):
- self.env.AppendUnique(LINKFLAGS=[self.flag_32bit])
- return True
-
- def check_bit_flags(self):
- if self.try_flag('-m32')[0]:
- self.flag_32bit = '-m32'
- elif self.try_flag('-q32')[0]:
- self.flag_32bit = '-q32'
- else:
- self.flag_32bit = ''
- if self.try_flag('-m64')[0]:
- self.flag_64bit = '-m64'
- elif self.try_flag('-q64')[0]:
- self.flag_64bit = '-q64'
- else:
- self.flag_64bit = ''
- return True
-
- def try_flag(self, flag):
- state = self.env.ParseFlags(flag)
- old = self.push_state(state)
- result = self.run_scons_cmd(self.ctx.TryCompile, '', '.c')
- self.pop_state(old)
- if result[0] and (result[1].find('not recognized') != -1 or
- result[1].find('not recognised') != -1 or
- result[1].find('unknown option') != -1):
- result[0] = 0
- return [result[0], result[1], '']
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/HDF5.py
--- a/config/SConfig/packages/HDF5.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-import os
-import SConfig
-
-class HDF5(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False, **kw):
- SConfig.Package.__init__(self, scons_env, scons_opts, required, **kw)
- self.require_parallel = False
- self.headers = [["hdf5.h"]]
- self.libraries = [["hdf5"]]
-
- def setup(self):
- SConfig.Package.setup(self)
- if self.require_parallel:
- self.dependency(SConfig.packages.MPI)
- self.symbols = [(["H5Pset_dxpl_mpio", "H5Pset_fapl_mpio"], "")]
- self.symbol_calls = ["%s( dxpl_props, H5FD_MPIO_COLLECTIVE );",
- "%s( fapl_props, MPI_COMM_WORLD, MPI_INFO_NULL );"]
- self.symbol_setup = """hid_t dxpl_props, fapl_props;
-MPI_Init( &argc, &argv );
-dxpl_props = H5Pcreate( H5P_DATASET_XFER );
-fapl_props = H5Pcreate( H5P_FILE_ACCESS );
-"""
- self.symbol_teardown = """H5Pclose( dxpl_props );
-H5Pclose( fapl_props );
-MPI_Finalize();
-"""
-
- def generate_locations(self):
- for loc in SConfig.Package.generate_locations(self):
- extra_libs = []
- for lib_dir in loc[2]:
- set_file = os.path.join(loc[0], lib_dir, "libhdf5.settings")
- if os.path.exists(set_file):
- f = open(set_file, "r")
- for line in f.readlines():
- if line.find("Extra libraries") != -1:
- dict = self.env.ParseFlags(line.split(":")[1])
- extra_libs = dict.get('LIBS', [])
- old_libs = self.extra_libraries
- self.extra_libraries += extra_libs
- yield loc
- self.extra_libraries = old_libs
-
- def get_check_symbols_fail_reason(self, fail_logs):
- for log in fail_logs:
- if log.find("_mpio'"):
- return "Not a parallel HDF5 implementation."
- return ''
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/MPI.py
--- a/config/SConfig/packages/MPI.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-import os
-import SConfig
-
-class MPI(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
- self.dependency(SConfig.packages.CompilerFlags)
- self.base_patterns = ['mpich*', 'MPICH*']
- self.header_sub_dir = ['mpi']
- self.headers = [['mpi.h']]
- self.libraries = [['mpich'],
- ['mpich', 'pmpich'],
- ['mpich', 'rt'],
- ['mpich', 'pmpich', 'rt'],
- ['mpi'],
- ['lam', 'mpi']]
- self.shared_libraries = ['mpich', 'pmpich', 'mpi', 'lam']
- self.require_shared = True
- self.symbols = [(['MPI_Init', 'MPI_Finalize'], '')]
- self.symbol_calls = ['%s(&argc, &argv);', '%s();']
-
- def generate_locations(self):
- for loc in SConfig.Package.generate_locations(self):
- for lib_dir in loc[2]:
- shared_dir = os.path.join(lib_dir, 'shared')
- path = os.path.join(loc[0], shared_dir)
- if os.path.exists(path):
- loc[2] = [shared_dir] + loc[2]
- yield loc
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/OSMesa.py
--- a/config/SConfig/packages/OSMesa.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-import os
-import SConfig
-
-class OSMesa(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False, **kw):
- SConfig.Package.__init__(self, scons_env, scons_opts, required, **kw)
- self.header_sub_dir = ['GL']
- self.headers = ['osmesa.h']
- self.libraries = [['GL', 'GLU']]
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/OpenGL.py
--- a/config/SConfig/packages/OpenGL.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-import os
-import SConfig
-
-class OpenGL(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False, **kw):
- SConfig.Package.__init__(self, scons_env, scons_opts, required, **kw)
- self.header_sub_dir = ['GL']
- self.headers = [['gl.h', 'glu.h']]
- self.libraries = [['GL', 'GLU']]
- self.frameworks = [['OpenGL']]
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/PETSc.py
--- a/config/SConfig/packages/PETSc.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-import os, re
-import SConfig
-
-class PETSc(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False, **kw):
- SConfig.Package.__init__(self, scons_env, scons_opts, required, **kw)
- self.dependency(SConfig.packages.MPI)
- self.base_patterns = ['petsc*', 'PETSC*', 'PETSc*']
- self.header_sub_dir = ['petsc']
- self.headers = [['petsc.h',
- 'petscvec.h', 'petscmat.h',
- 'petscksp.h', 'petscsnes.h']]
- self.libraries = [['petscsnes', 'petscksp',
- 'petscmat', 'petscvec',
- 'petscdm', 'petsc',]]
- self.require_shared = True
- self.symbols = [(['PetscInitialize', 'PetscFinalize'], '')]
- self.symbol_calls = ['%s(&argc, &argv, NULL, NULL);', '%s();']
-
- # Will be set after configuration.
- self.arch = ''
-
- def generate_locations(self):
- for loc in SConfig.Package.generate_locations(self):
- if not loc[0]:
- yield loc
- continue
-
- arch = self.get_arch(loc[0])
- if not arch:
- yield loc
- continue
- self.arch = arch
-
- # Add the bmake/arch include directory.
- hdr_dir = os.path.join('bmake', arch)
- if not os.path.exists(os.path.join(loc[0], hdr_dir)):
- continue
- if hdr_dir not in loc[1]:
- loc[1] += [hdr_dir]
-
- # Add the lib/arch library directory.
- if 'lib' in loc[2]:
- loc[2].remove('lib')
- lib_dir = os.path.join('lib', arch)
- if not os.path.exists(os.path.join(loc[0], lib_dir)):
- continue
- if lib_dir not in loc[2]:
- loc[2] += [lib_dir]
-
- # Parse extra libraries.
- extra_lib_dirs, extra_libs = self.get_extra_libraries(loc[0])
- if extra_lib_dirs: loc[2] += extra_lib_dirs
- if extra_libs: self.extra_libraries += extra_libs
-
- yield loc
-
- def get_arch(self, base_dir):
- petscconf = os.path.join(base_dir, 'bmake',
- 'petscconf')
- if not os.path.exists(petscconf):
- return None
- f = file(petscconf, 'r')
- arch = f.readline().split('=')[1][:-1]
- f.close()
- return arch
-
- def get_extra_libraries(self, base_dir):
- petscconf = os.path.join(base_dir, 'bmake', self.arch, 'petscconf')
- if not os.path.exists(petscconf): return ([], [])
- f = file(petscconf, 'r')
- line_dict = {}
- for line in f.readlines():
- sides = line.split('=')
- line_dict[sides[0].strip()] = sides[1].strip()
- f.close()
- if 'PACKAGES_LIBS' not in line_dict: return ([], [])
- lib_string = line_dict['PACKAGES_LIBS']
- lib_string = self.subst(lib_string, line_dict)
-
- extra_lib_dirs = []
- extra_libs = []
- for string in lib_string.split(' '):
- if string[:len(self.env['LIBLINKPREFIX'])] == self.env['LIBLINKPREFIX']:
- extra_libs += [string[len(self.env['LIBLINKPREFIX']):]]
- elif string[:len(self.env['LIBDIRPREFIX'])] == self.env['LIBDIRPREFIX']:
- extra_lib_dirs += [string[len(self.env['LIBDIRPREFIX']):]]
- return (extra_lib_dirs, extra_libs)
-
- def subst(self, line, line_dict):
- inp = [w.strip() for w in line.split()]
- out = []
- while len(inp):
- w = inp[0]
- inp = inp[1:]
- if self.is_macro(w):
- new_line = self.expand_macro(w, line_dict)
- new_words = [nw.strip() for nw in new_line.split()]
- inp = new_words + inp
- else:
- out += [w]
- return ' '.join(out)
-
- def expand_macro(self, macro, line_dict):
- if macro[:2] == '${' and macro[-1:] == '}':
- macro = macro[2:-1]
- elif macro[0] == '$':
- macro = macro[1:]
- if macro not in line_dict: return ''
- return line_dict[macro]
-
- def is_macro(self, word):
- if (word[:2] == '${' and word[-1:] == '}') or word[0] == '$':
- return True
- return False
-
- def get_check_headers_fail_reason(self, fail_logs):
- for log in fail_logs:
- if log.find('MPI_') != -1:
- return 'Selected MPI implementation incompatible.'
- return ''
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/PETScExt.py
--- a/config/SConfig/packages/PETScExt.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-import os
-import SConfig
-
-class PETScExt(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
- self.pkg_petsc = self.dependency(SConfig.packages.PETSc)
- self.base_patterns = ['petscext*', 'PETSCEXT*', 'PETScExt*']
- self.header_sub_dir = ['petsc']
- self.headers = [['petscext.h',
- 'petscext_vec.h', 'petscext_mat.h',
- 'petscext_ksp.h', 'petscext_snes.h']]
- self.libraries = [['petscext_snes', 'petscext_ksp', 'petscext_pc',
- 'petscext_mat', 'petscext_vec',
- 'petscext_utils']]
- self.require_shared = True
- self.use_rpath = True
- self.have_define = 'HAVE_PETSCEXT'
-
- def generate_locations(self):
- for loc in SConfig.Package.generate_locations(self):
- if not loc[0]:
- yield loc
- continue
-
- # Just use whatever architecture PETSc uses.
- arch = self.pkg_petsc.arch
- self.arch = arch
-
- # Add the bmake/arch include directory.
- hdr_dir = os.path.join('bmake', arch)
- if not os.path.exists(os.path.join(loc[0], hdr_dir)):
- continue
- if hdr_dir not in loc[1]:
- loc[1] += [hdr_dir]
-
- # Add the lib/arch library directory.
- if 'lib' in loc[2]:
- loc[2].remove('lib')
- lib_dir = os.path.join('lib', arch)
- if not os.path.exists(os.path.join(loc[0], lib_dir)):
- continue
- if lib_dir not in loc[2]:
- loc[2] += [lib_dir]
-
- yield loc
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/PICellerator.py
--- a/config/SConfig/packages/PICellerator.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-import os
-import SConfig
-
-class PICellerator(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
- self.dependency(SConfig.packages.StgFEM)
- self.base_patterns = ['PICellerator*']
- self.headers = [[os.path.join('PICellerator', 'PICellerator.h')]]
- self.libraries = [['PICellerator']]
- self.symbols = [(['PICellerator_Init', 'PICellerator_Finalise'], '')]
- self.symbol_setup = '''MPI_Init(&argc, &argv);
-StGermain_Init(&argc, &argv);
-StgDomain_Init(&argc, &argv);
-StgFEM_Init(&argc, &argv);'''
- self.symbol_teardown = '''StgFEM_Finalise();
-StgDomain_Finalise();
-StGermain_Finalise();
-MPI_Finalize();'''
- self.symbol_calls = ['%s(&argc, &argv);', '%s();']
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/SDL.py
--- a/config/SConfig/packages/SDL.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-import os
-import SConfig
-
-class SDL(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False, **kw):
- SConfig.Package.__init__(self, scons_env, scons_opts, required, **kw)
- self.header_sub_dir = ['SDL']
- self.headers = [['SDL.h'],
- ['SDL/SDL.h']] # For framework.
- self.libraries = [['SDL']]
- self.frameworks = [['SDL', 'Cocoa']]
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/SVNRevision.py
--- a/config/SConfig/packages/SVNRevision.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-import os
-import SConfig
-
-class SVNRevision(SConfig.Node):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Node.__init__(self, scons_env, scons_opts, required)
- self.checks = [self.extract_revision]
- self.define_name = 'VERSION'
- self.checkout_path = os.getcwd()
-
- # Will be set after configuration.
- self.revision = 0
-
- def extract_revision(self):
- svn_path = os.path.join(self.checkout_path, '.svn', 'entries')
- if not os.path.exists(svn_path):
- return [0, '', 'Could not find .svn directory']
- f = file(svn_path, 'r')
- all_lines = f.readlines()
- f.close()
-
- for l in all_lines:
- ind = l.rfind('revision=')
- if ind != -1:
- self.revision = int(l[ind + 10:l.rfind('"')])
- return True
-
- self.revision = int(all_lines[3])
- return True
-
- def enable(self, scons_env, old_state=None):
- SConfig.Node.enable(self, scons_env, old_state)
- self.backup_variable(scons_env, 'CPPDEFINES', old_state)
- ver = scons_env['ESCAPE']('"' + str(self.revision) + '"')
- scons_env.AppendUnique(CPPDEFINES=[(self.define_name, ver)])
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/StGermain.py
--- a/config/SConfig/packages/StGermain.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-import os
-import SConfig
-
-class StGermain(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
- self.dependency(SConfig.packages.cmath)
- self.dependency(SConfig.packages.libXML2)
- self.dependency(SConfig.packages.MPI)
- self.dependency(SConfig.packages.SVNRevision)
- self.base_patterns = ['StGermain*']
- self.headers = [[os.path.join('StGermain', 'StGermain.h')]]
- self.libraries = [['StGermain']]
- self.symbols = [(['StGermain_Init', 'StGermain_Finalise'], '')]
- self.symbol_setup = 'MPI_Init(&argc, &argv);'
- self.symbol_teardown = 'MPI_Finalize();'
- self.symbol_calls = ['%s(&argc, &argv);', '%s();']
-
- def enable(self, scons_env, old_state=None):
- SConfig.Package.enable(self, scons_env, old_state)
- if self.base_dir:
- script = os.path.join(self.base_dir, 'script', 'pcu', 'scons.py')
- if os.path.exists(script):
- self.backup_variable(scons_env, 'CONFIGSCRIPTS', old_state)
- scons_env.AppendUnique(CONFIGVARS=['CONFIGSCRIPTS'])
- scons_env.AppendUnique(CONFIGSCRIPTS=[script])
- env = scons_env
- scons_env.SConscript(script, 'env')
-
- script = os.path.join(self.base_dir, 'script', 'StGermain', 'scons.py')
- if os.path.exists(script):
- self.backup_variable(scons_env, 'CONFIGSCRIPTS', old_state)
- scons_env.AppendUnique(CONFIGVARS=['CONFIGSCRIPTS'])
- scons_env.AppendUnique(CONFIGSCRIPTS=[script])
- env = scons_env
- scons_env.SConscript(script, 'env')
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/StgDomain.py
--- a/config/SConfig/packages/StgDomain.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-import os
-import SConfig
-
-class StgDomain(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
- self.dependency(SConfig.packages.StGermain)
- self.dependency(SConfig.packages.BlasLapack)
- self.dependency(SConfig.packages.HDF5, False)
- self.base_patterns = ['StgDomain*']
- self.headers = [[os.path.join('StgDomain', 'StgDomain.h')]]
- self.libraries = [['StgDomain']]
- self.symbols = [(['StgDomain_Init', 'StgDomain_Finalise'], '')]
- self.symbol_setup = '''MPI_Init(&argc, &argv);
-StGermain_Init(&argc, &argv);
-'''
- self.symbol_teardown = '''StGermain_Finalise();
-MPI_Finalize();
-'''
- self.symbol_calls = ['%s(&argc, &argv);', '%s();']
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/StgFEM.py
--- a/config/SConfig/packages/StgFEM.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-import os
-import SConfig
-
-class StgFEM(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
- self.dependency(SConfig.packages.StgDomain)
- petsc = self.dependency(SConfig.packages.PETSc)
- petsc.have_define = 'HAVE_PETSC'
- self.base_patterns = ['StgFEM*']
- self.headers = [[os.path.join('StgFEM', 'StgFEM.h')]]
- self.libraries = [['StgFEM']]
- self.symbols = [(['StgFEM_Init', 'StgFEM_Finalise'], '')]
- self.symbol_setup = '''MPI_Init(&argc, &argv);
-StGermain_Init(&argc, &argv);
-StgDomain_Init(&argc, &argv);'''
- self.symbol_teardown = '''StgDomain_Finalise();
-StGermain_Finalise();
-MPI_Finalize();'''
- self.symbol_calls = ['%s(&argc, &argv);', '%s();']
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/X11.py
--- a/config/SConfig/packages/X11.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-import os
-import SConfig
-
-class X11(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False, **kw):
- SConfig.Package.__init__(self, scons_env, scons_opts, required, **kw)
- self.base_dirs += ['/usr/X11R6']
- self.header_sub_dir = ['X11']
- self.headers = [['Xlib.h']]
- self.libraries = [['X11', 'Xmu']]
- self.symbols = [(['XOpenDisplay'], '')]
- self.symbol_setup = 'void* display;'
- self.symbol_calls = ['display = %s(NULL);']
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/__init__.py
--- a/config/SConfig/packages/__init__.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-from CompilerFlags import CompilerFlags
-from libXML2 import libXML2
-from MPI import MPI
-from PETSc import PETSc
-from PETScExt import PETScExt
-from cmath import cmath
-from SVNRevision import SVNRevision
-from BlasLapack import BlasLapack
-from StGermain import StGermain
-from StgDomain import StgDomain
-from StgFEM import StgFEM
-from PICellerator import PICellerator
-from dl import dl
-from OpenGL import OpenGL
-from OSMesa import OSMesa
-from SDL import SDL
-from libPNG import libPNG
-from libJPEG import libJPEG
-from libTIFF import libTIFF
-from libFAME import libFAME
-from libavcodec import libavcodec
-from HDF5 import HDF5
-from X11 import X11
-from pcu import pcu
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/cmath.py
--- a/config/SConfig/packages/cmath.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-import os
-import SConfig
-
-class cmath(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
- self.dependency(SConfig.packages.CompilerFlags)
- self.libraries = [['m']]
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/dl.py
--- a/config/SConfig/packages/dl.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-import os
-import SConfig
-
-class dl(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
- self.dependency(SConfig.packages.CompilerFlags)
- self.headers = [['dlfcn.h']]
- self.libraries = [['dl']]
-
- def setup(self):
- SConfig.Node.setup(self)
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/libFAME.py
--- a/config/SConfig/packages/libFAME.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-import os
-import SConfig
-
-class libFAME(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False, **kw):
- SConfig.Package.__init__(self, scons_env, scons_opts, required, **kw)
- self.headers = [['fame.h']]
- self.libraries = [['fame']]
- self.have_define = 'HAVE_FAME'
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/libJPEG.py
--- a/config/SConfig/packages/libJPEG.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-import os
-import SConfig
-
-class libJPEG(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False, **kw):
- SConfig.Package.__init__(self, scons_env, scons_opts, required, **kw)
- self.headers = [['jpeglib.h']]
- self.libraries = [['jpeg']]
- self.have_define = 'HAVE_JPEG'
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/libPNG.py
--- a/config/SConfig/packages/libPNG.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-import os
-import SConfig
-
-class libPNG(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False, **kw):
- SConfig.Package.__init__(self, scons_env, scons_opts, required, **kw)
- self.headers = [['png.h']]
- self.libraries = [['png']]
- self.have_define = 'HAVE_PNG'
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/libTIFF.py
--- a/config/SConfig/packages/libTIFF.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-import os
-import SConfig
-
-class libTIFF(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False, **kw):
- SConfig.Package.__init__(self, scons_env, scons_opts, required, **kw)
- self.headers = [['tiff.h']]
- self.libraries = [['tiff']]
- self.have_define = 'HAVE_TIFF'
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/libXML2.py
--- a/config/SConfig/packages/libXML2.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-import os
-import SConfig
-
-class libXML2(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
- self.dependency(SConfig.packages.CompilerFlags)
- self.header_sub_dir = ['libxml2']
- self.headers = [[os.path.join('libxml', 'parser.h')]]
- self.libraries = [['xml2']]
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/libavcodec.py
--- a/config/SConfig/packages/libavcodec.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-import os
-import SConfig
-
-class libavcodec(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False, **kw):
- SConfig.Package.__init__(self, scons_env, scons_opts, required, **kw)
- self.header_sub_dir = ['ffmpeg']
- self.headers = [['avcodec.h']]
- self.libraries = [['avcodec']]
- self.have_define = 'HAVE_AVCODEC'
diff -r 3eb020887a5a -r 1c72512339ff config/SConfig/packages/pcu.py
--- a/config/SConfig/packages/pcu.py Fri May 23 04:31:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-import os
-import SConfig
-
-class pcu(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
- self.dependency(SConfig.packages.MPI)
- self.headers = [[os.path.join('pcu', 'pcu.h')]]
- self.libraries = [['pcu']]
- self.checks += [self.check_scons_script]
-
- self.scons_script = ''
-
- def check_scons_script(self):
- if self.base_dir:
- script = os.path.join(self.base_dir, 'script', 'pcu', 'scons.py')
- if os.path.exists(script):
- self.scons_script = script
- self.ctx.Display(' Found SCons builder script.\n')
- return True
-
- def enable(self, scons_env, old_state=None):
- SConfig.Package.enable(self, scons_env, old_state)
- if self.scons_script:
- self.backup_variable(scons_env, 'CONFIGSCRIPTS', old_state)
- scons_env.AppendUnique(CONFIGVARS=['CONFIGSCRIPTS'])
- scons_env.AppendUnique(CONFIGSCRIPTS=[self.scons_script])
- env = scons_env
- scons_env.SConscript(self.scons_script, 'env')
More information about the CIG-COMMITS
mailing list