From 3049d142ded99b6f910759f6fc2d9e5d5491a091 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Wed, 16 Mar 2022 02:51:11 +0100
Subject: [PATCH] Removed the build-solutions argument.

---
 main/main.cpp                         | 30 ---------------------------
 misc/dist/shell/_godot.zsh-completion |  1 -
 misc/dist/shell/godot.bash-completion |  1 -
 3 files changed, 32 deletions(-)

diff --git a/main/main.cpp b/main/main.cpp
index 5fd6779dd..486564bfd 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -127,9 +127,6 @@ static bool show_help = false;
 static bool auto_quit = false;
 static OS::ProcessID allow_focus_steal_pid = 0;
 static bool delta_sync_after_draw = false;
-#ifdef TOOLS_ENABLED
-static bool auto_build_solutions = false;
-#endif
 
 // Display
 
@@ -333,7 +330,6 @@ void Main::print_help(const char *p_binary) {
 	OS::get_singleton()->print("  --export-pack <preset> <path>    Same as --export, but only export the game pack for the given preset. The <path> extension determines whether it will be in PCK or ZIP format.\n");
 	OS::get_singleton()->print("  --doctool [<path>]               Dump the engine API reference to the given <path> (defaults to current dir) in XML format, merging if existing files are found.\n");
 	OS::get_singleton()->print("  --no-docbase                     Disallow dumping the base types (used with --doctool).\n");
-	OS::get_singleton()->print("  --build-solutions                Build the scripting solutions (e.g. for C# projects). Implies --editor and requires a valid project to edit.\n");
 #ifdef DEBUG_METHODS_ENABLED
 	OS::get_singleton()->print("  --gdnative-generate-json-api     Generate JSON dump of the Godot API for GDNative bindings.\n");
 #endif
@@ -729,20 +725,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 		} else if (I->get() == "-p" || I->get() == "--project-manager") { // starts project manager
 
 			project_manager = true;
-		} else if (I->get() == "--build-solutions") { // Build the scripting solution such C#
-
-			auto_build_solutions = true;
-			editor = true;
-#ifdef DEBUG_METHODS_ENABLED
-		} else if (I->get() == "--gdnative-generate-json-api") {
-			// Register as an editor instance to use the GLES2 fallback automatically on hardware that doesn't support the GLES3 backend
-			editor = true;
-
-			// We still pass it to the main arguments since the argument handling itself is not done in this function
-			main_args.push_back(I->get());
-#endif
 		} else if (I->get() == "--export" || I->get() == "--export-debug" || I->get() == "--export-pack") { // Export project
-
 			editor = true;
 			main_args.push_back(I->get());
 #endif
@@ -2347,19 +2330,6 @@ bool Main::iteration() {
 
 	OS::get_singleton()->add_frame_delay(OS::get_singleton()->can_draw());
 
-#ifdef TOOLS_ENABLED
-	if (auto_build_solutions) {
-		auto_build_solutions = false;
-		// Only relevant when running the editor.
-		if (!editor) {
-			ERR_FAIL_V_MSG(true, "Command line option --build-solutions was passed, but no project is being edited. Aborting.");
-		}
-		if (!EditorNode::get_singleton()->call_build()) {
-			ERR_FAIL_V_MSG(true, "Command line option --build-solutions was passed, but the build callback failed. Aborting.");
-		}
-	}
-#endif
-
 	return exit || auto_quit;
 }
 
diff --git a/misc/dist/shell/_godot.zsh-completion b/misc/dist/shell/_godot.zsh-completion
index c694f77be..9e8dc0e8e 100644
--- a/misc/dist/shell/_godot.zsh-completion
+++ b/misc/dist/shell/_godot.zsh-completion
@@ -72,6 +72,5 @@ _arguments \
   '--export-pack[same as --export, but only export the game pack for the given preset]:export preset name' \
   '--doctool[dump the engine API reference to the given path in XML format, merging if existing files are found]:path to base Godot build directory:_dirs' \
   '--no-docbase[disallow dumping the base types (used with --doctool)]' \
-  '--build-solutions[build the scripting solutions (e.g. for C# projects)]' \
   '--gdnative-generate-json-api[generate JSON dump of the Godot API for GDNative bindings]' \
   '--test[run a unit test]:unit test name'
diff --git a/misc/dist/shell/godot.bash-completion b/misc/dist/shell/godot.bash-completion
index 0513711c6..abd0034c8 100644
--- a/misc/dist/shell/godot.bash-completion
+++ b/misc/dist/shell/godot.bash-completion
@@ -75,7 +75,6 @@ _complete_godot_options() {
 --export-pack
 --doctool
 --no-docbase
---build-solutions
 --gdnative-generate-json-api
 --test
 " -- "$1"))