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

Merge pull request #42332 from Calinou/default-enable-copy-mono-root

Browse source 
Enable the `copy_mono_root` SCons option by default
This commit is contained in:
Rémi Verschelde 2020-09-25 15:00:54 +02:00 committed by GitHub
commit ed91d3efeb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/mono/build_scripts/mono_configure.py
View file

@ -396,9 +396,8 @@ def configure(env, env_mono):
mono_root = subprocess.check_output(["pkg-config", "mono-2", "--variable=prefix"]).decode("utf8").strip() mono_root = subprocess.check_output(["pkg-config", "mono-2", "--variable=prefix"]).decode("utf8").strip()
if tools_enabled: if tools_enabled:
# Only supported for editor builds.
copy_mono_root_files(env, mono_root) copy_mono_root_files(env, mono_root)
else:
print("Ignoring option: 'copy_mono_root'; only available for builds with 'tools' enabled.")
def make_template_dir(env, mono_root): def make_template_dir(env, mono_root):

8
modules/mono/config.py
View file

@ -23,17 +23,17 @@ def configure(env):
envvars.Add( envvars.Add(
PathVariable( PathVariable(
"mono_prefix", "mono_prefix",
"Path to the mono installation directory for the target platform and architecture", "Path to the Mono installation directory for the target platform and architecture",
"", "",
PathVariable.PathAccept, PathVariable.PathAccept,
) )
) )
envvars.Add(BoolVariable("mono_static", "Statically link mono", default_mono_static)) envvars.Add(BoolVariable("mono_static", "Statically link Mono", default_mono_static))
envvars.Add(BoolVariable("mono_glue", "Build with the mono glue sources", True)) envvars.Add(BoolVariable("mono_glue", "Build with the Mono glue sources", True))
envvars.Add(BoolVariable("build_cil", "Build C# solutions", True)) envvars.Add(BoolVariable("build_cil", "Build C# solutions", True))
envvars.Add( envvars.Add(
BoolVariable( BoolVariable(
"copy_mono_root", "Make a copy of the mono installation directory to bundle with the editor", False "copy_mono_root", "Make a copy of the Mono installation directory to bundle with the editor", True
) )
) )