maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #53376 from ganondev/vsproj-props-for-mono

Browse source
This commit is contained in:
Rémi Verschelde 2021-10-18 10:47:08 +02:00 committed by GitHub
parent 9b85284cef 4c2f0a5c94
commit 1136d531b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 122 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

166
methods.py
View file

@ -1,8 +1,10 @@
import collections
import os import os
import re import re
import glob import glob
import subprocess import subprocess
from collections import OrderedDict from collections import OrderedDict
from typing import Iterator
# We need to define our own `Action` method to control the verbosity of output # We need to define our own `Action` method to control the verbosity of output
# and whenever we need to run those commands in a subprocess on some platforms. # and whenever we need to run those commands in a subprocess on some platforms.
@ -604,7 +606,11 @@ 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 from SCons.Tool.MSCommon.vc import (
get_default_version,
get_host_target,
find_batch_file,
)
version = get_default_version(env) version = get_default_version(env)
(host_platform, target_platform, _) = get_host_target(env) (host_platform, target_platform, _) = get_host_target(env)
@ -656,36 +662,107 @@ def generate_vs_project(env, num_jobs):
batch_file = find_visual_c_batch_file(env) batch_file = find_visual_c_batch_file(env)
if batch_file: if batch_file:
def build_commandline(commands): class ModuleConfigs(collections.Mapping):
common_build_prefix = [ # This version information (Win32, x64, Debug, Release, Release_Debug seems to be
'cmd /V /C set "plat=$(PlatformTarget)"', # required for Visual Studio to understand that it needs to generate an NMAKE
'(if "$(PlatformTarget)"=="x64" (set "plat=x86_amd64"))', # project. Do not modify without knowing what you are doing.
'set "tools=%s"' % env["tools"], PLATFORMS = ["Win32", "x64"]
'(if "$(Configuration)"=="release" (set "tools=no"))', PLATFORM_IDS = ["32", "64"]
'call "' + batch_file + '" !plat!', CONFIGURATIONS = ["debug", "release", "release_debug"]
] CONFIGURATION_IDS = ["tools", "opt", "opt.tools"]
# Windows allows us to have spaces in paths, so we need @staticmethod
# to double quote off the directory. However, the path ends def for_every_variant(value):
# in a backslash, so we need to remove this, lest it escape the return [value for _ in range(len(ModuleConfigs.CONFIGURATIONS) * len(ModuleConfigs.PLATFORMS))]
# last double quote off, confusing MSBuild
common_build_postfix = [
"--directory=\"$(ProjectDir.TrimEnd('\\'))\"",
"platform=windows",
"target=$(Configuration)",
"progress=no",
"tools=!tools!",
"-j%s" % num_jobs,
]
if env["tests"]: def __init__(self):
common_build_postfix.append("tests=yes")
if env["custom_modules"]: shared_targets_array = []
common_build_postfix.append("custom_modules=%s" % env["custom_modules"]) self.names = []
self.arg_dict = {
"variant": [],
"runfile": shared_targets_array,
"buildtarget": shared_targets_array,
"cpppaths": [],
"cppdefines": [],
"cmdargs": [],
}
self.add_mode() # default
result = " ^& ".join(common_build_prefix + [" ".join([commands] + common_build_postfix)]) def add_mode(
return result self,
name: str = "",
includes: str = "",
cli_args: str = "",
defines=None,
):
if defines is None:
defines = []
self.names.append(name)
self.arg_dict["variant"] += [
f'{config}{f"_[{name}]" if name else ""}|{platform}'
for config in ModuleConfigs.CONFIGURATIONS
for platform in ModuleConfigs.PLATFORMS
]
self.arg_dict["runfile"] += [
f'bin\\godot.windows.{config_id}.{plat_id}{f".{name}" if name else ""}.exe'
for config_id in ModuleConfigs.CONFIGURATION_IDS
for plat_id in ModuleConfigs.PLATFORM_IDS
]
self.arg_dict["cpppaths"] += ModuleConfigs.for_every_variant(env["CPPPATH"] + [includes])
self.arg_dict["cppdefines"] += ModuleConfigs.for_every_variant(env["CPPDEFINES"] + defines)
self.arg_dict["cmdargs"] += ModuleConfigs.for_every_variant(cli_args)
def build_commandline(self, commands):
configuration_getter = (
"$(Configuration"
+ "".join([f'.Replace("{name}", "")' for name in self.names[1:]])
+ '.Replace("_[]", "")'
+ ")"
)
common_build_prefix = [
'cmd /V /C set "plat=$(PlatformTarget)"',
'(if "$(PlatformTarget)"=="x64" (set "plat=x86_amd64"))',
'set "tools=%s"' % env["tools"],
f'(if "{configuration_getter}"=="release" (set "tools=no"))',
'call "' + batch_file + '" !plat!',
]
# Windows allows us to have spaces in paths, so we need
# to double quote off the directory. However, the path ends
# in a backslash, so we need to remove this, lest it escape the
# last double quote off, confusing MSBuild
common_build_postfix = [
"--directory=\"$(ProjectDir.TrimEnd('\\'))\"",
"platform=windows",
f"target={configuration_getter}",
"progress=no",
"tools=!tools!",
"-j%s" % num_jobs,
]
if env["tests"]:
common_build_postfix.append("tests=yes")
if env["custom_modules"]:
common_build_postfix.append("custom_modules=%s" % env["custom_modules"])
result = " ^& ".join(common_build_prefix + [" ".join([commands] + common_build_postfix)])
return result
# Mappings interface definitions
def __iter__(self) -> Iterator[str]:
for x in self.arg_dict:
yield x
def __len__(self) -> int:
return len(self.names)
def __getitem__(self, k: str):
return self.arg_dict[k]
add_to_vs_project(env, env.core_sources) add_to_vs_project(env, env.core_sources)
add_to_vs_project(env, env.drivers_sources) add_to_vs_project(env, env.drivers_sources)
@ -700,21 +777,24 @@ def generate_vs_project(env, num_jobs):
for header in glob_recursive("**/*.h"): for header in glob_recursive("**/*.h"):
env.vs_incs.append(str(header)) env.vs_incs.append(str(header))
env["MSVSBUILDCOM"] = build_commandline("scons") module_configs = ModuleConfigs()
env["MSVSREBUILDCOM"] = build_commandline("scons vsproj=yes") import modules.mono.build_scripts.mono_reg_utils as mono_reg
env["MSVSCLEANCOM"] = build_commandline("scons --clean")
# This version information (Win32, x64, Debug, Release, Release_Debug seems to be if env.get("module_mono_enabled"):
# required for Visual Studio to understand that it needs to generate an NMAKE mono_root = env.get("mono_prefix") or mono_reg.find_mono_root_dir(env["bits"])
# project. Do not modify without knowing what you are doing. if mono_root:
debug_variants = ["debug|Win32"] + ["debug|x64"] module_configs.add_mode(
release_variants = ["release|Win32"] + ["release|x64"] "mono",
release_debug_variants = ["release_debug|Win32"] + ["release_debug|x64"] includes=os.path.join(mono_root, "include", "mono-2.0"),
variants = debug_variants + release_variants + release_debug_variants cli_args="module_mono_enabled=yes mono_glue=yes",
debug_targets = ["bin\\godot.windows.tools.32.exe"] + ["bin\\godot.windows.tools.64.exe"] defines=[("MONO_GLUE_ENABLED",)],
release_targets = ["bin\\godot.windows.opt.32.exe"] + ["bin\\godot.windows.opt.64.exe"] )
release_debug_targets = ["bin\\godot.windows.opt.tools.32.exe"] + ["bin\\godot.windows.opt.tools.64.exe"] else:
targets = debug_targets + release_targets + release_debug_targets print("Mono installation directory not found. Generated project will not have build variants for Mono.")
env["MSVSBUILDCOM"] = module_configs.build_commandline("scons")
env["MSVSREBUILDCOM"] = module_configs.build_commandline("scons vsproj=yes")
env["MSVSCLEANCOM"] = module_configs.build_commandline("scons --clean")
if not env.get("MSVS"): if not env.get("MSVS"):
env["MSVS"]["PROJECTSUFFIX"] = ".vcxproj" env["MSVS"]["PROJECTSUFFIX"] = ".vcxproj"
env["MSVS"]["SOLUTIONSUFFIX"] = ".sln" env["MSVS"]["SOLUTIONSUFFIX"] = ".sln"
@ -722,10 +802,8 @@ def generate_vs_project(env, num_jobs):
target=["#godot" + env["MSVSPROJECTSUFFIX"]], target=["#godot" + env["MSVSPROJECTSUFFIX"]],
incs=env.vs_incs, incs=env.vs_incs,
srcs=env.vs_srcs, srcs=env.vs_srcs,
runfile=targets,
buildtarget=targets,
auto_build_solution=1, auto_build_solution=1,
variant=variants, **module_configs,
) )
else: else:
print("Could not locate Visual Studio batch file to set up the build environment. Not generating VS project.") print("Could not locate Visual Studio batch file to set up the build environment. Not generating VS project.")