diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-09-25 15:00:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-25 15:00:54 +0200 |
| commit | ed91d3efeb6e7eab5292865b5d262b3d0d52313c (patch) | |
| tree | e7552f0c6ac9b8c8ea5a9ea7cfd23c0a6b739838 | |
| parent | 96a51b108c953d8c8e112340b03fc1026d7243ed (diff) | |
| parent | cfd564b385f261d790d52c58be9344adf7d74f0e (diff) | |
Merge pull request #42332 from Calinou/default-enable-copy-mono-root
Enable the `copy_mono_root` SCons option by default
| -rw-r--r-- | modules/mono/build_scripts/mono_configure.py | 3 | ||||
| -rw-r--r-- | modules/mono/config.py | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/modules/mono/build_scripts/mono_configure.py b/modules/mono/build_scripts/mono_configure.py index e959312393..6057004166 100644 --- a/modules/mono/build_scripts/mono_configure.py +++ b/modules/mono/build_scripts/mono_configure.py @@ -396,9 +396,8 @@ def configure(env, env_mono): mono_root = subprocess.check_output(["pkg-config", "mono-2", "--variable=prefix"]).decode("utf8").strip() if tools_enabled: + # Only supported for editor builds. 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): diff --git a/modules/mono/config.py b/modules/mono/config.py index cd659057ef..95459a4779 100644 --- a/modules/mono/config.py +++ b/modules/mono/config.py @@ -23,17 +23,17 @@ def configure(env): envvars.Add( PathVariable( "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, ) ) - 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_static", "Statically link Mono", default_mono_static)) + envvars.Add(BoolVariable("mono_glue", "Build with the Mono glue sources", True)) envvars.Add(BoolVariable("build_cil", "Build C# solutions", True)) envvars.Add( 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 ) ) |