research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated Matlab build scripts to work with new directory structure

Browse source
This commit is contained in:
Ray Speth 2012-02-12 20:44:28 +00:00
parent 2589e3c926
commit fc1b2f16f0
2 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
SConstruct
View file

@ -742,6 +742,11 @@ if env['coverage']:
print 'Error: coverage testing is only available with GCC'
exit(0)
env['python_module_loc'] = pjoin(env['prefix'], 'lib',
'python%i.%i' % sys.version_info[:2],
'site-packages')
# **************************************
# *** Set options needed in config.h ***
# **************************************
@ -898,10 +903,6 @@ build_cantera = Alias('build', finish_build)
Default('build')
def postInstallMessage(target, source, env):
v = sys.version_info
env['python_module_loc'] = pjoin(
env['prefix'], 'lib', 'python%i.%i' % v[:2], 'site-packages')
print """
Cantera has been successfully installed.

38
src/matlab/SConscript
View file

@ -8,36 +8,35 @@ class MatlabBuilder(object):
def __call__(self, target, source, env):
filenames = [os.path.split(node.path)[1] for node in source]
sourcestr = ' '.join(pjoin('..','src',name) for name in filenames)
sourcestr = ' '.join(filenames)
includes = ' '.join('-I%s' % quoted(Dir(s).abspath) for s in env['CPPPATH'])
libdir = ' '.join('-L%s' % quoted(Dir(s).abspath) for s in env['LIBPATH'])
libs = ' '.join('-l'+s for s in self.libs)
extraFlag = '-cxx' if os.name == 'posix' else ''
debugFlag = '-g' if not env['optimize'] else ''
text = """
disp('building Cantera...');
cd cantera
mex %(debugFlag)s %(extraFlag)s -v -output ctmethods %(include)s %(libdir)s %(libs)s %(sourcestr)s
disp('done.');
exit
""" % dict(sourcestr=sourcestr,
extraFlag=extraFlag,
include=includes,
libdir=libdir,
libs=libs,
debugFlag=debugFlag)
outdir = "'%s'" % Dir('#interfaces/matlab/toolbox').abspath
text = ("disp('building Cantera...');\n"
"mex %(debugFlag)s %(extraFlag)s -v -output ctmethods "
"-outdir %(outdir)s "
"%(includes)s %(libdir)s "
"%(libs)s %(sourcestr)s\n"
"disp('done.');\n"
"exit\n") % locals()
with open(str(target[0]), 'w') as f:
f.write(text)
localenv = env.Clone()
localenv.Append(CPPPATH=['#include', '#src'])
libs = ['clib']
if localenv['OS'] != 'Windows':
libs.extend(env['cantera_libs'])
localenv.Command('build_cantera.m',
mglob(localenv, 'src', 'cpp'),
mglob(localenv, '.', 'cpp'),
MatlabBuilder(libs))
localenv['ENV']['PATH'] = os.environ['PATH']
@ -65,22 +64,19 @@ buildTargets.extend(target)
### Install the Matlab toolbox ###
# 'ctpath.m'
target = localenv.SubstFile('ctpath.m', 'ctpath.m.in')
target = localenv.SubstFile('ctpath.m', '#interfaces/matlab/ctpath.m.in')
buildTargets.extend(target)
inst = localenv.Install('$inst_matlab_dir', target)
installTargets.extend(inst)
# 'cantera_demos.m'
inst = localenv.Install('$inst_matlab_dir', 'cantera_demos.m')
inst = localenv.Install('$inst_matlab_dir', '#samples/matlab/cantera_demos.m')
installTargets.extend(inst)
inst = localenv.RecursiveInstall('$inst_matlab_dir', 'cantera')
inst = localenv.RecursiveInstall('$inst_matlab_dir', '#interfaces/matlab/toolbox')
installTargets.extend(inst)
inst = localenv.RecursiveInstall(pjoin('$inst_tutdir', 'matlab'), 'tutorial')
installTargets.extend(inst)
inst = localenv.RecursiveInstall(pjoin('$inst_demodir', 'matlab'), 'examples')
inst = localenv.RecursiveInstall(pjoin('$inst_demodir', 'matlab'), '#samples/matlab')
installTargets.extend(inst)
if os.name == 'nt':