mirror of
https://github.com/Cantera/cantera.git
synced 2026-08-17 16:35:17 -05:00
[SCons] Remove deprecated compilation options
This commit is contained in:
committed by
Bryan W. Weber
parent
2ef2cb05cd
commit
9ce04ba4e1
+3
-56
@@ -360,7 +360,7 @@ config_options = [
|
|||||||
Python is running SCons if the required prerequisites (NumPy and
|
Python is running SCons if the required prerequisites (NumPy and
|
||||||
Cython) are installed. Note: ``y`` is a synonym for ``full`` and ``n``
|
Cython) are installed. Note: ``y`` is a synonym for ``full`` and ``n``
|
||||||
is a synonym for ``none``.""",
|
is a synonym for ``none``.""",
|
||||||
'default', ('new', 'full', 'minimal', 'none', 'n', 'y', 'default')),
|
'default', ('full', 'minimal', 'none', 'n', 'y', 'default')),
|
||||||
PathVariable(
|
PathVariable(
|
||||||
'python_cmd',
|
'python_cmd',
|
||||||
"""Cantera needs to know where to find the Python interpreter. If
|
"""Cantera needs to know where to find the Python interpreter. If
|
||||||
@@ -377,21 +377,6 @@ config_options = [
|
|||||||
To install to the current user's 'site-packages' directory, use
|
To install to the current user's 'site-packages' directory, use
|
||||||
'python_prefix=USER'.""",
|
'python_prefix=USER'.""",
|
||||||
defaults.python_prefix, PathVariable.PathAccept),
|
defaults.python_prefix, PathVariable.PathAccept),
|
||||||
EnumVariable(
|
|
||||||
'python3_package',
|
|
||||||
"""Deprecated synonym for the 'python_package' option. Will be overridden
|
|
||||||
if 'python_package' is set.""",
|
|
||||||
'default', ('full', 'minimal', 'y', 'n', 'none', 'default')),
|
|
||||||
PathVariable(
|
|
||||||
'python3_cmd',
|
|
||||||
"""Deprecated synonym for the 'python_cmd' option. Will be overridden
|
|
||||||
if 'python_cmd' is set.""",
|
|
||||||
sys.executable, PathVariable.PathAccept),
|
|
||||||
PathVariable(
|
|
||||||
'python3_prefix',
|
|
||||||
"""Deprecated synonym for the 'python_prefix' option. Will be overridden
|
|
||||||
if 'python_prefix' is set.""",
|
|
||||||
defaults.python_prefix, PathVariable.PathAccept),
|
|
||||||
EnumVariable(
|
EnumVariable(
|
||||||
'matlab_toolbox',
|
'matlab_toolbox',
|
||||||
"""This variable controls whether the MATLAB toolbox will be built. If
|
"""This variable controls whether the MATLAB toolbox will be built. If
|
||||||
@@ -522,20 +507,12 @@ config_options = [
|
|||||||
argument at the end of the argument list ('yes') or after
|
argument at the end of the argument list ('yes') or after
|
||||||
each argument ('no') in the Fortran libraries.""",
|
each argument ('no') in the Fortran libraries.""",
|
||||||
True),
|
True),
|
||||||
EnumVariable(
|
|
||||||
'system_googletest',
|
|
||||||
"""Select whether to use gtest/gmock from system
|
|
||||||
installation ('y'), from a Git submodule ('n'), or to decide
|
|
||||||
automatically ('default'). Deprecated option, please use 'googletest' instead.
|
|
||||||
This option is suppressed by 'googletest' option.""",
|
|
||||||
'unspecified', ('unspecified','default', 'y', 'n')),
|
|
||||||
EnumVariable(
|
EnumVariable(
|
||||||
'googletest',
|
'googletest',
|
||||||
"""Select whether to use gtest/gmock from system
|
"""Select whether to use gtest/gmock from system
|
||||||
installation ('system'), from a Git submodule ('submodule'), to decide
|
installation ('system'), from a Git submodule ('submodule'), to decide
|
||||||
automatically ('default') or don't look for gtest/gmock ('none')
|
automatically ('default') or don't look for gtest/gmock ('none')
|
||||||
and don't run tests that depend on gtest/gmock. If this option is
|
and don't run tests that depend on gtest/gmock.""",
|
||||||
set then it suppresses the deprecated 'system_googletest' option.""",
|
|
||||||
'default', ('default', 'system', 'submodule', 'none')),
|
'default', ('default', 'system', 'submodule', 'none')),
|
||||||
(
|
(
|
||||||
'env_vars',
|
'env_vars',
|
||||||
@@ -943,17 +920,6 @@ except ValueError:
|
|||||||
env['FMT_VERSION'] = '0.0.0'
|
env['FMT_VERSION'] = '0.0.0'
|
||||||
print('INFO: Could not find version of fmt')
|
print('INFO: Could not find version of fmt')
|
||||||
|
|
||||||
# Convert setting of the deprecated system_googletest option
|
|
||||||
if env['system_googletest'] != 'unspecified':
|
|
||||||
print("WARNING: The 'system_googletest' option is deprecated. "
|
|
||||||
"Use the 'googletest' option instead.")
|
|
||||||
if env['system_googletest'] == 'default':
|
|
||||||
env['googletest'] = 'default'
|
|
||||||
elif env['system_googletest'] == 'y':
|
|
||||||
env['googletest'] = 'system'
|
|
||||||
elif env['system_googletest'] == 'n':
|
|
||||||
env['googletest'] = 'submodule'
|
|
||||||
|
|
||||||
# Check for yaml-cpp library and checkout submodule if needed
|
# Check for yaml-cpp library and checkout submodule if needed
|
||||||
if env['system_yamlcpp'] in ('y', 'default'):
|
if env['system_yamlcpp'] in ('y', 'default'):
|
||||||
if conf.CheckCXXHeader('yaml-cpp/yaml.h', '""'):
|
if conf.CheckCXXHeader('yaml-cpp/yaml.h', '""'):
|
||||||
@@ -1256,26 +1222,7 @@ check_for_ruamel_yaml = any(
|
|||||||
for target in ["install", "test", "test-python-convert"]
|
for target in ["install", "test", "test-python-convert"]
|
||||||
)
|
)
|
||||||
|
|
||||||
# Handle the version-specific Python package options
|
if env['python_package'] == 'y':
|
||||||
python_options = (('package', 'default'),
|
|
||||||
('cmd', sys.executable),
|
|
||||||
('prefix', defaults.python_prefix))
|
|
||||||
for option, default in python_options:
|
|
||||||
if env['python3_' + option] != default:
|
|
||||||
print("WARNING: Option 'python3_{0}' is deprecated."
|
|
||||||
" Use 'python_{0}' instead.".format(option))
|
|
||||||
if env['python_' + option] == default:
|
|
||||||
env['python_' + option] = env['python3_' + option]
|
|
||||||
else:
|
|
||||||
print("WARNING: Ignoring option 'python3_{0}'"
|
|
||||||
" because 'python_{0}' was also set.".format(option))
|
|
||||||
|
|
||||||
if env['python_package'] == 'new':
|
|
||||||
print("WARNING: The 'new' option for the Python package is "
|
|
||||||
"deprecated and will be removed in the future. Use "
|
|
||||||
"'full' instead.")
|
|
||||||
env['python_package'] = 'full' # Allow 'new' as a synonym for 'full'
|
|
||||||
elif env['python_package'] == 'y':
|
|
||||||
env['python_package'] = 'full' # Allow 'y' as a synonym for 'full'
|
env['python_package'] = 'full' # Allow 'y' as a synonym for 'full'
|
||||||
elif env['python_package'] == 'n':
|
elif env['python_package'] == 'n':
|
||||||
env['python_package'] = 'none' # Allow 'n' as a synonym for 'none'
|
env['python_package'] = 'none' # Allow 'n' as a synonym for 'none'
|
||||||
|
|||||||
Reference in New Issue
Block a user