diff --git a/SConstruct b/SConstruct index fdddb93d0..80b193455 100644 --- a/SConstruct +++ b/SConstruct @@ -91,12 +91,17 @@ from packaging.specifiers import SpecifierSet from packaging.version import parse as parse_version import SCons +from buildutils import (Option, PathOption, BoolOption, EnumOption, Configuration, + logger, remove_directory, remove_file, test_results, + add_RegressionTest, get_command_output, listify, which, + ConfigBuilder, multi_glob, quoted, add_system_include, + checkout_submodule, check_for_python, check_sundials, + config_error, run_preprocessor, make_relative_path_absolute) + # ensure that Python and SCons versions are sufficient for the build process EnsurePythonVersion(3, 7) EnsureSConsVersion(3, 0, 0) -from buildutils import * - if not COMMAND_LINE_TARGETS: # Print usage help logger.error("Missing command argument: type 'scons help' for information.") @@ -1862,7 +1867,7 @@ cdefine('CT_USE_SYSTEM_YAMLCPP', 'system_yamlcpp') config_h_build = env.Command('build/src/config.h.build', 'include/cantera/base/config.h.in', - ConfigBuilder(configh)) + ConfigBuilder(configh)) # This separate copy operation, which SCons will skip if config.h.build is # unmodified, prevents unnecessary rebuilds of the precompiled header config_h = env.Command('include/cantera/base/config.h', diff --git a/doc/SConscript b/doc/SConscript index 83944fce8..eab4131b3 100644 --- a/doc/SConscript +++ b/doc/SConscript @@ -1,10 +1,10 @@ - from collections import namedtuple from pathlib import Path import subprocess -from buildutils import * from SCons import Errors +from buildutils import multi_glob + Import('env', 'build', 'install') localenv = env.Clone() diff --git a/interfaces/cython/SConscript b/interfaces/cython/SConscript index 6cb7fe9eb..5fa33f05d 100644 --- a/interfaces/cython/SConscript +++ b/interfaces/cython/SConscript @@ -2,7 +2,9 @@ import re from pathlib import Path from packaging.version import parse as parse_version -from buildutils import * + +from buildutils import (get_command_output, which, multi_glob, + get_pip_install_location, setup_python_env) Import('env', 'build', 'install') diff --git a/platform/posix/SConscript b/platform/posix/SConscript index cd58c7eff..10ac9e0de 100644 --- a/platform/posix/SConscript +++ b/platform/posix/SConscript @@ -1,6 +1,4 @@ -import os - -from buildutils import * +from buildutils import multi_glob, compiler_flag_list Import('env', 'build', 'install') localenv = env.Clone() diff --git a/samples/clib/SConscript b/samples/clib/SConscript index 02f37921f..926e3e803 100644 --- a/samples/clib/SConscript +++ b/samples/clib/SConscript @@ -1,5 +1,4 @@ -from os.path import join as pjoin, relpath -from buildutils import * +from buildutils import quoted, compiler_flag_list Import('env', 'install', 'buildSample') localenv = env.Clone() diff --git a/samples/cxx/SConscript b/samples/cxx/SConscript index 48b594512..7df142e6f 100644 --- a/samples/cxx/SConscript +++ b/samples/cxx/SConscript @@ -1,8 +1,8 @@ from os.path import join as pjoin -import os -from buildutils import * from collections import namedtuple +from buildutils import logger, multi_glob, quoted, compiler_flag_list + Import('env', 'build', 'install', 'buildSample') Sample = namedtuple( diff --git a/samples/f77/SConscript b/samples/f77/SConscript index 1fa20bce9..1c9e0ca17 100644 --- a/samples/f77/SConscript +++ b/samples/f77/SConscript @@ -1,5 +1,4 @@ -from os.path import join as pjoin, relpath -from buildutils import * +from buildutils import compiler_flag_list Import('env', 'install', 'buildSample') localenv = env.Clone() diff --git a/samples/f90/SConscript b/samples/f90/SConscript index 7f6a6e6d7..1eaf386c7 100644 --- a/samples/f90/SConscript +++ b/samples/f90/SConscript @@ -1,5 +1,6 @@ -from os.path import join as pjoin, relpath -from buildutils import * +from os.path import join as pjoin + +from buildutils import quoted Import('env', 'install', 'buildSample') localenv = env.Clone() diff --git a/src/SConscript b/src/SConscript index a6b4bf999..b7f665285 100644 --- a/src/SConscript +++ b/src/SConscript @@ -1,7 +1,8 @@ -from buildutils import * -from pathlib import Path import re +from buildutils import (logger, remove_file, multi_glob, get_spawn, + add_system_include, setup_python_env) + Import('env', 'build', 'install', 'libraryTargets') def defaultSetup(env, subdir, extensions): diff --git a/src/fortran/SConscript b/src/fortran/SConscript index b0eeb05dc..dae39c895 100644 --- a/src/fortran/SConscript +++ b/src/fortran/SConscript @@ -1,4 +1,4 @@ -from buildutils import * +from buildutils import multi_glob, get_spawn Import('env', 'build', 'install') diff --git a/test/SConscript b/test/SConscript index a3f4b0b29..823ccc13a 100644 --- a/test/SConscript +++ b/test/SConscript @@ -5,7 +5,7 @@ from os.path import join as pjoin import time import sys -from buildutils import * +from buildutils import logger, test_results, multi_glob Import('env','build','install') localenv = env.Clone() diff --git a/test_problems/SConscript b/test_problems/SConscript index ce41236ec..0481b0caa 100644 --- a/test_problems/SConscript +++ b/test_problems/SConscript @@ -1,6 +1,7 @@ import os from os.path import join as pjoin -from buildutils import * + +from buildutils import test_results, multi_glob Import('env','build','install') localenv = env.Clone()