[cig-commits] commit: Updating to match stgUnderworld.
Mercurial
hg at geodynamics.org
Mon Nov 24 11:23:01 PST 2008
changeset: 71:bd2e29a7b9cd
user: LukeHodkinson
date: Thu Apr 10 01:46:44 2008 +0000
files: SConstruct config/SConfig/Package.py config/SConfig/SConscript config/SConfig/packages/HDF5.py config/SConfig/packages/OSMesa.py config/SConfig/packages/OpenGL.py config/SConfig/packages/PETSc.py config/SConfig/packages/SDL.py config/SConfig/packages/X11.py config/SConfig/packages/__init__.py config/SConfig/packages/cobj.py config/SConfig/packages/libFAME.py config/SConfig/packages/libJPEG.py config/SConfig/packages/libPNG.py config/SConfig/packages/libTIFF.py config/SConfig/packages/libavcodec.py config/packages/__init__.py config/packages/stgMagma.py
description:
Updating to match stgUnderworld.
diff -r 23ca4705add3 -r bd2e29a7b9cd SConstruct
--- a/SConstruct Mon Apr 07 01:28:38 2008 +0000
+++ b/SConstruct Thu Apr 10 01:46:44 2008 +0000
@@ -27,20 +27,19 @@ if 'config' in COMMAND_LINE_TARGETS or '
proj.dependency(SConfig.packages.MPI)
proj.dependency(SConfig.packages.SVNRevision)
proj.dependency(SConfig.packages.BlasLapack)
- proj.dependency(SConfig.packages.HDF5)
- petsc = proj.dependency(SConfig.packages.PETSc)
- petsc.have_define = 'HAVE_PETSC'
+ proj.dependency(SConfig.packages.HDF5, False, have_define='HAVE_HDF5')
+ proj.dependency(SConfig.packages.PETSc, have_define='HAVE_PETSC')
proj.dependency(SConfig.packages.PETScExt)
if env['with_glucifer']:
- proj.dependency(SConfig.packages.OpenGL)
- proj.dependency(SConfig.packages.OSMesa, False)
- proj.dependency(SConfig.packages.X11, False)
- proj.dependency(SConfig.packages.SDL, False)
- proj.dependency(SConfig.packages.libavcodec, False)
- proj.dependency(SConfig.packages.libFAME, False)
- proj.dependency(SConfig.packages.libPNG, False)
- proj.dependency(SConfig.packages.libJPEG, False)
- proj.dependency(SConfig.packages.libTIFF, False)
+ proj.dependency(SConfig.packages.OpenGL, have_define='HAVE_GL')
+ proj.dependency(SConfig.packages.OSMesa, False, have_define='HAVE_OSMESA')
+ proj.dependency(SConfig.packages.X11, False, have_define='HAVE_X11')
+ proj.dependency(SConfig.packages.SDL, False, have_define='HAVE_SDL')
+ proj.dependency(SConfig.packages.libavcodec, False, have_define='HAVE_LIBAVCODEC')
+ proj.dependency(SConfig.packages.libFAME, False, have_define='HAVE_LIBFAME')
+ proj.dependency(SConfig.packages.libPNG, False, have_define='HAVE_LIBPNG')
+ proj.dependency(SConfig.packages.libJPEG, False, have_define='HAVE_LIBJPEG')
+ proj.dependency(SConfig.packages.libTIFF, False, have_define='HAVE_LIBTIFF')
env.configure_packages()
# Need to define the extension for shared libraries as well
diff -r 23ca4705add3 -r bd2e29a7b9cd config/SConfig/Package.py
--- a/config/SConfig/Package.py Mon Apr 07 01:28:38 2008 +0000
+++ b/config/SConfig/Package.py Thu Apr 10 01:46:44 2008 +0000
@@ -3,11 +3,11 @@ import SConfig
import SConfig
class Package(SConfig.Node):
- def __init__(self, scons_env, scons_opts, required=False):
+ 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 = ''
+ self.have_define = kw.get('have_define', '')
# Search options.
self.base_dirs = [] #['']
diff -r 23ca4705add3 -r bd2e29a7b9cd config/SConfig/SConscript
--- a/config/SConfig/SConscript Mon Apr 07 01:28:38 2008 +0000
+++ b/config/SConfig/SConscript Thu Apr 10 01:46:44 2008 +0000
@@ -15,7 +15,7 @@ def Package(env, pkg_module, required=Tr
env.packages = {}
env.package_list = []
if not pkg_module in env.packages:
- pkg = pkg_module(env, env.package_options, required)
+ 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!'
diff -r 23ca4705add3 -r bd2e29a7b9cd config/SConfig/packages/HDF5.py
--- a/config/SConfig/packages/HDF5.py Mon Apr 07 01:28:38 2008 +0000
+++ b/config/SConfig/packages/HDF5.py Thu Apr 10 01:46:44 2008 +0000
@@ -2,8 +2,8 @@ import SConfig
import SConfig
class HDF5(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
+ 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"]]
diff -r 23ca4705add3 -r bd2e29a7b9cd config/SConfig/packages/OSMesa.py
--- a/config/SConfig/packages/OSMesa.py Mon Apr 07 01:28:38 2008 +0000
+++ b/config/SConfig/packages/OSMesa.py Thu Apr 10 01:46:44 2008 +0000
@@ -2,7 +2,7 @@ import SConfig
import SConfig
class OSMesa(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
+ def __init__(self, scons_env, scons_opts, required=False, **kw):
+ SConfig.Package.__init__(self, scons_env, scons_opts, required, **kw)
self.libraries = [['GL', 'GLU']]
self.have_define = 'HAVE_MESA'
diff -r 23ca4705add3 -r bd2e29a7b9cd config/SConfig/packages/OpenGL.py
--- a/config/SConfig/packages/OpenGL.py Mon Apr 07 01:28:38 2008 +0000
+++ b/config/SConfig/packages/OpenGL.py Thu Apr 10 01:46:44 2008 +0000
@@ -2,8 +2,8 @@ import SConfig
import SConfig
class OpenGL(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
+ 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']]
diff -r 23ca4705add3 -r bd2e29a7b9cd config/SConfig/packages/PETSc.py
--- a/config/SConfig/packages/PETSc.py Mon Apr 07 01:28:38 2008 +0000
+++ b/config/SConfig/packages/PETSc.py Thu Apr 10 01:46:44 2008 +0000
@@ -2,8 +2,8 @@ import SConfig
import SConfig
class PETSc(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
+ 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'
diff -r 23ca4705add3 -r bd2e29a7b9cd config/SConfig/packages/SDL.py
--- a/config/SConfig/packages/SDL.py Mon Apr 07 01:28:38 2008 +0000
+++ b/config/SConfig/packages/SDL.py Thu Apr 10 01:46:44 2008 +0000
@@ -2,8 +2,8 @@ import SConfig
import SConfig
class SDL(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
+ 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.
diff -r 23ca4705add3 -r bd2e29a7b9cd config/SConfig/packages/X11.py
--- a/config/SConfig/packages/X11.py Mon Apr 07 01:28:38 2008 +0000
+++ b/config/SConfig/packages/X11.py Thu Apr 10 01:46:44 2008 +0000
@@ -2,8 +2,8 @@ import SConfig
import SConfig
class X11(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
+ def __init__(self, scons_env, scons_opts, required=False, **kw):
+ SConfig.Package.__init__(self, scons_env, scons_opts, required, **kw)
self.header_sub_dir = 'X11'
self.headers = [['Xlib.h']]
self.libraries = [['X11', 'Xmu']]
diff -r 23ca4705add3 -r bd2e29a7b9cd config/SConfig/packages/__init__.py
--- a/config/SConfig/packages/__init__.py Mon Apr 07 01:28:38 2008 +0000
+++ b/config/SConfig/packages/__init__.py Thu Apr 10 01:46:44 2008 +0000
@@ -22,4 +22,3 @@ from HDF5 import HDF5
from HDF5 import HDF5
from X11 import X11
from pcu import pcu
-from cobj import cobj
diff -r 23ca4705add3 -r bd2e29a7b9cd config/SConfig/packages/cobj.py
--- a/config/SConfig/packages/cobj.py Mon Apr 07 01:28:38 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-import os
-import SConfig
-
-class cobj(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
- self.dependency(SConfig.packages.pcu)
- self.headers = [[os.path.join('cobj', 'cobj.h')]]
- self.libraries = [['cobj']]
diff -r 23ca4705add3 -r bd2e29a7b9cd config/SConfig/packages/libFAME.py
--- a/config/SConfig/packages/libFAME.py Mon Apr 07 01:28:38 2008 +0000
+++ b/config/SConfig/packages/libFAME.py Thu Apr 10 01:46:44 2008 +0000
@@ -2,8 +2,8 @@ import SConfig
import SConfig
class libFAME(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
+ 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 23ca4705add3 -r bd2e29a7b9cd config/SConfig/packages/libJPEG.py
--- a/config/SConfig/packages/libJPEG.py Mon Apr 07 01:28:38 2008 +0000
+++ b/config/SConfig/packages/libJPEG.py Thu Apr 10 01:46:44 2008 +0000
@@ -2,8 +2,8 @@ import SConfig
import SConfig
class libJPEG(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
+ 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 23ca4705add3 -r bd2e29a7b9cd config/SConfig/packages/libPNG.py
--- a/config/SConfig/packages/libPNG.py Mon Apr 07 01:28:38 2008 +0000
+++ b/config/SConfig/packages/libPNG.py Thu Apr 10 01:46:44 2008 +0000
@@ -2,8 +2,8 @@ import SConfig
import SConfig
class libPNG(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
+ 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 23ca4705add3 -r bd2e29a7b9cd config/SConfig/packages/libTIFF.py
--- a/config/SConfig/packages/libTIFF.py Mon Apr 07 01:28:38 2008 +0000
+++ b/config/SConfig/packages/libTIFF.py Thu Apr 10 01:46:44 2008 +0000
@@ -2,8 +2,8 @@ import SConfig
import SConfig
class libTIFF(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
+ 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 23ca4705add3 -r bd2e29a7b9cd config/SConfig/packages/libavcodec.py
--- a/config/SConfig/packages/libavcodec.py Mon Apr 07 01:28:38 2008 +0000
+++ b/config/SConfig/packages/libavcodec.py Thu Apr 10 01:46:44 2008 +0000
@@ -2,8 +2,8 @@ import SConfig
import SConfig
class libavcodec(SConfig.Package):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Package.__init__(self, scons_env, scons_opts, required)
+ 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']]
diff -r 23ca4705add3 -r bd2e29a7b9cd config/packages/__init__.py
--- a/config/packages/__init__.py Mon Apr 07 01:28:38 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-from stgMagma import stgMagma
diff -r 23ca4705add3 -r bd2e29a7b9cd config/packages/stgMagma.py
--- a/config/packages/stgMagma.py Mon Apr 07 01:28:38 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-import os, platform
-import SConfig
-import SCons.Script
-
-class stgMagma(SConfig.Node):
- def __init__(self, scons_env, scons_opts, required=False):
- SConfig.Node.__init__(self, scons_env, scons_opts, required)
- shared = self.env['shared_libraries']
- self.dependency(SConfig.packages.cmath, require_shared=shared)
- self.dependency(SConfig.packages.libXML2, require_shared=shared)
- self.dependency(SConfig.packages.MPI, require_shared=shared)
- self.svnrevision = self.dependency(SConfig.packages.SVNRevision)
- self.dependency(SConfig.packages.BlasLapack, require_shared=shared)
- self.dependency(SConfig.packages.PETSc, require_shared=shared)
- self.dependency(SConfig.packages.PETScExt, require_shared=shared)
- self.dependency(SConfig.packages.HDF5, require_shared=shared, require_parallel=True)
- if self.env['with_glucifer']:
- self.dependency(SConfig.packages.OpenGL, require_shared=shared)
- self.dependency(SConfig.packages.OSMesa, False, require_shared=shared)
- self.dependency(SConfig.packages.X11, False, require_shared=shared)
- self.dependency(SConfig.packages.SDL, False, require_shared=shared)
- self.dependency(SConfig.packages.libavcodec, False, require_shared=shared)
- self.dependency(SConfig.packages.libFAME, False, require_shared=shared)
- self.dependency(SConfig.packages.libPNG, False, require_shared=shared)
- self.dependency(SConfig.packages.libJPEG, False, require_shared=shared)
- self.dependency(SConfig.packages.libTIFF, False, require_shared=shared)
-
- def setup_options(self):
- SConfig.Node.setup_options(self)
- self.opts.AddOptions(
- SCons.Script.BoolOption('debug',
- 'Enable debugging', 1),
- SCons.Script.BoolOption('static_libraries',
- 'Build static libraries', 0),
- SCons.Script.BoolOption('shared_libraries',
- 'Build shared libraries', 1),
- SCons.Script.BoolOption('with_glucifer', 'Enable the gLucifer module', 1),
- ('buildPath', 'Temporary build path', 'build')
- )
- self.option_map = {'debug': None,
- 'static_libraries': None,
- 'shared_libraries': None,
- 'with_glucifer': None}
-
- def enable(self, scons_env):
- SConfig.Node.enable(self, scons_env)
-
- # Setup the build path.
- if not os.path.isabs(scons_env['buildPath']):
- scons_env['buildPath'] = '#' + scons_env['buildPath']
-
- # Setup LIB_DIR.
- lib_dir = os.path.join(scons_env['buildPath'], 'lib')
- abs_lib_dir = scons_env.Dir(lib_dir).abspath
- scons_env.AppendUnique(CPPDEFINES=[('LIB_DIR',
- scons_env['ESCAPE']('"' + abs_lib_dir + '"'))])
- scons_env.PrependUnique(LIBPATH=[lib_dir])
-
- # Setup the RPATH.
- scons_env.PrependUnique(RPATH=[scons_env.Dir(abs_lib_dir).abspath])
-
- # Setup the module extension.
- ext = scons_env['ESCAPE']('"' + scons_env['SHLIBSUFFIX'][1:] + '"')
- scons_env.Append(CPPDEFINES=[('MODULE_EXT', ext)])
-
- # Setup the include paths.
- inc_path = os.path.join(scons_env['buildPath'], 'include')
- scons_env.AppendUnique(CPPPATH=[inc_path])
-
- # Setup debugging.
- if scons_env['debug']:
- scons_env.MergeFlags('-g')
-
- # Setup the revision number.
- ver = scons_env['ESCAPE']('"' + str(self.svnrevision.revision) + '"')
- scons_env.Append(CPPDEFINES=[('VERSION', ver)])
More information about the CIG-COMMITS
mailing list