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

Add failing unit test, create entrypoint.json and prepare linking

Browse Source
This commit is contained in:
Felix Schütt
2022-12-16 14:36:32 +01:00
parent bb2acdb37b
commit 9d9ebd4e04
4 changed files with 72 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/cli/src/commands/create_exe.rs
View File

@@ -174,9 +174,9 @@ impl CreateExe {
#[cfg(feature = "webc_runner")]
{
let working_dir = tempdir::TempDir::new("testpirita")?;
let working_dir = working_dir.path().to_path_buf();
// let working_dir = tempdir::TempDir::new("testpirita")?;
// let working_dir = working_dir.path().to_path_buf();
let working_dir = Path::new("./tmptestpirita").to_path_buf();
if let Ok(pirita) = WebCMmap::parse(wasm_module_path.clone(), &ParseOptions::default())
{
return self.create_exe_pirita(
@@ -712,6 +712,15 @@ impl CreateExe {
.and_then(|s| file.get_atom_name_for_command("wasi", s).ok());
if let Some(atom_to_run) = atom_to_run.as_ref() {
std::fs::write(output_path.join("entrypoint"), atom_to_run)?;
} else if file.manifest.commands.len() > 1 {
let entrypoint_json = file.manifest.commands.iter().filter_map(|(name, _)| {
Some(serde_json::json!({
"command": name,
"atom": file.get_atom_name_for_command("wasi", name).ok()?,
"object_type": object_format,
}))
}).collect::<Vec<_>>();
std::fs::write(output_path.join("entrypoint.json"), serde_json::to_string_pretty(&entrypoint_json)?)?;
}
for (atom_name, atom_bytes) in file.get_all_atoms() {
@@ -722,13 +731,6 @@ impl CreateExe {
#[cfg(windows)]
let object_path = output_path.join("atoms").join(&format!("{atom_name}.obj"));
std::fs::create_dir_all(output_path.join("atoms").join(&atom_name))?;
let header_path = output_path
.join("atoms")
.join(&atom_name)
.join("static_defs.h");
match object_format {
ObjectFormat::Serialized => {
let module = Module::new(&store, &atom_bytes)
@@ -746,12 +748,20 @@ impl CreateExe {
}
#[cfg(feature = "static-artifact-create")]
ObjectFormat::Symbols => {
std::fs::create_dir_all(output_path.join("atoms").join(&atom_name))?;
let header_path = output_path
.join("atoms")
.join(&atom_name)
.join("static_defs.h");
let engine = store.engine();
let engine_inner = engine.inner();
let compiler = engine_inner.compiler()?;
let features = engine_inner.features();
let tunables = store.tunables();
let prefixer: Option<PrefixerFn> = None;
let atom_name = CreateExe::normalize_atom_name(&atom_name);
let prefixer: Option<PrefixerFn> = Some(Box::new(move |_| atom_name.clone()));
let (module_info, obj, metadata_length, symbol_registry) =
Artifact::generate_object(
compiler, atom_bytes, prefixer, target, tunables, features,