Browse Source

Enable the `copy_mono_root` SCons option by default

This closes #41652.

(cherry picked from commit cfd564b385f261d790d52c58be9344adf7d74f0e)
Hugo Locurcio 4 years ago
parent
commit
7b3f9ebb94
2 changed files with 5 additions and 8 deletions
  1. 1 2
      modules/mono/build_scripts/mono_configure.py
  2. 4 6
      modules/mono/config.py

+ 1 - 2
modules/mono/build_scripts/mono_configure.py

@@ -392,9 +392,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):

+ 4 - 6
modules/mono/config.py

@@ -23,18 +23,16 @@ 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_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("build_cil", "Build C# solutions", True))
     envvars.Add(
     envvars.Add(
-        BoolVariable(
-            "copy_mono_root", "Make a copy of the mono installation directory to bundle with the editor", False
-        )
+        BoolVariable("copy_mono_root", "Make a copy of the Mono installation directory to bundle with the editor", True)
     )
     )
 
 
     # TODO: It would be great if this could be detected automatically instead
     # TODO: It would be great if this could be detected automatically instead