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

Download -gnu64.tar.gz on Windows, fix make lint

Browse Source
This commit is contained in:
Felix Schütt
2022-11-18 11:50:10 +01:00
parent a81344e29d
commit 195ec847ee
1 changed files with 58 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,10 +4,6 @@ use super::ObjectFormat;
use crate::store::CompilerOptions; use crate::store::CompilerOptions;
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use clap::Parser; use clap::Parser;
#[cfg(feature = "http")]
use serde::{Deserialize, Serialize};
#[cfg(feature = "http")]
use std::collections::BTreeMap;
use std::env; use std::env;
use std::fmt::Write as _; use std::fmt::Write as _;
use std::fs; use std::fs;
@@ -372,7 +368,7 @@ impl CreateExe {
)); ));
} }
let target = if let Some(target_triple) = target_triple.clone() { let target = if let Some(target_triple) = target_triple {
target_triple target_triple
} else { } else {
return Err(anyhow!( return Err(anyhow!(
@@ -1368,6 +1364,7 @@ mod http_fetch {
use anyhow::{anyhow, Context, Result}; use anyhow::{anyhow, Context, Result};
use http_req::{request::Request, response::StatusCode, uri::Uri}; use http_req::{request::Request, response::StatusCode, uri::Uri};
use std::convert::TryFrom; use std::convert::TryFrom;
use target_lexicon::OperatingSystem;
pub fn get_latest_release() -> Result<serde_json::Value> { pub fn get_latest_release() -> Result<serde_json::Value> {
let mut writer = Vec::new(); let mut writer = Vec::new();
@@ -1456,11 +1453,23 @@ mod http_fetch {
}); });
if let Ok(mut entries) = paths { if let Ok(mut entries) = paths {
entries.retain(|p| p.to_str().map(|p| check_arch(p)).unwrap_or(true));
entries.retain(|p| p.to_str().map(|p| check_vendor(p)).unwrap_or(true));
entries.retain(|p| p.to_str().map(|p| check_os(p)).unwrap_or(true));
entries.retain(|p| p.to_str().map(|p| check_env(p)).unwrap_or(true));
entries.retain(|p| p.to_str().map(|p| p.ends_with(".tar.gz")).unwrap_or(false)); entries.retain(|p| p.to_str().map(|p| p.ends_with(".tar.gz")).unwrap_or(false));
// create-exe on Windows is special: we use the windows-gnu64.tar.gz (GNU ABI)
// to link, not the windows-amd64.tar.gz (MSVC ABI)
if target_triple.operating_system == OperatingSystem::Windows {
entries.retain(|p| {
p.to_str()
.map(|p| p.contains("windows") && p.contains("gnu64"))
.unwrap_or(false)
});
} else {
entries.retain(|p| p.to_str().map(|p| check_arch(p)).unwrap_or(true));
entries.retain(|p| p.to_str().map(|p| check_vendor(p)).unwrap_or(true));
entries.retain(|p| p.to_str().map(|p| check_os(p)).unwrap_or(true));
entries.retain(|p| p.to_str().map(|p| check_env(p)).unwrap_or(true));
}
if !entries.is_empty() { if !entries.is_empty() {
cache_path.push(&entries[0]); cache_path.push(&entries[0]);
if cache_path.exists() { if cache_path.exists() {
@@ -1483,36 +1492,48 @@ mod http_fetch {
} }
}; };
assets.retain(|a| { // create-exe on Windows is special: we use the windows-gnu64.tar.gz (GNU ABI)
if let Some(name) = a["name"].as_str() { // to link, not the windows-amd64.tar.gz (MSVC ABI)
check_arch(name) if target_triple.operating_system == OperatingSystem::Windows {
} else { assets.retain(|a| {
false if let Some(name) = a["name"].as_str() {
} name.contains("windows") && name.contains("gnu64")
}); } else {
assets.retain(|a| { false
if let Some(name) = a["name"].as_str() { }
check_vendor(name) });
} else { } else {
false assets.retain(|a| {
} if let Some(name) = a["name"].as_str() {
}); check_arch(name)
} else {
false
}
});
assets.retain(|a| {
if let Some(name) = a["name"].as_str() {
check_vendor(name)
} else {
false
}
});
assets.retain(|a| { assets.retain(|a| {
if let Some(name) = a["name"].as_str() { if let Some(name) = a["name"].as_str() {
check_os(name) check_os(name)
} else { } else {
false false
} }
}); });
assets.retain(|a| { assets.retain(|a| {
if let Some(name) = a["name"].as_str() { if let Some(name) = a["name"].as_str() {
check_env(name) check_env(name)
} else { } else {
false false
} }
}); });
}
if assets.len() != 1 { if assets.len() != 1 {
return Err(anyhow!( return Err(anyhow!(