Added back constructPhaseFile() and constructPhaseXML().

All molten salt problems were broken and some brine problems were broken.
This commit is contained in:
Harry Moffat
2012-11-07 23:51:30 +00:00
parent 6e7b14c468
commit 08a41f191c
7 changed files with 468 additions and 1 deletions

View File

@@ -3,6 +3,10 @@ from buildutils import *
Import('env', 'build', 'install', 'libraryTargets')
localenv = env.Clone()
#
# prep function seem to return the environment
#
def prep_default(env):
return env.Clone()
@@ -19,7 +23,16 @@ def prep_f2c(env):
localenv.Append(CPPDEFINES=['USE_CLOCK'])
if not localenv['HAS_UNISTD_H']:
localenv.Append(CPPDEFINES=['MSDOS'])
if env['VERBOSE'] :
print "INFO 2: prep_f2c: adding MSDOS to CPPDEFINES"
if env['VERBOSE'] :
localenv.Append(CPPDEFINES=['added'])
print "INFO 2: CPPDEFINES ", localenv['CPPDEFINES']
#print "localenv", localenv.Dump()
#exit(0)
# The F2C code generates a lot of warnings designed to catch
# programmer errors, but since this is autogenerated code, those
# warnings are irrelevant.
@@ -52,6 +65,10 @@ def prep_gtest(env):
CPPDEFINES={'GTEST_HAS_PTHREAD': 0})
return localenv
# libs is a list of length 3
# 0 subdir for execution
# 1 file extension
# 2 function pointer
# (subdir, (file extensions), prepfunction)
libs = [('libexecstream', ['cpp'], prep_default)]
@@ -95,6 +112,10 @@ if env['use_sundials'] == 'n':
for subdir, extensions, prepFunction in libs:
if env['VERBOSE']:
print "INFO 2: Prep the environment for ", subdir, ' with extensions ', extensions, ' by calling func ', prepFunction.__name__
localenv = prepFunction(env)
if localenv['single_library']:
@@ -120,6 +141,10 @@ for subdir, extensions, prepFunction in libs:
else:
sharedLibName = libName
if env['VERBOSE'] :
print "INFO 2:" , subdir , ' with ', extensions
print " libName = ", libName, " sharedLibName = ", sharedLibName
objects = localenv.SharedObject(mglob(localenv, subdir, *extensions))
# Build the static library