godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18770 from eska014/cmdline 

Command line fixes
This commit is contained in:
Rémi Verschelde 2018-05-11 14:20:50 +02:00 committed by GitHub
parent 5676ab368a c4c7270cc7
commit eaa6613f06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/editor_node.cpp
View File

@ -483,7 +483,7 @@ void EditorNode::_fs_changed() {
// come during the export // come during the export
export_defer.preset = ""; export_defer.preset = "";
Error err = OK; Error err = OK;
if (!preset->is_runnable() && (export_defer.path.ends_with(".pck") || export_defer.path.ends_with(".zip"))) { if (export_defer.path.ends_with(".pck") || export_defer.path.ends_with(".zip")) {
if (export_defer.path.ends_with(".zip")) { if (export_defer.path.ends_with(".zip")) {
err = platform->export_zip(preset, export_defer.debug, export_defer.path); err = platform->export_zip(preset, export_defer.debug, export_defer.path);
} else if (export_defer.path.ends_with(".pck")) { } else if (export_defer.path.ends_with(".pck")) {

9
main/main.cpp
View File

@ -262,8 +262,8 @@ void Main::print_help(const char *p_binary) {
OS::get_singleton()->print("Standalone tools:\n"); OS::get_singleton()->print("Standalone tools:\n");
OS::get_singleton()->print(" -s, --script <script> Run a script.\n"); OS::get_singleton()->print(" -s, --script <script> Run a script.\n");
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
OS::get_singleton()->print(" --export <target> Export the project using the given export target.\n"); OS::get_singleton()->print(" --export <target> Export the project using the given export target. Export only main pack if path ends with .pck or .zip'.\n");
OS::get_singleton()->print(" --export-debug Use together with --export, enables debug mode for the template.\n"); OS::get_singleton()->print(" --export-debug <target> Like --export, but use debug template.\n");
OS::get_singleton()->print(" --doctool <path> Dump the engine API reference to the given <path> in XML format, merging if existing files are found.\n"); OS::get_singleton()->print(" --doctool <path> Dump the engine API reference to the given <path> 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(" --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).\n"); OS::get_singleton()->print(" --build-solutions Build the scripting solutions (e.g. for C# projects).\n");
@ -337,7 +337,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
String video_driver = ""; String video_driver = "";
String audio_driver = ""; String audio_driver = "";
String game_path = "."; String game_path;
bool upwards = false; bool upwards = false;
String debug_mode; String debug_mode;
String debug_host; String debug_host;
@ -693,6 +693,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
I = N; I = N;
} }
if (game_path.empty()) {
game_path = ".";
}
if (globals->setup(game_path, main_pack, upwards) == OK) { if (globals->setup(game_path, main_pack, upwards) == OK) {
found_project = true; found_project = true;
} else { } else {

4
misc/dist/linux/godot.6 vendored
View File

@ -128,10 +128,10 @@ Print the frames per second to the stdout.
Run a script. Run a script.
.TP .TP
\fB\-\-export\fR <target> \fB\-\-export\fR <target>
Export the project using the given export target. Export the project using the given export target. Export only main pack if path ends with .pck or .zip.
.TP .TP
\fB\-\-export\-debug\fR \fB\-\-export\-debug\fR
Use together with \fB\-\-export\fR, enables debug mode for the template. Like \-\-export, but use debug template.
.TP .TP
\fB\-\-doctool\fR <path> \fB\-\-doctool\fR <path>
Dump the engine API reference to the given <path> in XML format, merging if existing files are found. Dump the engine API reference to the given <path> in XML format, merging if existing files are found.