mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-16 17:18:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix windows build again

Browse Source
This commit is contained in:
Felix Schütt
2022-09-16 15:34:47 +02:00
parent dd1c7478ef
commit 582ce847e5
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/c-api/examples/wasmer-capi-examples-runner/src/lib.rs
View File

@@ -232,8 +232,11 @@ fn test_run() {
command.arg("/I"); command.arg("/I");
command.arg(&format!("{}/include", config.wasmer_dir)); command.arg(&format!("{}/include", config.wasmer_dir));
let mut log = String::new(); let mut log = String::new();
fixup_symlinks(&[format!("{}/include", config.wasmer_dir)], &mut log) fixup_symlinks(&[
.expect(&format!("failed to fix symlinks: {log}")); format!("{}/include", config.wasmer_dir),
format!("{}", config.root_dir),
], &mut log)
.expect(&format!("failed to fix symlinks: {log}"));
println!("{log}"); println!("{log}");
} }
command.arg("/link"); command.arg("/link");
@@ -359,7 +362,11 @@ fn fixup_symlinks(include_paths: &[String], log: &mut String) -> Result<(), Box<
for i in include_paths { for i in include_paths {
let i = i.replacen("-I", "", 1); let i = i.replacen("-I", "", 1);
let mut paths_headers = Vec::new(); let mut paths_headers = Vec::new();
for entry in std::fs::read_dir(&i)? { let readdir = match std::fs::read_dir(&i) {
Ok(o) => o,
Err(_) => continue,
};
for entry in readdir {
let entry = entry?; let entry = entry?;
let path = entry.path(); let path = entry.path();
let path_display = format!("{}", path.display()); let path_display = format!("{}", path.display());
@@ -378,7 +385,10 @@ fn fixup_symlinks_inner(include_paths: &[String], log: &mut String) -> Result<()
log.push_str(&format!("fixup symlinks: {include_paths:#?}")); log.push_str(&format!("fixup symlinks: {include_paths:#?}"));
let regex = regex::Regex::new(INCLUDE_REGEX).unwrap(); let regex = regex::Regex::new(INCLUDE_REGEX).unwrap();
for path in include_paths.iter() { for path in include_paths.iter() {
let file = std::fs::read_to_string(&path)?; let file = match std::fs::read_to_string(&path) {
Ok(o) => o,
_ => continue,
};
let lines_3 = file.lines().take(3).collect::<Vec<_>>(); let lines_3 = file.lines().take(3).collect::<Vec<_>>();
log.push_str(&format!("first 3 lines of {path:?}: {:#?}\n", lines_3)); log.push_str(&format!("first 3 lines of {path:?}: {:#?}\n", lines_3));

18
lib/c-api/tests/wasmer-c-api-test-runner/src/lib.rs
View File

@@ -246,8 +246,11 @@ fn test_ok() {
command.arg("/I"); command.arg("/I");
command.arg(&format!("{}/include", config.wasmer_dir)); command.arg(&format!("{}/include", config.wasmer_dir));
let mut log = String::new(); let mut log = String::new();
fixup_symlinks(&[format!("{}/include", config.wasmer_dir)], &mut log) fixup_symlinks(&[
.expect(&format!("failed to fix symlinks: {log}")); format!("{}/include", config.wasmer_dir),
format!("{}", config.root_dir),
], &mut log)
.expect(&format!("failed to fix symlinks: {log}"));
println!("{log}"); println!("{log}");
} }
command.arg("/link"); command.arg("/link");
@@ -389,7 +392,11 @@ fn fixup_symlinks(include_paths: &[String], log: &mut String) -> Result<(), Box<
for i in include_paths { for i in include_paths {
let i = i.replacen("-I", "", 1); let i = i.replacen("-I", "", 1);
let mut paths_headers = Vec::new(); let mut paths_headers = Vec::new();
for entry in std::fs::read_dir(&i)? { let readdir = match std::fs::read_dir(&i) {
Ok(o) => o,
Err(_) => continue,
};
for entry in readdir {
let entry = entry?; let entry = entry?;
let path = entry.path(); let path = entry.path();
let path_display = format!("{}", path.display()); let path_display = format!("{}", path.display());
@@ -408,7 +415,10 @@ fn fixup_symlinks_inner(include_paths: &[String], log: &mut String) -> Result<()
log.push_str(&format!("fixup symlinks: {include_paths:#?}")); log.push_str(&format!("fixup symlinks: {include_paths:#?}"));
let regex = regex::Regex::new(INCLUDE_REGEX).unwrap(); let regex = regex::Regex::new(INCLUDE_REGEX).unwrap();
for path in include_paths.iter() { for path in include_paths.iter() {
let file = std::fs::read_to_string(&path)?; let file = match std::fs::read_to_string(&path) {
Ok(o) => o,
_ => continue,
};
let lines_3 = file.lines().take(3).collect::<Vec<_>>(); let lines_3 = file.lines().take(3).collect::<Vec<_>>();
log.push_str(&format!("first 3 lines of {path:?}: {:#?}\n", lines_3)); log.push_str(&format!("first 3 lines of {path:?}: {:#?}\n", lines_3));