Skip to content

Warn during build if generating resources fails #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zadjii-msft merged 2 commits into from
Jul 1, 2024
Merged

Warn during build if generating resources fails #75

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbc4499
build: remove the redundant path prefixes
wangziling May 24, 2024
56277c6
build: add the warm notice when failed to execute the powershell scri…
wangziling May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions sudo/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,17 @@ fn build_rpc() {
let cl_path =
cc::windows_registry::find_tool(target.as_str(), "cl.exe").expect("Failed to find cl.exe");
// add cl.exe to our path
let mut path = std::env::var("PATH").unwrap();
let mut path = env::var("PATH").unwrap();
path.push(';');
path.push_str(cl_path.path().parent().unwrap().to_str().unwrap());
std::env::set_var("PATH", path);
env::set_var("PATH", path);

// Great! we've now finally got a path to midl.exe, and cl.exe is on the PATH

// Now we can actually run midl.exe, to compile the IDL file. This will
// generate a bunch of files in the OUT_DIR which we need to do RPC.

let mut cmd = std::process::Command::new(midl_path);
let mut cmd = Command::new(midl_path);
cmd.arg("../cpp/rpc/sudo_rpc.idl");
cmd.arg("/h").arg("sudo_rpc.h");
cmd.arg("/target").arg("NT100"); // LOAD BEARING: Enables system_handle
Expand Down Expand Up @@ -166,7 +166,7 @@ fn build_logging() {

let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());

let mut cmd = std::process::Command::new(mc_path);
let mut cmd = Command::new(mc_path);
cmd.arg("-h").arg(&out_dir);
cmd.arg("-r").arg(&out_dir);
cmd.arg("../cpp/logging/instrumentation.man");
Expand Down Expand Up @@ -219,7 +219,7 @@ fn main() -> io::Result<()> {
// powershell -c .pipelines\convert-resx-to-rc.ps1 .\ no_existy.h res.h no_existy.rc out.rc resource_ids.rs
// to generate the resources

Command::new("powershell")
let generate_resources_result = Command::new("powershell")
.arg("-NoProfile")
.arg("-c")
.arg("..\\.pipelines\\convert-resx-to-rc.ps1")
Expand All @@ -232,15 +232,27 @@ fn main() -> io::Result<()> {
.status()
.expect("Failed to generate resources");

if !generate_resources_result.success() {
println!(
"\nFailed to generate resources by executing powershell script: {}.",
generate_resources_result
);
println!(
"Maybe you haven't granted the access to execute the powershell script on this system."
);
println!("For more details, please execute the `cargo build` command with the `-vv` flag.");
std::process::exit(1);
}

// witchcraft to get windows.h from the SDK to be able to be found, for the resource compiler
let target = std::env::var("TARGET").unwrap();
let target = env::var("TARGET").unwrap();
if let Some(tool) = cc::windows_registry::find_tool(target.as_str(), "cl.exe") {
for (key, value) in tool.env() {
std::env::set_var(key, value);
env::set_var(key, value);
}
}

if std::env::var_os("CARGO_CFG_WINDOWS").is_some() {
if env::var_os("CARGO_CFG_WINDOWS").is_some() {
// TODO:MSFT
// Re-add the following:
// <windowsSettings>
Expand Down