Skip to content

Commit

Permalink
Merge pull request #41 from andfoy/fix_docs_compilation
Browse files Browse the repository at this point in the history 
Make sure that the docs can be compiled from a non-Windows host machine
  • Loading branch information
@andfoy
andfoy authored Jul 21, 2022
2 parents e24ed82 + a1e548a commit b95ae9a
Show file tree
Hide file tree
Showing 2 changed files with 114 additions and 77 deletions.
169 changes: 92 additions & 77 deletions build.rs
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,33 @@
#[cfg(windows)]
use windows::Win32::System::LibraryLoader::{GetProcAddress, GetModuleHandleW};
#[cfg(windows)]
use windows::core::{PWSTR, PSTR, PCWSTR, PCSTR};
use std::i64;
use std::process::Command;
use std::str;
use which::which;

#[cfg(windows)]
trait IntoPWSTR {
fn into_pwstr(self) -> PWSTR;
}

#[cfg(windows)]
trait IntoPSTR {
fn into_pstr(self) -> PSTR;
}

#[cfg(windows)]
trait IntoPCSTR {
fn into_pcstr(self) -> PCSTR;
}

#[cfg(windows)]
trait IntoPCWSTR {
fn into_pcwstr(self) -> PCWSTR;
}

#[cfg(windows)]
impl IntoPCWSTR for &str {
fn into_pcwstr(self) -> PCWSTR {
let encoded = self
Expand All @@ -32,6 +39,7 @@ impl IntoPCWSTR for &str {
}
}

#[cfg(windows)]
impl IntoPWSTR for &str {
fn into_pwstr(self) -> PWSTR {
let mut encoded = self
Expand All @@ -42,6 +50,7 @@ impl IntoPWSTR for &str {
PWSTR(encoded.as_mut_ptr()) }
}

#[cfg(windows)]
impl IntoPSTR for &str {
fn into_pstr(self) -> PSTR {
let mut encoded = self
Expand All @@ -54,6 +63,7 @@ impl IntoPSTR for &str {
PSTR(encoded.as_mut_ptr()) }
}

#[cfg(windows)]
impl IntoPCSTR for &str {
fn into_pcstr(self) -> PCSTR {
let encoded = self
Expand All @@ -66,6 +76,7 @@ impl IntoPCSTR for &str {
PCSTR(encoded.as_ptr()) }
}

#[cfg(windows)]
impl IntoPWSTR for String {
fn into_pwstr(self) -> PWSTR {
let mut encoded = self
Expand All @@ -77,10 +88,12 @@ impl IntoPWSTR for String {
}
}

#[cfg(windows)]
fn command_ok(cmd: &mut Command) -> bool {
cmd.status().ok().map_or(false, |s| s.success())
}

#[cfg(windows)]
fn command_output(cmd: &mut Command) -> String {
str::from_utf8(&cmd.output().unwrap().stdout)
.unwrap()
Expand All @@ -92,91 +105,93 @@ fn main() {
if std::env::var("DOCS_RS").is_ok() {
return;
}

// println!("cargo:rerun-if-changed=src/lib.rs");
// println!("cargo:rerun-if-changed=src/native.rs");
// println!("cargo:rerun-if-changed=src/csrc");
println!("cargo:rerun-if-changed=src/");

// let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
// let include_path = Path::new(&manifest_dir).join("include");
// CFG.exported_header_dirs.push(&include_path);
// CFG.exported_header_dirs.push(&Path::new(&manifest_dir));
// Check if ConPTY is enabled
let reg_entry = "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion";

let major_version = command_output(
Command::new("Reg")
.arg("Query")
.arg(&reg_entry)
.arg("/v")
.arg("CurrentMajorVersionNumber"),
);
let version_parts: Vec<&str> = major_version.split("REG_DWORD").collect();
let major_version =
i64::from_str_radix(version_parts[1].trim().trim_start_matches("0x"), 16).unwrap();

let build_version = command_output(
Command::new("Reg")
.arg("Query")
.arg(&reg_entry)
.arg("/v")
.arg("CurrentBuildNumber"),
);
let build_parts: Vec<&str> = build_version.split("REG_SZ").collect();
let build_version = build_parts[1].trim().parse::<i64>().unwrap();

println!("Windows major version: {:?}", major_version);
println!("Windows build number: {:?}", build_version);

let conpty_enabled;
let kernel32_res = unsafe { GetModuleHandleW("kernel32.dll".into_pcwstr()) };
let kernel32 = kernel32_res.unwrap();

let conpty = unsafe { GetProcAddress(kernel32, "CreatePseudoConsole".into_pcstr()) };
match conpty {
Some(_) => {
conpty_enabled = "1";
println!("cargo:rustc-cfg=feature=\"conpty\"")
}
None => {
conpty_enabled = "0";
#[cfg(windows)]
{
// println!("cargo:rerun-if-changed=src/lib.rs");
// println!("cargo:rerun-if-changed=src/native.rs");
// println!("cargo:rerun-if-changed=src/csrc");
println!("cargo:rerun-if-changed=src/");

// let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
// let include_path = Path::new(&manifest_dir).join("include");
// CFG.exported_header_dirs.push(&include_path);
// CFG.exported_header_dirs.push(&Path::new(&manifest_dir));
// Check if ConPTY is enabled
let reg_entry = "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion";

let major_version = command_output(
Command::new("Reg")
.arg("Query")
.arg(&reg_entry)
.arg("/v")
.arg("CurrentMajorVersionNumber"),
);
let version_parts: Vec<&str> = major_version.split("REG_DWORD").collect();
let major_version =
i64::from_str_radix(version_parts[1].trim().trim_start_matches("0x"), 16).unwrap();

let build_version = command_output(
Command::new("Reg")
.arg("Query")
.arg(&reg_entry)
.arg("/v")
.arg("CurrentBuildNumber"),
);
let build_parts: Vec<&str> = build_version.split("REG_SZ").collect();
let build_version = build_parts[1].trim().parse::<i64>().unwrap();

println!("Windows major version: {:?}", major_version);
println!("Windows build number: {:?}", build_version);

let conpty_enabled;
let kernel32_res = unsafe { GetModuleHandleW("kernel32.dll".into_pcwstr()) };
let kernel32 = kernel32_res.unwrap();

let conpty = unsafe { GetProcAddress(kernel32, "CreatePseudoConsole".into_pcstr()) };
match conpty {
Some(_) => {
conpty_enabled = "1";
println!("cargo:rustc-cfg=feature=\"conpty\"")
}
None => {
conpty_enabled = "0";
}
}
}

println!("ConPTY enabled: {}", conpty_enabled);
println!("ConPTY enabled: {}", conpty_enabled);

// Check if winpty is installed
let mut cmd = Command::new("winpty-agent");
let mut winpty_enabled = "0";
if command_ok(cmd.arg("--version")) {
// let winpty_path = cm
winpty_enabled = "1";
let winpty_version = command_output(cmd.arg("--version"));
println!("Using Winpty version: {}", &winpty_version);
// Check if winpty is installed
let mut cmd = Command::new("winpty-agent");
let mut winpty_enabled = "0";
if command_ok(cmd.arg("--version")) {
// let winpty_path = cm
winpty_enabled = "1";
let winpty_version = command_output(cmd.arg("--version"));
println!("Using Winpty version: {}", &winpty_version);

let winpty_location = which("winpty-agent").unwrap();
let winpty_path = winpty_location.parent().unwrap();
let winpty_root = winpty_path.parent().unwrap();
// let winpty_include = winpty_root.join("include");
let winpty_location = which("winpty-agent").unwrap();
let winpty_path = winpty_location.parent().unwrap();
let winpty_root = winpty_path.parent().unwrap();
// let winpty_include = winpty_root.join("include");

let winpty_lib = winpty_root.join("lib");
let winpty_lib = winpty_root.join("lib");

println!(
"cargo:rustc-link-search=native={}",
winpty_lib.to_str().unwrap()
);
println!(
"cargo:rustc-link-search=native={}",
winpty_path.to_str().unwrap()
);
println!(
"cargo:rustc-link-search=native={}",
winpty_lib.to_str().unwrap()
);
println!(
"cargo:rustc-link-search=native={}",
winpty_path.to_str().unwrap()
);

println!("cargo:rustc-cfg=feature=\"winpty\"")
println!("cargo:rustc-cfg=feature=\"winpty\"")

// CFG.exported_header_dirs.push(&winpty_include);
}
// CFG.exported_header_dirs.push(&winpty_include);
}

if winpty_enabled == "1" {
println!("cargo:rustc-link-lib=dylib=winpty");
if winpty_enabled == "1" {
println!("cargo:rustc-link-lib=dylib=winpty");
}
}
}
22 changes: 22 additions & 0 deletions src/pty/base.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,33 @@ use std::time::Duration;
use std::mem::MaybeUninit;
use std::cmp::min;
use std::ffi::{OsString, c_void};
#[cfg(windows)]
use std::os::windows::prelude::*;
#[cfg(windows)]
use std::os::windows::ffi::OsStrExt;
#[cfg(unix)]
use std::vec::IntoIter;

use super::PTYArgs;

#[cfg(unix)]
trait OsStrExt {
fn from_wide(x: &[u16]) -> OsString;
fn encode_wide(&self) -> IntoIter<u16>;

}

#[cfg(unix)]
impl OsStrExt for OsString {
fn from_wide(_: &[u16]) -> OsString {
return OsString::new();
}

fn encode_wide(&self) -> IntoIter<u16> {
return Vec::<u16>::new().into_iter();
}
}

/// This trait should be implemented by any backend that wants to provide a PTY implementation.
pub trait PTYImpl: Sync + Send {
/// Create a new instance of the PTY backend.
Expand Down

0 comments on commit b95ae9a

Please sign in to comment.