itsscb/espup
1
0
Fork 0
mirror of https://github.com/esp-rs/espup.git synced 2025-09-27 12:50:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve param parsing

Browse Source
This commit is contained in:
Sergio Gasquez 2022-08-11 16:32:13 +00:00
parent be4875f01f
commit 79b9b4edbf
5 changed files with 1131 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

783
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

1
Cargo.toml
View File

@ -24,6 +24,7 @@ widestring = "1.0.2"
winapi = { version = "*", features = ["setupapi", "handleapi", "processthreadsapi", "winnt", "securitybaseapi", "impl-default", "shellapi", "winuser"] }
zip = "*"
xz2 = "0.1.6"
espflash = "1.6.0"
[target.'cfg(windows)'.dependencies]
winreg = "0.10.1"

24
src/config.rs
View File

@ -113,20 +113,20 @@ pub fn update_property(property_name: String, property_value: String) {
fs::write(get_json_path(), format!("{:#}", parsed_json)).unwrap();
}
pub fn add_idf_config(idf_path: String, version: String, python_path: String) {
let idf_id = get_idf_id(&idf_path);
let _data = json::object! {
version: version,
python: python_path,
path: idf_path
};
// pub fn add_idf_config(idf_path: String, version: String, python_path: String) {
// let idf_id = get_idf_id(&idf_path);
// let _data = json::object! {
// version: version,
// python: python_path,
// path: idf_path
// };
let mut parsed_json = load_json();
parsed_json["idfInstalled"].insert(&idf_id, _data).unwrap();
parsed_json["idfSelectedId"] = JsonValue::String(idf_id);
// let mut parsed_json = load_json();
// parsed_json["idfInstalled"].insert(&idf_id, _data).unwrap();
// parsed_json["idfSelectedId"] = JsonValue::String(idf_id);
fs::write(get_json_path(), format!("{:#}", parsed_json)).unwrap();
}
// fs::write(get_json_path(), format!("{:#}", parsed_json)).unwrap();
// }
// pub fn get_cmd<'a>() -> Command<'a, str> {
// Command::new("get")

376
src/idf.rs
View File

@ -1,25 +1,27 @@
use clap::Arg;
use clap_nested::{Command, Commander, MultiCommand};
use git2::{Repository};
use git2::Repository;
use std::path::Path;
use tokio::{runtime::Handle};
use tokio::runtime::Handle;
type Result<T> = std::result::Result<T, Box<dyn std::error::Error + Send + Sync>>;
use std::env;
use std::process::Stdio;
use std::io::Read;
use std::process::Stdio;
use std::time::{Instant};
use std::time::Instant;
use crate::config::{add_idf_config, get_git_path, get_tool_path, get_dist_path, get_python_env_path, update_property};
use crate::config::get_tools_path;
use crate::config::get_selected_idf_path;
use crate::config::get_tools_path;
use crate::config::{
get_dist_path, get_git_path, get_python_env_path, get_tool_path, update_property,
};
use crate::package::prepare_package;
use crate::shell::run_command;
use dirs::home_dir;
async fn excecute_async(command: String, arguments:Vec<String>){
async fn excecute_async(command: String, arguments: Vec<String>) {
let _child_process = tokio::process::Command::new(command)
.args(arguments)
.status()
@ -27,12 +29,14 @@ async fn excecute_async(command: String, arguments:Vec<String>){
}
fn execute_command(command: String, arguments: Vec<String>) -> Result<()> {
let argument_string = arguments.clone().into_iter().map(|i| format!("{} ", i.to_string())).collect::<String>();
let argument_string = arguments
.clone()
.into_iter()
.map(|i| format!("{} ", i.to_string()))
.collect::<String>();
println!("Executing: {} {}", command, argument_string);
let handle = Handle::current().clone();
let th = std::thread::spawn(move || {
handle.block_on(excecute_async(command, arguments))
});
let th = std::thread::spawn(move || handle.block_on(excecute_async(command, arguments)));
th.join().unwrap();
Ok(())
}
@ -69,7 +73,12 @@ fn reset_repository(repository_path: String) -> Result<()> {
Ok(())
}
fn update_submodule(idf_path: String, submodule: String, depth: String, progress: bool) -> Result<()> {
fn update_submodule(
idf_path: String,
submodule: String,
depth: String,
progress: bool,
) -> Result<()> {
let mut arguments_submodule: Vec<String> = [].to_vec();
arguments_submodule.push("-C".to_string());
arguments_submodule.push(idf_path);
@ -114,34 +123,47 @@ fn get_idf_base_directory() -> String {
}
#[cfg(windows)]
fn get_esp_idf_directory(idf_name:String) -> String {
fn get_esp_idf_directory(idf_name: String) -> String {
format!("{}/{}", get_idf_base_directory(), idf_name).replace("/", "\\")
}
#[cfg(unix)]
fn get_esp_idf_directory(idf_name:String) -> String {
fn get_esp_idf_directory(idf_name: String) -> String {
format!("{}/{}", get_idf_base_directory(), idf_name)
}
fn get_install_runner(_args: &str, _matches: &clap::ArgMatches) -> std::result::Result<(), clap::Error> {
fn get_install_runner(
_args: &str,
_matches: &clap::ArgMatches,
) -> std::result::Result<(), clap::Error> {
let esp_idf = get_esp_idf_directory("esp-idf-master/".to_string());
println!("ESP-IDF Path: {}", esp_idf);
#[cfg(windows)]
match prepare_package("https://dl.espressif.com/dl/idf-git/idf-git-2.30.1-win64.zip".to_string(),
match prepare_package(
"https://dl.espressif.com/dl/idf-git/idf-git-2.30.1-win64.zip".to_string(),
get_dist_path("idf-git-2.30.1-win64.zip").as_str(),
get_tool_path("idf-git/2.30.1".to_string())
get_tool_path("idf-git/2.30.1".to_string()),
) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
Ok(_) => {
println!("Ok");
}
Err(_e) => {
println!("Failed");
}
}
#[cfg(windows)]
match prepare_package("https://dl.espressif.com/dl/idf-python/idf-python-3.8.7-embed-win64.zip".to_string(),
match prepare_package(
"https://dl.espressif.com/dl/idf-python/idf-python-3.8.7-embed-win64.zip".to_string(),
get_dist_path("idf-python-3.8.7-embed-win64.zip").as_str(),
get_tool_path("idf-python/3.8.7".to_string())
get_tool_path("idf-python/3.8.7".to_string()),
) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
Ok(_) => {
println!("Ok");
}
Err(_e) => {
println!("Failed");
}
}
#[cfg(windows)]
@ -171,8 +193,12 @@ fn get_install_runner(_args: &str, _matches: &clap::ArgMatches) -> std::result::
arguments.push(esp_idf.clone());
println!("Cloning: {} {:?}", git_path, arguments);
match run_command(git_path, arguments, "".to_string()) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
Ok(_) => {
println!("Ok");
}
Err(_e) => {
println!("Failed");
}
}
}
@ -183,8 +209,12 @@ fn get_install_runner(_args: &str, _matches: &clap::ArgMatches) -> std::result::
arguments.push("virtualenv".to_string());
arguments.push(virtual_env_path.clone());
match run_command(python_path, arguments, "".to_string()) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
Ok(_) => {
println!("Ok");
}
Err(_e) => {
println!("Failed");
}
}
}
#[cfg(windows)]
@ -198,41 +228,59 @@ fn get_install_runner(_args: &str, _matches: &clap::ArgMatches) -> std::result::
arguments.push(idf_tools.clone());
arguments.push("install".to_string());
match run_command(python_path.clone(), arguments, "".to_string()) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
Ok(_) => {
println!("Ok");
}
Err(_e) => {
println!("Failed");
}
}
let mut arguments: Vec<String> = [].to_vec();
arguments.push(idf_tools);
arguments.push("install-python-env".to_string());
match run_command(python_path.clone(), arguments, "".to_string()) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
Ok(_) => {
println!("Ok");
}
Err(_e) => {
println!("Failed");
}
}
add_idf_config(esp_idf, "4.4".to_string(), python_path);
// add_idf_config(esp_idf, "4.4".to_string(), python_path);
Ok(())
}
pub fn install_espidf() -> Result<()> {
let esp_idf = get_esp_idf_directory("esp-idf/".to_string());
println!("ESP-IDF Path: {}", esp_idf);
pub fn install_espidf(targets: String, version: String) -> Result<()> {
let espidf_path = get_esp_idf_directory("frameworks/esp-idf".to_string());
println!("ESP-IDF Path: {}", espidf_path);
#[cfg(windows)]
match prepare_package("https://dl.espressif.com/dl/idf-git/idf-git-2.30.1-win64.zip".to_string(),
match prepare_package(
"https://dl.espressif.com/dl/idf-git/idf-git-2.30.1-win64.zip".to_string(),
get_dist_path("idf-git-2.30.1-win64.zip").as_str(),
get_tool_path("idf-git/2.30.1".to_string())
get_tool_path("idf-git/2.30.1".to_string()),
) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
Ok(_) => {
println!("Ok");
}
Err(_e) => {
println!("Failed");
}
}
#[cfg(windows)]
match prepare_package("https://dl.espressif.com/dl/idf-python/idf-python-3.8.7-embed-win64.zip".to_string(),
match prepare_package(
"https://dl.espressif.com/dl/idf-python/idf-python-3.8.7-embed-win64.zip".to_string(),
get_dist_path("idf-python-3.8.7-embed-win64.zip").as_str(),
get_tool_path("idf-python/3.8.7".to_string())
get_tool_path("idf-python/3.8.7".to_string()),
) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
Ok(_) => {
println!("Ok");
}
Err(_e) => {
println!("Failed");
}
}
#[cfg(windows)]
@ -245,63 +293,76 @@ pub fn install_espidf() -> Result<()> {
#[cfg(windows)]
let python_path = get_tool_path("idf-python/3.8.7/python.exe".to_string());
#[cfg(unix)]
let python_path = "/usr/bin/python".to_string();
let python_path = "/usr/bin/python3".to_string();
let virtual_env_path = get_python_env_path("4.4".to_string(), "3.8".to_string());
if !Path::new(&esp_idf).exists() {
// TODO: Use any git crate?
if !Path::new(&espidf_path).exists() {
// let clone_command = format!("git clone --shallow-since=2020-01-01 --jobs 8 --recursive git@github.com:espressif/esp-idf.git ");
let mut arguments: Vec<String> = [].to_vec();
arguments.push("clone".to_string());
arguments.push("--shallow-since=2020-01-01".to_string());
arguments.push("--jobs".to_string());
arguments.push("8".to_string());
arguments.push("--branch".to_string());
arguments.push(version);
arguments.push("--depth".to_string());
arguments.push("1".to_string());
arguments.push("--shallow-submodules".to_string());
arguments.push("--recursive".to_string());
arguments.push("https://github.com/espressif/esp-idf.git".to_string());
// arguments.push("git@github.com:espressif/esp-idf.git".to_string());
arguments.push(esp_idf.clone());
arguments.push(espidf_path.clone());
println!("Cloning: {} {:?}", git_path, arguments);
match run_command(git_path, arguments, "".to_string()) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
Ok(_) => {
println!("Cloned esp-idf suscessfuly");
}
Err(_e) => {
println!("Cloned esp-idf failed");
}
}
}
if !Path::new(&virtual_env_path).exists() {
println!("Creating virtual environment: {}", virtual_env_path);
let mut arguments: Vec<String> = [].to_vec();
arguments.push("-m".to_string());
arguments.push("virtualenv".to_string());
arguments.push(virtual_env_path.clone());
match run_command(python_path, arguments, "".to_string()) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
}
}
#[cfg(windows)]
let python_path = format!("{}/Scripts/python.exe", virtual_env_path);
#[cfg(unix)]
let python_path = format!("{}/bin/python", virtual_env_path);
let idf_tools = format!("{}/tools/idf_tools.py", esp_idf);
println!("Installing esp-idf for {} with {}/install.sh", targets, espidf_path);
let install_script_path = format!("{}/install.sh", espidf_path);
let mut arguments: Vec<String> = [].to_vec();
arguments.push(idf_tools.clone());
arguments.push(targets);
match run_command(install_script_path, arguments, "".to_string()) {
Ok(_) => {
println!("ESP-IDF installation succeeded");
}
Err(_e) => {
println!("ESP-IDF installation failed");
}
}
// match std::process::Command::new(install_script_path)
// .arg("esp32 esp32s2")
// .stdout(Stdio::piped())
// .output()
// {
// Ok(child_output) => {
// let result = String::from_utf8_lossy(&child_output.stdout);
// println!("ESP-IDF installation succeeded: {}", result);
// }
// Err(e) => {
// println!("ESP-IDF installation failed: {}", e);
// }
// }
println!("Installing CMake");
let mut arguments: Vec<String> = [].to_vec();
let mut idf_tools_scritp_path = format!("{}/tools/idf_tools.py", espidf_path);
arguments.push(idf_tools_scritp_path);
arguments.push("install".to_string());
match run_command(python_path.clone(), arguments, "".to_string()) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
arguments.push("cmake".to_string());
match run_command(python_path, arguments, "".to_string()) {
Ok(_) => {
println!("CMake installation succeeded");
}
Err(_e) => {
println!("CMake installation failed");
}
}
let mut arguments: Vec<String> = [].to_vec();
arguments.push(idf_tools);
arguments.push("install-python-env".to_string());
match run_command(python_path.clone(), arguments, "".to_string()) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
}
add_idf_config(esp_idf, "4.4".to_string(), python_path);
Ok(())
}
@ -365,7 +426,9 @@ fn get_initializer() -> String {
fn get_initializer_arguments() -> Vec<String> {
let mut arguments: Vec<String> = [].to_vec();
arguments.push("-c".to_string());
arguments.push(". ./export.sh;cd examples/get-started/blink;idf.py fullclean; idf.py build".to_string());
arguments.push(
". ./export.sh;cd examples/get-started/blink;idf.py fullclean; idf.py build".to_string(),
);
arguments
}
@ -390,18 +453,21 @@ fn get_initializer_arguments() -> Vec<String> {
arguments
}
fn get_shell_runner(_args: &str, _matches: &clap::ArgMatches) -> std::result::Result<(), clap::Error> {
fn get_shell_runner(
_args: &str,
_matches: &clap::ArgMatches,
) -> std::result::Result<(), clap::Error> {
println!("Starting process");
// let root = Path::new("C:\\esp");
// assert!(env::set_current_dir(&root).is_ok());
// println!("Successfully changed working directory to {}!", root.display());
let process = std::process::Command::new(get_shell())
.args(get_initializer_arguments())
.stdin(Stdio::inherit())
.stdout(Stdio::inherit())
.spawn().unwrap();
.spawn()
.unwrap();
let mut s = String::new();
match process.stdout.unwrap().read_to_string(&mut s) {
@ -428,7 +494,10 @@ fn get_shell_runner(_args: &str, _matches: &clap::ArgMatches) -> std::result::Re
// }
#[cfg(unix)]
fn run_build(idf_path: &String, shell_initializer: &String) -> std::result::Result<(), clap::Error> {
fn run_build(
idf_path: &String,
shell_initializer: &String,
) -> std::result::Result<(), clap::Error> {
// println!("Starting process");
let root = Path::new(&idf_path);
assert!(env::set_current_dir(&root).is_ok());
@ -441,13 +510,20 @@ fn run_build(idf_path: &String, shell_initializer: &String) -> std::result::Resu
fn run_idf_command(command: String) {
match run_command(get_shell(), get_initializer_arguments(), command) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
Ok(_) => {
println!("Ok");
}
Err(_e) => {
println!("Failed");
}
}
}
#[cfg(windows)]
fn run_build(idf_path: &String, _shell_initializer: &String) -> std::result::Result<(), clap::Error> {
fn run_build(
idf_path: &String,
_shell_initializer: &String,
) -> std::result::Result<(), clap::Error> {
// println!("Starting process");
let root = Path::new(&idf_path);
assert!(env::set_current_dir(&root).is_ok());
@ -457,10 +533,20 @@ fn run_build(idf_path: &String, _shell_initializer: &String) -> std::result::Res
Ok(())
}
fn get_build_runner(_args: &str, matches: &clap::ArgMatches) -> std::result::Result<(), clap::Error> {
let build_repetitions:i32 = matches.value_of("repeat").unwrap().to_string().parse().unwrap();
let idf_path = matches.value_of("idf-path")
.unwrap_or(&*get_selected_idf_path()).to_string();
fn get_build_runner(
_args: &str,
matches: &clap::ArgMatches,
) -> std::result::Result<(), clap::Error> {
let build_repetitions: i32 = matches
.value_of("repeat")
.unwrap()
.to_string()
.parse()
.unwrap();
let idf_path = matches
.value_of("idf-path")
.unwrap_or(&*get_selected_idf_path())
.to_string();
let initializer = get_initializer();
println!("Number of CPU cores: {}", num_cpus::get());
@ -469,8 +555,12 @@ fn get_build_runner(_args: &str, matches: &clap::ArgMatches) -> std::result::Res
for _build_number in 0..build_repetitions {
let start = Instant::now();
match run_build(&idf_path, &initializer) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
Ok(_) => {
println!("Ok");
}
Err(_e) => {
println!("Failed");
}
}
let duration = start.elapsed();
println!("Time elapsed in build: {:?}", duration);
@ -484,9 +574,7 @@ fn change_submodules_mirror(mut repo: Repository, submodule_url: String) {
let repo_name = submodule.name().unwrap().to_string();
let original_url = submodule.url().unwrap();
if !( original_url.starts_with("../../") ||
original_url.starts_with("https://github.com")
) {
if !(original_url.starts_with("../../") || original_url.starts_with("https://github.com")) {
println!("Submodule: {}, URL: {} - skip", repo_name, original_url);
continue;
}
@ -503,26 +591,31 @@ fn change_submodules_mirror(mut repo: Repository, submodule_url: String) {
let new_url = format!("{}{}", submodule_url, old_repo);
change_set.push((repo_name, new_url));
}
for submodule in change_set {
println!("Submodule: {}, new URL: {}", submodule.0, submodule.1);
match repo.submodule_set_url(&*submodule.0, &*submodule.1) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
Ok(_) => {
println!("Ok");
}
Err(_e) => {
println!("Failed");
}
}
}
}
fn get_mirror_switch_runner(_args: &str, matches: &clap::ArgMatches) -> std::result::Result<(), clap::Error> {
let idf_path = matches.value_of("idf-path")
.unwrap_or(&*get_selected_idf_path()).to_string();
let url = matches.value_of("url")
.unwrap().to_string();
let submodule_url = matches.value_of("submodule-url")
.unwrap().to_string();
fn get_mirror_switch_runner(
_args: &str,
matches: &clap::ArgMatches,
) -> std::result::Result<(), clap::Error> {
let idf_path = matches
.value_of("idf-path")
.unwrap_or(&*get_selected_idf_path())
.to_string();
let url = matches.value_of("url").unwrap().to_string();
let submodule_url = matches.value_of("submodule-url").unwrap().to_string();
println!("Processing main repository...");
match Repository::open(idf_path.clone()) {
@ -530,18 +623,21 @@ fn get_mirror_switch_runner(_args: &str, matches: &clap::ArgMatches) -> std::res
//repo.find_remote("origin")?.url()
if matches.is_present("url") {
match repo.remote_set_url("origin", url.as_str()) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
Ok(_) => {
println!("Ok");
}
Err(_e) => {
println!("Failed");
}
}
}
change_submodules_mirror(repo, submodule_url.clone());
},
}
Err(e) => {
println!("failed to open: {}", e.to_string());
std::process::exit(1);
},
}
};
println!("Processing submodules...");
@ -550,47 +646,66 @@ fn get_mirror_switch_runner(_args: &str, matches: &clap::ArgMatches) -> std::res
//repo.find_remote("origin")?.url()
if matches.is_present("url") {
match repo.remote_set_url("origin", url.as_str()) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
Ok(_) => {
println!("Ok");
}
Err(_e) => {
println!("Failed");
}
}
}
for mut submodule_repo_reference in repo.submodules().unwrap() {
match submodule_repo_reference.init(false) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
Ok(_) => {
println!("Ok");
}
Err(_e) => {
println!("Failed");
}
}
let progress = matches.is_present("progress");
if matches.is_present("depth") {
// git2 crate does not support depth for submodules, we need to call git instead
let depth = matches.value_of("depth")
.unwrap().to_string();
match update_submodule(idf_path.clone(), submodule_repo_reference.name().unwrap().to_string(), depth, progress) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
let depth = matches.value_of("depth").unwrap().to_string();
match update_submodule(
idf_path.clone(),
submodule_repo_reference.name().unwrap().to_string(),
depth,
progress,
) {
Ok(_) => {
println!("Ok");
}
Err(_e) => {
println!("Failed");
}
}
} else {
match submodule_repo_reference.update(true, None) {
Ok(_) => { println!("Ok"); },
Err(_e) => { println!("Failed");}
Ok(_) => {
println!("Ok");
}
Err(_e) => {
println!("Failed");
}
}
}
match submodule_repo_reference.open() {
Ok(sub_repo) => {
println!("Processing submodule: {:?}", sub_repo.workdir().unwrap());
change_submodules_mirror(sub_repo, submodule_url.clone());
},
}
Err(_e) => {
println!("Unable to update submodule");
}
}
}
},
}
Err(e) => {
println!("failed to open: {}", e.to_string());
std::process::exit(1);
},
}
};
Ok(())
@ -674,7 +789,6 @@ fn get_mirror_switch_runner(_args: &str, matches: &clap::ArgMatches) -> std::res
// )
// }
// pub fn get_multi_cmd<'a>() -> MultiCommand<'a, str, str> {
// let multi_cmd: MultiCommand<str, str> = Commander::new()
// .add_cmd(get_build_cmd())

115
src/main.rs
View File

@ -2,15 +2,18 @@ extern crate clap;
extern crate json;
use clap::Parser;
use clap_nested::Commander;
// use std::error::Error;
use std::path::{Path, PathBuf};
type Result<T> = std::result::Result<T, Box<dyn std::error::Error + Send + Sync>>;
use crate::config::get_tool_path;
use crate::idf::install_espidf;
use crate::package::{prepare_package_strip_prefix, prepare_single_binary};
use crate::shell::{run_command, update_env_path};
use std::process::Stdio;
use espflash::Chip;
use std::env;
use std::io::{Error, ErrorKind};
use std::process::Stdio;
use std::str::FromStr;
mod config;
mod idf;
mod package;
@ -24,6 +27,7 @@ mod shell;
// - Do a Tauri App so we can install it with gui
// - Add tests
// - Clean unused code
// - Add progress bar
#[derive(Parser)]
struct Opts {
@ -47,7 +51,7 @@ pub enum SubCommand {
pub struct InstallOpts {
/// Comma or space separated list of targets [esp32,esp32s2,esp32s3,esp32c3,all].
// Make it vector and have splliter =" "
#[clap(short = 'b', long, default_value = "esp32, esp32s2, esp32s3")]
#[clap(short = 'b', long, default_value = "esp32, es32s2, esp32s3")]
pub build_target: String,
/// Path to .cargo.
// TODO: Use home_dir to make it diferent in every OS: #[clap(short = 'c', long, default_value_t: &'a Path = Path::new(format!("{}/.cargo",home_dir())))]
@ -63,7 +67,7 @@ pub struct InstallOpts {
/// Destination of the export file generated.
#[clap(short = 'f', long)]
pub export_file: Option<PathBuf>,
/// LLVM version.
/// LLVM version. [13, 14, 15]
// TODO: Use Enum with 13, 14 and, when released, 15
#[clap(short = 'l', long, default_value = "esp-14.0.0-20220415")]
pub llvm_version: String,
@ -139,6 +143,9 @@ fn install(args: InstallOpts) -> Result<()> {
println!("{:?}", args);
println!("{}", arch);
let targets: Vec<Chip> = parse_targets(args.build_target).unwrap();
println!("{:?}", targets);
return Ok(());
// TODO: Move to a function
match std::process::Command::new("rustup")
@ -255,32 +262,38 @@ fn install(args: InstallOpts) -> Result<()> {
// install_llvm_clang
if Path::new(idf_tool_xtensa_elf_clang.as_str()).exists() {
println!("Previous installation of LLVM exist in: {}", idf_tool_xtensa_elf_clang);
println!(
"Previous installation of LLVM exist in: {}",
idf_tool_xtensa_elf_clang
);
println!("Please, remove the directory before new installation.");
} else {
println!("Downloading xtensa-esp32-elf-clang");
match prepare_package_strip_prefix(
&llvm_url,
get_tool_path(format!("xtensa-esp32-elf-clang-{}-{}",&llvm_release,llvm_arch).to_string()),
"",
) {
Ok(_) => {
println!("Package xtensa-esp32-elf-clang ready");
}
Err(_e) => {
println!("Unable to prepare xtensa-esp32-elf-clang");
}
&llvm_url,
get_tool_path(
format!("xtensa-esp32-elf-clang-{}-{}", &llvm_release, llvm_arch).to_string(),
),
"",
) {
Ok(_) => {
println!("Package xtensa-esp32-elf-clang ready");
}
Err(_e) => {
println!("Unable to prepare xtensa-esp32-elf-clang");
}
}
}
// TODO: Insall riscv target in nigthly if installing esp32c3
// if args.espidf_version.is_some() {
// idf::install_espidf();
if args.espidf_version.is_some() {
idf::install_espidf(args.build_target, args.espidf_version.unwrap())?;
// TODO: Install esp-idf
// } else {
// TODO: Install gcc for targets
// }
} else {
install_gcc(args.build_target)?;
// TODO: Install gcc for targets
}
// TODO: Install extra crates
match args.extra_crates {
@ -305,11 +318,12 @@ fn install(args: InstallOpts) -> Result<()> {
// TODO: Set environment
println!("Updating environment variables:");
let libclang_path = format!("{}/lib", get_tool_path("xtensa-esp32-elf-clang".to_string()));
let libclang_path = format!(
"{}/lib",
get_tool_path("xtensa-esp32-elf-clang".to_string())
);
println!("export LIBCLANG_PATH=\"{}\"", &libclang_path);
// #[cfg(windows)]
// println!("PATH+=\";{}\"", libclang_bin);
// #[cfg(unix)]
@ -317,7 +331,6 @@ fn install(args: InstallOpts) -> Result<()> {
// update_env_path(&libclang_bin);
return Ok(());
}
@ -438,3 +451,57 @@ fn get_gcc_arch(arch: &str) -> &str {
_ => arch,
}
}
fn install_gcc(targets: String) -> Result<()> {
Ok(())
}
// TODO: Create test for this function
fn parse_targets(build_target: String) -> Result<Vec<Chip>> {
let mut targets: Vec<&str>;
let mut chips: Vec<Chip> = Vec::new();
if build_target.contains("all") {
chips.push(Chip::Esp32);
chips.push(Chip::Esp32s2);
chips.push(Chip::Esp32s3);
chips.push(Chip::Esp32c3);
return Ok(chips);
}
if build_target.contains(' ') || build_target.contains(',') {
targets = build_target.split([',', ' ']).collect();
} else {
targets = vec![&build_target];
}
for target in targets {
match target {
"esp32" => chips.push(Chip::Esp32),
"esp32s2" => chips.push(Chip::Esp32s2),
"esp32s3" => chips.push(Chip::Esp32s3),
"esp32c3" => chips.push(Chip::Esp32c3),
_ => {
return Err(Box::new(Error::new(
ErrorKind::Other,
format!("Unknown target: {}", target),
)));
}
};
}
Ok((chips))
}
fn parse_llvm_version(llvm_version: &str) -> Result<String> {
let parsed_version = match llvm_version {
"13" => "esp-13.0.0-20211203",
"14" => "esp-14.0.0-20220415",
"15" => "", // TODO: Fill when released
_ => {
return Err(Box::new(Error::new(
ErrorKind::Other,
format!("Unknown LLVM Version: {}", llvm_version),
)));
}
};
Ok((parsed_version.to_string()))
}