asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #91080 from Repiteo/scons/scons_ver-variable

Browse source 
SCons: `scons_version` to environment variable
This commit is contained in:
Rémi Verschelde 2024-04-24 09:58:50 +02:00
commit fdd159de2f
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
SConstruct
View file

@ -14,9 +14,6 @@ from types import ModuleType
from collections import OrderedDict from collections import OrderedDict
from importlib.util import spec_from_file_location, module_from_spec from importlib.util import spec_from_file_location, module_from_spec
from SCons import __version__ as scons_raw_version from SCons import __version__ as scons_raw_version
from SCons.Script.SConscript import SConsEnvironment
scons_ver = SConsEnvironment._get_major_minor_revision(scons_raw_version)
# Explicitly resolve the helper modules, this is done to avoid clash with # Explicitly resolve the helper modules, this is done to avoid clash with
# modules of the same name that might be randomly added (e.g. someone adding # modules of the same name that might be randomly added (e.g. someone adding
@ -134,6 +131,7 @@ if "TERM" in os.environ: # Used for colored output.
env.disabled_modules = [] env.disabled_modules = []
env.module_version_string = "" env.module_version_string = ""
env.msvc = False env.msvc = False
env.scons_version = env._get_major_minor_revision(scons_raw_version)
env.__class__.disable_module = methods.disable_module env.__class__.disable_module = methods.disable_module
@ -172,7 +170,7 @@ if profile:
opts = Variables(customs, ARGUMENTS) opts = Variables(customs, ARGUMENTS)
# Target build options # Target build options
if scons_ver >= (4, 3): if env.scons_version >= (4, 3):
opts.Add(["platform", "p"], "Target platform (%s)" % "|".join(platform_list), "") opts.Add(["platform", "p"], "Target platform (%s)" % "|".join(platform_list), "")
else: else:
opts.Add("platform", "Target platform (%s)" % "|".join(platform_list), "") opts.Add("platform", "Target platform (%s)" % "|".join(platform_list), "")
@ -294,7 +292,7 @@ if env["import_env_vars"]:
selected_platform = env["platform"] selected_platform = env["platform"]
if scons_ver < (4, 3) and not selected_platform: if env.scons_version < (4, 3) and not selected_platform:
selected_platform = env["p"] selected_platform = env["p"]
if selected_platform == "": if selected_platform == "":
@ -983,16 +981,16 @@ if env["vsproj"]:
env.vs_incs = [] env.vs_incs = []
env.vs_srcs = [] env.vs_srcs = []
if env["compiledb"] and scons_ver < (4, 0, 0): if env["compiledb"] and env.scons_version < (4, 0, 0):
# Generating the compilation DB (`compile_commands.json`) requires SCons 4.0.0 or later. # Generating the compilation DB (`compile_commands.json`) requires SCons 4.0.0 or later.
print("The `compiledb=yes` option requires SCons 4.0 or later, but your version is %s." % scons_raw_version) print("The `compiledb=yes` option requires SCons 4.0 or later, but your version is %s." % scons_raw_version)
Exit(255) Exit(255)
if scons_ver >= (4, 0, 0): if env.scons_version >= (4, 0, 0):
env.Tool("compilation_db") env.Tool("compilation_db")
env.Alias("compiledb", env.CompilationDatabase()) env.Alias("compiledb", env.CompilationDatabase())
if env["ninja"]: if env["ninja"]:
if scons_ver < (4, 2, 0): if env.scons_version < (4, 2, 0):
print("The `ninja=yes` option requires SCons 4.2 or later, but your version is %s." % scons_raw_version) print("The `ninja=yes` option requires SCons 4.2 or later, but your version is %s." % scons_raw_version)
Exit(255) Exit(255)

10
methods.py
View file

@ -763,19 +763,15 @@ def detect_visual_c_compiler_version(tools_env):
def find_visual_c_batch_file(env): def find_visual_c_batch_file(env):
from SCons.Tool.MSCommon.vc import get_default_version, get_host_target, find_batch_file, find_vc_pdir from SCons.Tool.MSCommon.vc import get_default_version, get_host_target, find_batch_file, find_vc_pdir
# Syntax changed in SCons 4.4.0.
from SCons import __version__ as scons_raw_version
scons_ver = env._get_major_minor_revision(scons_raw_version)
msvc_version = get_default_version(env) msvc_version = get_default_version(env)
if scons_ver >= (4, 4, 0): # Syntax changed in SCons 4.4.0.
if env.scons_version >= (4, 4, 0):
(host_platform, target_platform, _) = get_host_target(env, msvc_version) (host_platform, target_platform, _) = get_host_target(env, msvc_version)
else: else:
(host_platform, target_platform, _) = get_host_target(env) (host_platform, target_platform, _) = get_host_target(env)
if scons_ver < (4, 6, 0): if env.scons_version < (4, 6, 0):
return find_batch_file(env, msvc_version, host_platform, target_platform)[0] return find_batch_file(env, msvc_version, host_platform, target_platform)[0]
# Scons 4.6.0+ removed passing env, so we need to get the product_dir ourselves first, # Scons 4.6.0+ removed passing env, so we need to get the product_dir ourselves first,