diff --git a/crates/zed/build.rs b/crates/zed/build.rs index be420defa3aba17a739ffe18b24512078fce2b3a..f37996b644c2966a74998be9e6d40a3fc70557df 100644 --- a/crates/zed/build.rs +++ b/crates/zed/build.rs @@ -37,7 +37,7 @@ fn main() { { // This is currently the best way to make `cargo build ...`'s build script // to print something to stdout without extra verbosity. - println!("cargo:warning=Info: using '{git_sha}' hash for ZED_COMMIT_SHA env var"); + println!("cargo::warning=Info: using '{git_sha}' hash for ZED_COMMIT_SHA env var"); } } @@ -49,6 +49,25 @@ fn main() { println!("cargo:rustc-link-arg=/stack:{}", 8 * 1024 * 1024); } + if cfg!(target_arch = "x86_64") { + println!("cargo::rerun-if-changed=\\..\\..\\..\\conpty.dll"); + println!("cargo::rerun-if-changed=\\..\\..\\..\\OpenConsole.exe"); + let conpty_target = std::env::var("OUT_DIR").unwrap() + "\\..\\..\\..\\conpty.dll"; + match std::fs::copy("resources/windows/bin/x64/conpty.dll", &conpty_target) { + Ok(_) => println!("Copied conpty.dll to {conpty_target}"), + Err(e) => println!("cargo::warning=Failed to copy conpty.dll: {}", e), + } + let open_console_target = + std::env::var("OUT_DIR").unwrap() + "\\..\\..\\..\\OpenConsole.exe"; + match std::fs::copy( + "resources/windows/bin/x64/OpenConsole.exe", + &open_console_target, + ) { + Ok(_) => println!("Copied OpenConsole.exe to {open_console_target}"), + Err(e) => println!("cargo::warning=Failed to copy OpenConsole.exe: {}", e), + } + } + let release_channel = option_env!("RELEASE_CHANNEL").unwrap_or("dev"); let icon = match release_channel { "stable" => "resources/windows/app-icon.ico", diff --git a/crates/zed/resources/windows/bin/x64/OpenConsole.exe b/crates/zed/resources/windows/bin/x64/OpenConsole.exe new file mode 100644 index 0000000000000000000000000000000000000000..8bb6ab2188fd7a56adc941c3f8449265e762cf06 Binary files /dev/null and b/crates/zed/resources/windows/bin/x64/OpenConsole.exe differ diff --git a/crates/zed/resources/windows/bin/x64/conpty.dll b/crates/zed/resources/windows/bin/x64/conpty.dll new file mode 100644 index 0000000000000000000000000000000000000000..555d6bf655a7cb0427b630f1052bb873c837a152 Binary files /dev/null and b/crates/zed/resources/windows/bin/x64/conpty.dll differ