itsscb/espup
1
0
Fork 0
mirror of https://github.com/esp-rs/espup.git synced 2025-09-30 14:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: ♻️ Update default path of export file

Browse Source
This commit is contained in:
Sergio Gasquez 2022-11-05 11:17:11 +00:00
parent 945ec4588f
commit ba34a8ce5b
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main.rs
View File

@ -1,6 +1,7 @@
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use clap::Parser; use clap::Parser;
use directories_next::ProjectDirs; use directories_next::ProjectDirs;
use dirs::home_dir;
use embuild::{ use embuild::{
cmd, cmd,
espidf::{parse_esp_idf_git_ref, EspIdfRemote}, espidf::{parse_esp_idf_git_ref, EspIdfRemote},
@ -77,8 +78,8 @@ pub struct InstallOpts {
#[arg(short = 'e', long, required = false)] #[arg(short = 'e', long, required = false)]
pub espidf_version: Option<String>, pub espidf_version: Option<String>,
/// Destination of the generated export file. /// Destination of the generated export file.
#[arg(short = 'f', long, default_value = DEFAULT_EXPORT_FILE)] #[arg(short = 'f', long)]
pub export_file: PathBuf, pub export_file: Option<PathBuf>,
/// Comma or space list of extra crates to install. /// Comma or space list of extra crates to install.
#[arg(short = 'c', long, default_value = "cargo-espflash")] #[arg(short = 'c', long, default_value = "cargo-espflash")]
pub extra_crates: String, pub extra_crates: String,
@ -131,12 +132,6 @@ fn install(args: InstallOpts) -> Result<()> {
let host_triple = get_host_triple(args.default_host)?; let host_triple = get_host_triple(args.default_host)?;
let mut extra_crates: HashSet<Crate> = args.extra_crates.split(',').map(Crate::new).collect(); let mut extra_crates: HashSet<Crate> = args.extra_crates.split(',').map(Crate::new).collect();
let mut exports: Vec<String> = Vec::new(); let mut exports: Vec<String> = Vec::new();
let export_file = if args.export_file.is_absolute() {
args.export_file
} else {
let current_dir = std::env::current_dir()?;
current_dir.join(args.export_file)
};
let xtensa_rust = if targets.contains(&Target::ESP32) let xtensa_rust = if targets.contains(&Target::ESP32)
|| targets.contains(&Target::ESP32S2) || targets.contains(&Target::ESP32S2)
|| targets.contains(&Target::ESP32S3) || targets.contains(&Target::ESP32S3)
@ -151,6 +146,17 @@ fn install(args: InstallOpts) -> Result<()> {
} else { } else {
None None
}; };
let export_file = if let Some(export_file) = args.export_file {
if export_file.is_absolute() {
export_file
} else {
let current_dir = std::env::current_dir()?;
current_dir.join(export_file)
}
} else {
let home_dir = home_dir().unwrap();
home_dir.join(DEFAULT_EXPORT_FILE)
};
let llvm = Llvm::new(args.llvm_version, args.profile_minimal, &host_triple); let llvm = Llvm::new(args.llvm_version, args.profile_minimal, &host_triple);
debug!( debug!(