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

Fix Windows to Windows SSH remote deploy. Fix Windows `execute` exit code. 

(cherry picked from commit 94355249c3)
This commit is contained in:
bruvzg 2023-02-27 09:54:49 +02:00 committed by Yuri Sizov
parent 7e6bc72f7c
commit 57dc060879
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/windows/export/export_plugin.cpp
View File

@ -879,7 +879,11 @@ Error EditorExportPlatformWindows::run(const Ref<EditorExportPreset> &p_preset,
print_line("Creating temporary directory..."); print_line("Creating temporary directory...");
ep.step(TTR("Creating temporary directory..."), 2); ep.step(TTR("Creating temporary directory..."), 2);
String temp_dir; String temp_dir;
#ifndef WINDOWS_ENABLED
err = ssh_run_on_remote(host, port, extra_args_ssh, "powershell -command \\\"\\$tmp = Join-Path \\$Env:Temp \\$(New-Guid); New-Item -Type Directory -Path \\$tmp | Out-Null; Write-Output \\$tmp\\\"", &temp_dir); err = ssh_run_on_remote(host, port, extra_args_ssh, "powershell -command \\\"\\$tmp = Join-Path \\$Env:Temp \\$(New-Guid); New-Item -Type Directory -Path \\$tmp | Out-Null; Write-Output \\$tmp\\\"", &temp_dir);
#else
err = ssh_run_on_remote(host, port, extra_args_ssh, "powershell -command \"$tmp = Join-Path $Env:Temp $(New-Guid); New-Item -Type Directory -Path $tmp ^| Out-Null; Write-Output $tmp\"", &temp_dir);
#endif
if (err != OK || temp_dir.is_empty()) { if (err != OK || temp_dir.is_empty()) {
CLEANUP_AND_RETURN(err); CLEANUP_AND_RETURN(err);
} }
@ -891,6 +895,10 @@ Error EditorExportPlatformWindows::run(const Ref<EditorExportPreset> &p_preset,
CLEANUP_AND_RETURN(err); CLEANUP_AND_RETURN(err);
} }
if (cmd_args.is_empty()) {
cmd_args = " ";
}
{ {
String run_script = p_preset->get("ssh_remote_deploy/run_script"); String run_script = p_preset->get("ssh_remote_deploy/run_script");
run_script = run_script.replace("{temp_dir}", temp_dir); run_script = run_script.replace("{temp_dir}", temp_dir);

3
platform/windows/os_windows.cpp
View File

@ -673,9 +673,8 @@ Error OS_Windows::execute(const String &p_path, const List<String> &p_arguments,
} }
CloseHandle(pipe[0]); // Close pipe read handle. CloseHandle(pipe[0]); // Close pipe read handle.
} else {
WaitForSingleObject(pi.pi.hProcess, INFINITE);
} }
WaitForSingleObject(pi.pi.hProcess, INFINITE);
if (r_exitcode) { if (r_exitcode) {
DWORD ret2; DWORD ret2;