diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2017-10-07 01:27:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-07 01:27:06 +0200 |
| commit | 195b12212d96494c3c7260c44442fcdfe27060e5 (patch) | |
| tree | c42d346e91d56524761913b7ffed48a3b0089ea9 | |
| parent | 85cc8793821428ee36c9fc042c4736d6eef7dd8a (diff) | |
| parent | 14280ac44b2d1f687f2fde99d6998628dd1a31af (diff) | |
Merge pull request #11896 from neikeq/pr-issue-11892
Quote MSBuild arguments
| -rw-r--r-- | modules/mono/editor/GodotSharpTools/Build/BuildSystem.cs | 2 | ||||
| -rw-r--r-- | modules/mono/editor/godotsharp_builds.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/modules/mono/editor/GodotSharpTools/Build/BuildSystem.cs b/modules/mono/editor/GodotSharpTools/Build/BuildSystem.cs index 329b6d2008..5544233eb7 100644 --- a/modules/mono/editor/GodotSharpTools/Build/BuildSystem.cs +++ b/modules/mono/editor/GodotSharpTools/Build/BuildSystem.cs @@ -106,7 +106,7 @@ namespace GodotSharpTools.Build private string BuildArguments(string loggerAssemblyPath, string loggerOutputDir, string[] customProperties) { - string arguments = string.Format("{0} /v:normal /t:Build /p:{1} /l:{2},{3};{4}", + string arguments = string.Format(@"""{0}"" /v:normal /t:Build ""/p:{1}"" ""/l:{2},{3};{4}""", solution, "Configuration=" + config, typeof(GodotBuildLogger).FullName, diff --git a/modules/mono/editor/godotsharp_builds.cpp b/modules/mono/editor/godotsharp_builds.cpp index b7e3fb0a32..7b80e26645 100644 --- a/modules/mono/editor/godotsharp_builds.cpp +++ b/modules/mono/editor/godotsharp_builds.cpp @@ -461,6 +461,10 @@ void GodotSharpBuilds::BuildProcess::start(bool p_blocking) { if (p_blocking) { exited = true; exit_code = klass->get_field("exitCode")->get_int_value(mono_object); + + if (exit_code != 0 && OS::get_singleton()->is_stdout_verbose()) + OS::get_singleton()->print(String("MSBuild finished with exit code " + itos(exit_code) + "\n").utf8()); + build_tab->on_build_exit(exit_code == 0 ? MonoBuildTab::RESULT_SUCCESS : MonoBuildTab::RESULT_ERROR); } else { build_instance = MonoGCHandle::create_strong(mono_object); |