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

[SCons] Remove previously-deprecated configuration options

Browse source
This commit is contained in:
Ray Speth 2015-05-11 16:46:49 -04:00
parent ba9c9c768f
commit 8ce62988a1
6 changed files with 4 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
SConstruct
View file

@ -580,18 +580,6 @@ config_options = [
static libaries and avoids a bug with using valgrind with
the -static linking flag.""",
True),
BoolVariable(
'install_gtest',
"""Determines whether to install the Google Test library and headers
alongside Cantera's libraries. Deprecated.""",
False),
BoolVariable(
'single_library',
"""If set to 'n', code from the 'ext' folder in the cantera library
will be placed in separate libraries for ctlapack, ctf2c, etc., rather
than being included in the cantera library. NOTE: This option is
deprecated, and will be removed in Cantera 2.2.""",
True),
EnumVariable(
'layout',
"""The layout of the directory structure. 'standard' installs files to
@ -602,16 +590,6 @@ config_options = [
with a prefix like '/opt/cantera'. 'debian' installs to the stage
directory in a layout used for generating Debian packages.""",
defaults.fsLayout, ('standard','compact','debian')),
PathVariable(
'graphvizdir',
"""The directory location of the graphviz program, "dot". dot is used
for creating the documentation, and for making reaction path
diagrams. If "dot" is in your path, you can leave this unspecified.
NOTE: Matlab comes with a stripped-down version of 'dot'. If 'dot'
is on your path, make sure it is not the Matlab version!.
*Deprecated*. Make sure that 'dot' is on your path before building
the Doxygen documentation.""",
'', PathVariable.PathAccept),
('cantera_version', '', '2.2a1')
]
@ -665,17 +643,6 @@ for line in open('cantera.conf'):
print ' ', line.strip()
print
# Check for deprecated SCons options
if not env['single_library']:
print "WARNING: Setting the 'single_library' option to False is deprecated."
print " This option will be removed in Cantera 2.2."
if env['install_gtest']:
print "WARNING: The option 'install_gtest' is deprecated."
print " This option will be removed in Cantera 2.2."
if env['graphvizdir']:
print "WARNING: The option 'graphvizdir' is deprecated."
print " This option will be removed in Cantera 2.2."
# ********************************************
# *** Configure system-specific properties ***
# ********************************************
@ -1416,34 +1383,16 @@ if env['use_sundials'] == 'y':
linkSharedLibs.extend(('sundials_cvodes', 'sundials_ida', 'sundials_nvecserial'))
else:
env['sundials_libs'] = []
if not env['single_library']:
linkLibs.extend(['cvode'])
linkSharedLibs.extend(['cvode_shared'])
if not env['single_library']:
linkLibs.append('ctmath')
linkSharedLibs.append('ctmath_shared')
# Add execstream to the link line
linkLibs.append('execstream')
linkSharedLibs.append('execstream_shared')
# Add lapack and blas to the link line
# If there is a special blas and lapack add that in
if env['blas_lapack_libs']:
linkLibs.extend(env['blas_lapack_libs'])
linkSharedLibs.extend(env['blas_lapack_libs'])
elif not env['single_library']:
linkLibs.extend(('ctlapack', 'ctblas'))
linkSharedLibs.extend(('ctlapack_shared', 'ctblas_shared'))
if not env['build_with_f2c']:
linkLibs.extend(env['FORTRANSYSLIBS'])
linkSharedLibs.append(env['FORTRANSYSLIBS'])
elif not env['single_library']:
# Add the f2c library when f2c is requested
linkLibs.append('ctf2c')
linkSharedLibs.append('ctf2c_shared')
linkLibs.extend(env['boost_libs'])
linkSharedLibs.extend(env['boost_libs'])

3
doc/SConscript
View file

@ -89,9 +89,6 @@ def get_function_name(str):
return sig
if localenv['doxygen_docs']:
if localenv['graphvizdir']:
localenv.Append(PATH=localenv['graphvizdir'])
docs = build(localenv.Command('#build/docs/doxygen/html/index.html',
'doxygen/Doxyfile', 'doxygen $SOURCE'))
env.Depends(docs, env.Glob('#doc/doxygen/*') +

19
doc/sphinx/scons-options.txt
View file

@ -325,25 +325,6 @@ of this file is:
of installing into the local filesystem.
- default: ''
* legacy_headers: [ yes | no ]
Create symbolic links for headers that were installed to the
'kernel' subdirectory in previous versions of Cantera.
- default: 'no'
* graphvisdir: [ /path/to/graphvisdir ]
The directory location of the graphviz program, dot. dot is used for
creating the documentation, and for making reaction path diagrams.
If "dot" is in your path, you can leave this unspecified. NOTE:
Matlab comes with a stripped-down version of 'dot'. If 'dot' is on
your path, make sure it is not the Matlab version!
- default: ''
* rpfont: [ string ]
The font to use in reaction path diagrams. This must be a font name
recognized by the 'dot' program. On linux systems, this should be
lowercase 'helvetica'.
- default: 'Helvetica'
* cantera_version: [ string ]
- default: '2.0.0b1'

45
ext/SConscript
View file

@ -95,42 +95,8 @@ for subdir, extensions, prepFunction in libs:
localenv = prepFunction(env)
if localenv['single_library']:
objects = localenv.SharedObject(mglob(localenv, subdir, *extensions))
libraryTargets.extend(objects)
else:
libName = 'ct' + subdir
if libName == 'ctf2c_blas':
libName = 'ctblas'
if libName == 'ctf2c_lapack':
libName = 'ctlapack'
if libName == 'ctf2c_math':
libName = 'ctmath'
if libName == 'ctcvode/source':
libName = 'cvode'
if libName == 'ctlibexecstream':
libName = 'execstream'
if libName == 'ctf2c_libs':
libName = 'ctf2c'
if localenv['renamed_shared_libraries']:
sharedLibName = libName + '_shared'
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
lib = build(localenv.StaticLibrary(pjoin('..', 'lib', libName), objects))
install('$inst_libdir', lib)
# Build the shared library
liby = build(localenv.SharedLibrary(pjoin('..', 'lib', sharedLibName), objects))
install('$inst_libdir', liby)
objects = localenv.SharedObject(mglob(localenv, subdir, *extensions))
libraryTargets.extend(objects)
# Google Test: Used internally for Cantera unit tests. Optionally, the headers
# and compiled library can be installed alongside Cantera using the scons
@ -138,10 +104,3 @@ for subdir, extensions, prepFunction in libs:
localenv = prep_gtest(env)
gtest = build(localenv.Library('../lib/gtest',
source=['gtest/src/gtest-all.cc']))
if localenv['install_gtest']:
# install the static library
install('$inst_libdir', gtest)
# install the header files
install(localenv.RecursiveInstall, '$inst_incroot', '#/ext/gtest/include')

10
platform/posix/Cantera.mak.in
View file

@ -74,12 +74,6 @@ CANTERA_BLAS_LAPACK_LIBS=@mak_blas_lapack_libs@
CANTERA_BLAS_LAPACK_LIBS_DEP=$(CANTERA_INSTALL_DIR)/lib/libctlapack.a $(CANTERA_INSTALL_DIR)/lib/libctblas.a
endif
###############################################################################
# F2C USAGE
###############################################################################
CANTERA_F2C_LIBS= @mak_f2c_lib@
###############################################################################
# COMBINATIONS OF INCLUDES AND LIBS
###############################################################################
@ -95,7 +89,7 @@ CANTERA_DEFINES = -DCANTERA_VERSION=@cantera_version@
CANTERA_LIBS=$(CANTERA_CORE_LIBS) \
$(CANTERA_EXTRA_LIBDIRS) $(CANTERA_SUNDIALS_LIBS) \
$(CANTERA_BLAS_LAPACK_LIBS) $(CANTERA_BOOST_LIBS) \
$(CANTERA_F2C_LIBS) $(CANTERA_SYSLIBS)
$(CANTERA_SYSLIBS)
CANTERA_TOTAL_LIBS=$(CANTERA_LIBS)
@ -106,7 +100,7 @@ CANTERA_TOTAL_LIBS_DEP= $(CANTERA_CORE_LIBS_DEP) \
CANTERA_FORTRAN_LIBS=$(CANTERA_CORE_FTN) \
$(CANTERA_EXTRA_LIBDIRS) $(CANTERA_SUNDIALS_LIBS) \
$(CANTERA_BLAS_LAPACK_LIBS) $(CANTERA_F2C_LIBS) \
$(CANTERA_BLAS_LAPACK_LIBS) \
$(CANTERA_BOOST_LIBS) $(CANTERA_FORTRAN_SYSLIBS)
###############################################################################

9
platform/posix/SConscript
View file

@ -31,8 +31,6 @@ pc_incdirs = []
pc_cflags = []
localenv['mak_corelibs'] = '-lcantera'
if not env['single_library']:
localenv['mak_corelibs'] += ' -lctmath -lexecstream'
localenv['mak_extra_includes'] = ['-I%s' % s for s in localenv['extra_inc_dirs']]
pc_incdirs.extend(localenv['extra_inc_dirs'])
@ -81,10 +79,6 @@ localenv['mak_have_blas_lapack_dir'] = '1' if localenv['blas_lapack_dir'] else '
if localenv['blas_lapack_dir']:
localenv['mak_blas_lapack_libs'] = ' '.join('-l%s' % s for s in localenv['blas_lapack_libs'])
localenv['mak_blas_lapack_libs_dep'] = ''
elif not env['single_library']:
localenv['mak_blas_lapack_libs'] = ('-L' + '$(CANTERA_INSTALL_ROOT)/lib' + ' -lctlapack -lctblas')
localenv['mak_blas_lapack_libs_dep'] = ( '$' + '(CANTERA_INSTALL_ROOT)' + '/lib' + 'ctlapack' + '.a' + ' $(CANTERA_INSTALL_ROOT)/lib/libctblas.a')
print 'blas = ', localenv['mak_blas_lapack_libs_dep']
else:
localenv['mak_blas_lapack_libs'] = ''
localenv['mak_blas_lapack_libs_dep'] = ''
@ -101,9 +95,6 @@ if '-pthread' in localenv['thread_flags']:
else:
localenv['mak_fort_threadflags'] = ''
# Handle f2c Linkage
localenv['mak_f2c_lib'] = '-lctf2c' if localenv['build_with_f2c'] and not env['single_library'] else ''
if not localenv['build_with_f2c']:
localenv['mak_syslibs'] = ' '.join('-l%s' % s for s in localenv['FORTRANSYSLIBS'])
pc_libs.extend(localenv['FORTRANSYSLIBS'])