Compare commits
3 Commits
b9b35f3f0f
...
84a6196416
| Author | SHA1 | Date | |
|---|---|---|---|
| 84a6196416 | |||
| e7b8596205 | |||
| 40685b7c4d |
12
Cargo.lock
generated
12
Cargo.lock
generated
@@ -98,6 +98,15 @@ version = "1.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
|
||||
|
||||
[[package]]
|
||||
name = "colored"
|
||||
version = "3.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34"
|
||||
dependencies = [
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "equivalent"
|
||||
version = "1.0.2"
|
||||
@@ -146,9 +155,10 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
|
||||
|
||||
[[package]]
|
||||
name = "pallet"
|
||||
version = "0.1.0"
|
||||
version = "1.0.0"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"colored",
|
||||
"glob",
|
||||
"serde",
|
||||
"toml",
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
[package]
|
||||
name = "pallet"
|
||||
version = "0.1.0"
|
||||
version = "1.0.0"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
clap = { version = "4.6.0", features = ["derive"] }
|
||||
colored = "3.1.1"
|
||||
glob = "0.3.3"
|
||||
serde = { version = "1.0.228", features = ["derive"] }
|
||||
toml = "1.0.7"
|
||||
|
||||
157
src/app.rs
157
src/app.rs
@@ -1,11 +1,17 @@
|
||||
use std::{
|
||||
env::set_current_dir,
|
||||
path::{Path, PathBuf},
|
||||
process::Command,
|
||||
};
|
||||
|
||||
use colored::Colorize;
|
||||
use glob::glob;
|
||||
|
||||
const MAIN_C: &str = include_str!("templates/main.c");
|
||||
const GITIGNORE: &str = include_str!("templates/gitignoretemplate");
|
||||
|
||||
#[derive(clap::Parser)]
|
||||
#[clap(version)]
|
||||
pub struct App {
|
||||
#[clap(subcommand)]
|
||||
command: Subcommand,
|
||||
@@ -24,38 +30,79 @@ enum Subcommand {
|
||||
Run {
|
||||
/// The build mode to use
|
||||
mode: Option<String>,
|
||||
/// Arguments to pass to the project binary
|
||||
args: Option<Vec<String>>,
|
||||
},
|
||||
/// Build the local project
|
||||
Build {
|
||||
/// The build mode to use
|
||||
mode: Option<String>,
|
||||
},
|
||||
/// Clean all in progress files
|
||||
Clean,
|
||||
}
|
||||
|
||||
impl App {
|
||||
pub fn run(self) {
|
||||
match self.command {
|
||||
Subcommand::New { name } => match create_project(&name) {
|
||||
Ok(_) => println!("Successfully created new project '{name}'."),
|
||||
Err(e) => {
|
||||
eprintln!("Error creating project '{name}': {e}");
|
||||
std::process::exit(1);
|
||||
}
|
||||
_ => {}
|
||||
},
|
||||
Subcommand::Init => match create_project(".") {
|
||||
Ok(_) => println!("Successfully initialized new project."),
|
||||
Err(e) => {
|
||||
eprintln!("Error initializing project: {e}");
|
||||
std::process::exit(1);
|
||||
}
|
||||
_ => {}
|
||||
},
|
||||
Subcommand::Run { mode, args } => {
|
||||
match build(&mode) {
|
||||
Err(e) => {
|
||||
eprintln!("Error building project: {e}");
|
||||
std::process::exit(1);
|
||||
}
|
||||
_ => {}
|
||||
};
|
||||
if let Err(e) = run(&mode, args) {
|
||||
eprintln!("Error running project: {e}");
|
||||
std::process::exit(1);
|
||||
}
|
||||
}
|
||||
Subcommand::Build { mode } => match build(&mode) {
|
||||
Err(e) => {
|
||||
eprintln!("Error building project: {e}");
|
||||
std::process::exit(1);
|
||||
}
|
||||
_ => {}
|
||||
},
|
||||
Subcommand::Clean => match clean() {
|
||||
Err(e) => {
|
||||
eprintln!("Error cleaning project: {e}");
|
||||
std::process::exit(1);
|
||||
}
|
||||
_ => {}
|
||||
},
|
||||
Subcommand::Run { mode } => todo!(),
|
||||
Subcommand::Build { mode } => todo!(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn create_project<P: AsRef<Path>>(directory: P) -> std::io::Result<()> {
|
||||
let name = if directory.as_ref().to_string_lossy() == "." {
|
||||
String::new()
|
||||
} else {
|
||||
format!(" '{}'", directory.as_ref().to_string_lossy())
|
||||
};
|
||||
|
||||
println!(
|
||||
" {} binary (application){}",
|
||||
"Creating".green().bold(),
|
||||
name
|
||||
);
|
||||
|
||||
let pathdir = directory.as_ref();
|
||||
|
||||
if pathdir.exists() && pathdir.to_string_lossy() != "." {
|
||||
@@ -74,6 +121,7 @@ fn create_project<P: AsRef<Path>>(directory: P) -> std::io::Result<()> {
|
||||
std::fs::create_dir("src")?;
|
||||
|
||||
std::fs::write("src/main.c", MAIN_C)?;
|
||||
std::fs::write(".gitignore", GITIGNORE)?;
|
||||
|
||||
let config = crate::config::Config::new(&pathdir.to_string_lossy());
|
||||
|
||||
@@ -94,7 +142,7 @@ fn get_config() -> Option<crate::config::Config> {
|
||||
toml::from_str(&raw).ok()
|
||||
}
|
||||
|
||||
fn build(mode: Option<String>) -> std::io::Result<()> {
|
||||
fn build(mode: &Option<String>) -> std::io::Result<()> {
|
||||
let conf = match get_config() {
|
||||
Some(conf) => conf,
|
||||
None => {
|
||||
@@ -108,5 +156,102 @@ fn build(mode: Option<String>) -> std::io::Result<()> {
|
||||
"build layout not found",
|
||||
))?;
|
||||
|
||||
todo!()
|
||||
println!(
|
||||
" {} '{}' profile for project '{}'",
|
||||
"Building".green().bold(),
|
||||
build_config.name,
|
||||
conf.name
|
||||
);
|
||||
|
||||
let start = std::time::Instant::now();
|
||||
|
||||
std::fs::create_dir_all(format!("target/{}", build_config.name))?;
|
||||
|
||||
let mut command = Command::new("gcc");
|
||||
|
||||
for arg in &build_config.args {
|
||||
command.arg(arg);
|
||||
}
|
||||
|
||||
for entry in glob("src/*.c")
|
||||
.map_err(|e| std::io::Error::new(std::io::ErrorKind::NotFound, format!("{e}").as_str()))?
|
||||
{
|
||||
if let Ok(path) = entry {
|
||||
command.arg(path.to_string_lossy().to_string());
|
||||
}
|
||||
}
|
||||
|
||||
command
|
||||
.arg("-o")
|
||||
.arg(format!("target/{}/{}", build_config.name, conf.name));
|
||||
|
||||
let mut child = command.spawn()?;
|
||||
|
||||
child.wait()?;
|
||||
|
||||
let stop = start.elapsed();
|
||||
|
||||
println!(
|
||||
" {} '{}' profile for project '{}' in {:.2}s",
|
||||
"Finished".green().bold(),
|
||||
build_config.name,
|
||||
conf.name,
|
||||
stop.as_secs_f64()
|
||||
);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn run(mode: &Option<String>, args: Option<Vec<String>>) -> std::io::Result<()> {
|
||||
let conf = match get_config() {
|
||||
Some(conf) => conf,
|
||||
None => {
|
||||
eprintln!("Error opening config file. No Pallet.toml in current directory.");
|
||||
std::process::exit(1);
|
||||
}
|
||||
};
|
||||
|
||||
let build_config = conf.get_or_default(mode).ok_or(std::io::Error::new(
|
||||
std::io::ErrorKind::NotFound,
|
||||
"build layout not found",
|
||||
))?;
|
||||
|
||||
println!(
|
||||
" {} '{}' profile for project '{}'",
|
||||
"Running".green().bold(),
|
||||
build_config.name,
|
||||
conf.name
|
||||
);
|
||||
|
||||
let mut command = Command::new(format!("target/{}/{}", build_config.name, conf.name));
|
||||
|
||||
if let Some(args) = args {
|
||||
for arg in args {
|
||||
command.arg(arg);
|
||||
}
|
||||
}
|
||||
|
||||
let mut child = command.spawn()?;
|
||||
|
||||
child.wait()?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn clean() -> std::io::Result<()> {
|
||||
if let None = get_config() {
|
||||
return Err(std::io::Error::new(
|
||||
std::io::ErrorKind::NotFound,
|
||||
"no Pallet.toml found in local dir",
|
||||
));
|
||||
}
|
||||
|
||||
std::fs::remove_dir_all("target/")?;
|
||||
|
||||
println!(
|
||||
" {} removed files in target/ directory",
|
||||
"Successfully".green().bold()
|
||||
);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -17,9 +17,9 @@ impl Config {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_or_default(&self, mode: Option<String>) -> Option<&BuildConf> {
|
||||
pub fn get_or_default(&self, mode: &Option<String>) -> Option<&BuildConf> {
|
||||
if let Some(mode) = mode {
|
||||
self.build.iter().find(|bc| bc.name == mode)
|
||||
self.build.iter().find(|bc| bc.name == *mode)
|
||||
} else {
|
||||
self.build.iter().find(|bc| bc.name == self.default_build)
|
||||
}
|
||||
|
||||
1
src/templates/gitignoretemplate
Normal file
1
src/templates/gitignoretemplate
Normal file
@@ -0,0 +1 @@
|
||||
target/
|
||||
Reference in New Issue
Block a user