Compare commits
8 Commits
working/#1
...
b541865ff1
| Author | SHA1 | Date | |
|---|---|---|---|
| b541865ff1 | |||
| 03bc56007f | |||
| c5ecb78fd4 | |||
| 3c4bfca546 | |||
| 9c8fccbb4c | |||
| 29cbfbac66 | |||
| 4a2e959535 | |||
| 94d6f5d54d |
264
Cargo.lock
generated
264
Cargo.lock
generated
@@ -38,7 +38,7 @@ version = "1.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
|
||||
dependencies = [
|
||||
"windows-sys",
|
||||
"windows-sys 0.61.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -49,7 +49,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
|
||||
dependencies = [
|
||||
"anstyle",
|
||||
"once_cell_polyfill",
|
||||
"windows-sys",
|
||||
"windows-sys 0.61.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -63,6 +63,18 @@ dependencies = [
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
|
||||
|
||||
[[package]]
|
||||
name = "block-buffer"
|
||||
version = "0.10.4"
|
||||
@@ -115,6 +127,16 @@ dependencies = [
|
||||
"clap",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_complete_nushell"
|
||||
version = "4.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fbb9e9715d29a754b468591be588f6b926f5b0a1eb6a8b62acabeb66ff84d897"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"clap_complete",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "4.6.0"
|
||||
@@ -145,7 +167,7 @@ version = "3.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34"
|
||||
dependencies = [
|
||||
"windows-sys",
|
||||
"windows-sys 0.61.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -183,6 +205,15 @@ version = "1.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
|
||||
|
||||
[[package]]
|
||||
name = "fsevent-sys"
|
||||
version = "4.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "generic-array"
|
||||
version = "0.14.7"
|
||||
@@ -227,18 +258,115 @@ dependencies = [
|
||||
"hashbrown",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "inotify"
|
||||
version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bd5b3eaf1a28b758ac0faa5a4254e8ab2705605496f1b1f3fbbc3988ad73d199"
|
||||
dependencies = [
|
||||
"bitflags 2.11.0",
|
||||
"inotify-sys",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "inotify-sys"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "is_terminal_polyfill"
|
||||
version = "1.70.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "1.0.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
|
||||
|
||||
[[package]]
|
||||
name = "kqueue"
|
||||
version = "1.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
|
||||
dependencies = [
|
||||
"kqueue-sys",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "kqueue-sys"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.183"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.29"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
|
||||
|
||||
[[package]]
|
||||
name = "mio"
|
||||
version = "1.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"log",
|
||||
"wasi",
|
||||
"windows-sys 0.61.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "notify"
|
||||
version = "8.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
|
||||
dependencies = [
|
||||
"bitflags 2.11.0",
|
||||
"fsevent-sys",
|
||||
"inotify",
|
||||
"kqueue",
|
||||
"libc",
|
||||
"log",
|
||||
"mio",
|
||||
"notify-types",
|
||||
"walkdir",
|
||||
"windows-sys 0.60.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "notify-types"
|
||||
version = "2.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a"
|
||||
dependencies = [
|
||||
"bitflags 2.11.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell_polyfill"
|
||||
version = "1.70.2"
|
||||
@@ -251,9 +379,12 @@ version = "1.0.6"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"clap_complete",
|
||||
"clap_complete_nushell",
|
||||
"colored",
|
||||
"glob",
|
||||
"notify",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"sha256",
|
||||
"toml",
|
||||
]
|
||||
@@ -282,6 +413,15 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "same-file"
|
||||
version = "1.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
|
||||
dependencies = [
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.228"
|
||||
@@ -312,6 +452,19 @@ dependencies = [
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.149"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"memchr",
|
||||
"serde",
|
||||
"serde_core",
|
||||
"zmij",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_spanned"
|
||||
version = "1.0.4"
|
||||
@@ -435,12 +588,46 @@ version = "0.9.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
|
||||
|
||||
[[package]]
|
||||
name = "walkdir"
|
||||
version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
|
||||
dependencies = [
|
||||
"same-file",
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.11.1+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-util"
|
||||
version = "0.1.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
|
||||
dependencies = [
|
||||
"windows-sys 0.61.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-link"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.60.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
|
||||
dependencies = [
|
||||
"windows-targets",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.61.2"
|
||||
@@ -450,8 +637,79 @@ dependencies = [
|
||||
"windows-link",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.53.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
|
||||
dependencies = [
|
||||
"windows-link",
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_gnullvm",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_msvc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.53.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.53.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.53.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnullvm"
|
||||
version = "0.53.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.53.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.53.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.53.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.53.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
|
||||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8"
|
||||
|
||||
[[package]]
|
||||
name = "zmij"
|
||||
version = "1.0.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
|
||||
|
||||
@@ -7,8 +7,11 @@ description = "A project manager and build system for C inspired by Rust's Cargo
|
||||
[dependencies]
|
||||
clap = { version = "4.6.0", features = ["derive"] }
|
||||
clap_complete = "4.6.0"
|
||||
clap_complete_nushell = "4.6.0"
|
||||
colored = "3.1.1"
|
||||
glob = "0.3.3"
|
||||
notify = "8.2.0"
|
||||
serde = { version = "1.0.228", features = ["derive"] }
|
||||
serde_json = "1.0.149"
|
||||
sha256 = "1.6.0"
|
||||
toml = "1.0.7"
|
||||
|
||||
2
PKGBUILD
2
PKGBUILD
@@ -6,7 +6,7 @@ pkgdesc="A simple C project manager inspired by Cargo"
|
||||
arch=('x86_64')
|
||||
url=""
|
||||
license=('MIT')
|
||||
depends=('gcc')
|
||||
depends=('gcc' 'pkgconf')
|
||||
makedepends=('rust' 'cargo')
|
||||
source=()
|
||||
|
||||
|
||||
454
src/app.rs
454
src/app.rs
@@ -9,8 +9,7 @@ use colored::Colorize;
|
||||
use glob::glob;
|
||||
|
||||
const MAIN_C: &str = include_str!("templates/main.c");
|
||||
const TEST_C: &str = include_str!("templates/it_works.c");
|
||||
const GITIGNORE: &str = "target/";
|
||||
const GITIGNORE: &str = "target/\ncompile_commands.json\n";
|
||||
|
||||
#[derive(clap::Parser)]
|
||||
#[clap(version, about)]
|
||||
@@ -54,13 +53,21 @@ enum Subcommand {
|
||||
#[clap(subcommand)]
|
||||
command: UtilSubcommand,
|
||||
},
|
||||
/// Run tests in your project
|
||||
Test {
|
||||
/// The build mode to use
|
||||
mode: Option<String>,
|
||||
},
|
||||
/// List available build modes
|
||||
List,
|
||||
/// Add a new package to the project (throguh pkg-config)
|
||||
Add {
|
||||
/// The package to be added
|
||||
package: String,
|
||||
},
|
||||
/// Watches for source code changes and triggers a recompilation && re-run on change
|
||||
Watch {
|
||||
/// The build mode to use
|
||||
mode: Option<String>,
|
||||
/// Arguments to pass to the project binary
|
||||
#[arg(long, short)]
|
||||
args: Option<Vec<String>>,
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(clap::Subcommand)]
|
||||
@@ -71,6 +78,11 @@ enum UtilSubcommand {
|
||||
#[arg(value_enum, long, short)]
|
||||
shell: ShellCompletions,
|
||||
},
|
||||
/// Generate compile_commands.json for IDE support
|
||||
GenCompileCommands {
|
||||
/// The build mode to generate for
|
||||
mode: Option<String>,
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(Clone, clap::ValueEnum)]
|
||||
@@ -79,6 +91,7 @@ enum ShellCompletions {
|
||||
Fish,
|
||||
PowerShell,
|
||||
Zsh,
|
||||
Nushell,
|
||||
}
|
||||
|
||||
impl App {
|
||||
@@ -154,6 +167,18 @@ impl App {
|
||||
name,
|
||||
&mut std::io::stdout(),
|
||||
),
|
||||
ShellCompletions::Nushell => clap_complete::generate(
|
||||
clap_complete_nushell::Nushell,
|
||||
&mut command,
|
||||
name,
|
||||
&mut std::io::stdout(),
|
||||
),
|
||||
}
|
||||
}
|
||||
UtilSubcommand::GenCompileCommands { mode } => {
|
||||
if let Err(e) = gen_compile_commands(&mode) {
|
||||
eprintln!("Error generating compile commands: {e}");
|
||||
std::process::exit(1);
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -163,9 +188,15 @@ impl App {
|
||||
std::process::exit(1);
|
||||
}
|
||||
}
|
||||
Subcommand::Test { mode } => {
|
||||
if let Err(e) = test(mode) {
|
||||
eprintln!("Error running tests: {e}");
|
||||
Subcommand::Add { package } => {
|
||||
if let Err(e) = add_package(&package) {
|
||||
eprintln!("Error adding package {package} to project: {e}");
|
||||
std::process::exit(1);
|
||||
}
|
||||
}
|
||||
Subcommand::Watch { mode, args } => {
|
||||
if let Err(e) = watch(&mode, args) {
|
||||
eprintln!("Error running watch: {e}");
|
||||
std::process::exit(1);
|
||||
}
|
||||
}
|
||||
@@ -173,11 +204,244 @@ impl App {
|
||||
}
|
||||
}
|
||||
|
||||
fn test(mode: Option<String>) -> std::io::Result<()> {
|
||||
for entry in glob("src/tests/*.c").expect("a valid glob pattern") {
|
||||
if let Ok(file) = entry {}
|
||||
fn watch(mode: &Option<String>, args: Option<Vec<String>>) -> std::io::Result<()> {
|
||||
use std::io::Write;
|
||||
|
||||
// save terminal state
|
||||
let mut stdout = std::io::stdout();
|
||||
// enter alternate screen — this is a separate terminal buffer,
|
||||
// exiting it restores everything exactly as it was
|
||||
write!(stdout, "\x1b[?1049h")?;
|
||||
stdout.flush()?;
|
||||
|
||||
// make sure we always restore the terminal, even on panic
|
||||
let result = watch_inner(mode, args);
|
||||
|
||||
// exit alternate screen
|
||||
write!(stdout, "\x1b[?1049l")?;
|
||||
stdout.flush()?;
|
||||
|
||||
result
|
||||
}
|
||||
|
||||
fn watch_inner(mode: &Option<String>, args: Option<Vec<String>>) -> std::io::Result<()> {
|
||||
use notify::{Event, RecursiveMode, Watcher, recommended_watcher};
|
||||
use std::io::Write;
|
||||
use std::sync::mpsc;
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
let clear = || {
|
||||
let mut stdout = std::io::stdout();
|
||||
write!(stdout, "\x1b[2J\x1b[H").ok();
|
||||
stdout.flush().ok();
|
||||
};
|
||||
|
||||
let print_header = |label: &str| {
|
||||
println!(
|
||||
" {} project (ctrl+c to stop) — {label}",
|
||||
"Watching".green().bold()
|
||||
);
|
||||
println!("{}", "─".repeat(50).dimmed());
|
||||
};
|
||||
|
||||
// track the running child process
|
||||
let mut child: Option<std::process::Child> = None;
|
||||
|
||||
let kill_child = |child: &mut Option<std::process::Child>| {
|
||||
if let Some(c) = child {
|
||||
c.kill().ok();
|
||||
c.wait().ok();
|
||||
}
|
||||
*child = None;
|
||||
};
|
||||
|
||||
let run_child = |mode: &Option<String>,
|
||||
args: &Option<Vec<String>>|
|
||||
-> std::io::Result<std::process::Child> {
|
||||
let conf = get_config().ok_or(std::io::Error::new(
|
||||
std::io::ErrorKind::NotFound,
|
||||
"no Pallet.toml found",
|
||||
))?;
|
||||
let build_config = conf.get_or_default(mode).ok_or(std::io::Error::new(
|
||||
std::io::ErrorKind::NotFound,
|
||||
"build layout not found",
|
||||
))?;
|
||||
let mut command = Command::new(format!("target/{}/{}", build_config.name, conf.name));
|
||||
if let Some(a) = args {
|
||||
for arg in a {
|
||||
command.arg(arg);
|
||||
}
|
||||
}
|
||||
command
|
||||
.spawn()
|
||||
.map_err(|e| std::io::Error::other(format!("{e}")))
|
||||
};
|
||||
|
||||
// initial build + run
|
||||
clear();
|
||||
print_header("starting");
|
||||
if build(mode, false).is_ok() {
|
||||
child = run_child(mode, &args).ok();
|
||||
}
|
||||
|
||||
let (tx, rx) = mpsc::channel::<notify::Result<Event>>();
|
||||
let mut watcher = recommended_watcher(tx).map_err(|e| std::io::Error::other(format!("{e}")))?;
|
||||
watcher
|
||||
.watch(Path::new("src"), RecursiveMode::Recursive)
|
||||
.map_err(|e| std::io::Error::other(format!("{e}")))?;
|
||||
|
||||
let mut last_build = Instant::now()
|
||||
.checked_sub(Duration::from_secs(1))
|
||||
.unwrap_or(Instant::now());
|
||||
|
||||
loop {
|
||||
match rx.recv() {
|
||||
Ok(Ok(event)) => {
|
||||
let is_relevant = matches!(
|
||||
event.kind,
|
||||
notify::EventKind::Create(_)
|
||||
| notify::EventKind::Modify(_)
|
||||
| notify::EventKind::Remove(_)
|
||||
);
|
||||
let affects_source = event.paths.iter().any(|p| {
|
||||
matches!(
|
||||
p.extension().and_then(|e| e.to_str()),
|
||||
Some("c") | Some("h")
|
||||
)
|
||||
});
|
||||
let debounced = last_build.elapsed() > Duration::from_millis(500);
|
||||
|
||||
if is_relevant && affects_source && debounced {
|
||||
last_build = Instant::now();
|
||||
|
||||
// kill whatever is currently running
|
||||
kill_child(&mut child);
|
||||
|
||||
clear();
|
||||
print_header("rebuilding");
|
||||
|
||||
match build(mode, false) {
|
||||
Ok(_) => {
|
||||
child = run_child(mode, &args).ok();
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!(" {} {e}", "Error".red().bold());
|
||||
// child stays None until next successful build
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(Err(e)) => eprintln!(" {} watch error: {e}", "Error".red().bold()),
|
||||
Err(e) => {
|
||||
eprintln!(" {} channel error: {e}", "Error".red().bold());
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
kill_child(&mut child);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn add_package(package: &str) -> std::io::Result<()> {
|
||||
let status = Command::new("pkg-config")
|
||||
.arg("--exists")
|
||||
.arg(package)
|
||||
.status()
|
||||
.map_err(|_| {
|
||||
std::io::Error::new(
|
||||
std::io::ErrorKind::NotFound,
|
||||
"pkg-config not found - please install it first",
|
||||
)
|
||||
})?;
|
||||
|
||||
if !status.success() {
|
||||
eprintln!(
|
||||
" {} pkg-config could not find package '{package}'",
|
||||
"Error".red().bold()
|
||||
);
|
||||
eprintln!(
|
||||
" {} try installing the development package for '{package}', e.g.:",
|
||||
"Hint".yellow().bold()
|
||||
);
|
||||
eprintln!(" Arch: sudo pacman -S {package}");
|
||||
eprintln!(" Debian: sudo apt install lib{package}-dev");
|
||||
std::process::exit(1);
|
||||
}
|
||||
|
||||
let mut conf = get_config().ok_or(std::io::Error::new(
|
||||
std::io::ErrorKind::NotFound,
|
||||
"no Pallet.toml found in local directory",
|
||||
))?;
|
||||
|
||||
let deps = conf.dependencies.get_or_insert_with(Vec::new);
|
||||
|
||||
if deps.contains(&package.to_owned()) {
|
||||
println!(
|
||||
" {} '{package}' is already a dependency",
|
||||
"Warning".yellow().bold()
|
||||
);
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
deps.push(package.to_owned());
|
||||
|
||||
std::fs::write(
|
||||
"Pallet.toml",
|
||||
toml::to_string_pretty(&conf).expect("valid TOML"),
|
||||
)?;
|
||||
|
||||
println!(" {} {package}", "Added".green().bold());
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn gen_compile_commands(mode: &Option<String>) -> std::io::Result<()> {
|
||||
let conf = get_config().ok_or(std::io::Error::new(
|
||||
std::io::ErrorKind::NotFound,
|
||||
"no Pallet.toml found in current directory",
|
||||
))?;
|
||||
|
||||
let build_config = conf.get_or_default(mode).ok_or(std::io::Error::new(
|
||||
std::io::ErrorKind::NotFound,
|
||||
"build layout not found",
|
||||
))?;
|
||||
|
||||
let compiler = conf.compiler.as_deref().unwrap_or("gcc");
|
||||
let cwd = std::env::current_dir()?;
|
||||
let obj_dir = format!("target/{}/obj", build_config.name);
|
||||
|
||||
let source_files: Vec<PathBuf> = glob("src/*.c")
|
||||
.map_err(|e| std::io::Error::new(std::io::ErrorKind::NotFound, format!("{e}")))?
|
||||
.filter_map(|e| e.ok())
|
||||
.collect();
|
||||
|
||||
let entries: Vec<serde_json::Value> = source_files
|
||||
.iter()
|
||||
.map(|src| {
|
||||
let stem = src.file_stem().unwrap().to_string_lossy();
|
||||
let obj = format!("{}/{}.o", obj_dir, stem);
|
||||
let command = std::iter::once(compiler.to_string())
|
||||
.chain(build_config.args.iter().cloned())
|
||||
.chain(["-c".to_string(), src.to_string_lossy().to_string()])
|
||||
.chain(["-o".to_string(), obj])
|
||||
.collect::<Vec<_>>()
|
||||
.join(" ");
|
||||
serde_json::json!({
|
||||
"directory": cwd.to_string_lossy(),
|
||||
"file": cwd.join(src).to_string_lossy(),
|
||||
"command": command
|
||||
})
|
||||
})
|
||||
.collect();
|
||||
|
||||
let json = serde_json::to_string_pretty(&entries)
|
||||
.map_err(|e| std::io::Error::other(format!("{e}")))?;
|
||||
|
||||
std::fs::write("compile_commands.json", json)?;
|
||||
|
||||
println!(" {} compile_commands.json", "Generated".green().bold());
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -226,7 +490,19 @@ fn create_project<P: AsRef<Path>>(directory: P) -> std::io::Result<()> {
|
||||
std::fs::write("src/main.c", MAIN_C)?;
|
||||
std::fs::write(".gitignore", GITIGNORE)?;
|
||||
|
||||
let config = crate::config::Config::new(&pathdir.to_string_lossy());
|
||||
let lossy = pathdir.to_string_lossy();
|
||||
|
||||
let app_name = if lossy == "." {
|
||||
let root = std::env::current_dir()?;
|
||||
root.file_name()
|
||||
.expect("a valid file name")
|
||||
.to_string_lossy()
|
||||
.to_string()
|
||||
} else {
|
||||
lossy.to_string()
|
||||
};
|
||||
|
||||
let config = crate::config::Config::new(&app_name);
|
||||
|
||||
let serial = toml::to_string_pretty(&config).expect("a valid TOML structure");
|
||||
|
||||
@@ -268,55 +544,132 @@ fn build(mode: &Option<String>, force_recompile: bool) -> std::io::Result<()> {
|
||||
|
||||
let start = std::time::Instant::now();
|
||||
|
||||
std::fs::create_dir_all(format!("target/{}", build_config.name))?;
|
||||
let obj_dir = format!("target/{}/obj", build_config.name);
|
||||
|
||||
let hash = hash_src_tree()?;
|
||||
std::fs::create_dir_all(&obj_dir)?;
|
||||
|
||||
let old_compute_path = PathBuf::from(format!("target/{}/.build_hash", build_config.name));
|
||||
let compiler = conf.compiler.as_deref().unwrap_or("gcc");
|
||||
|
||||
if old_compute_path.exists() && !force_recompile {
|
||||
let text = std::fs::read_to_string(old_compute_path)?;
|
||||
let mut extra_compile_flags: Vec<String> = Vec::new();
|
||||
let mut extra_link_flags: Vec<String> = Vec::new();
|
||||
|
||||
if hash.trim() == text.trim() {
|
||||
if let Some(deps) = &conf.dependencies
|
||||
&& !deps.is_empty()
|
||||
{
|
||||
let cflags = Command::new("pkg-config")
|
||||
.arg("--cflags")
|
||||
.args(deps)
|
||||
.output()
|
||||
.map_err(|_| {
|
||||
std::io::Error::new(std::io::ErrorKind::NotFound, "pkg-config not found")
|
||||
})?;
|
||||
if !cflags.status.success() {
|
||||
return Err(std::io::Error::other(
|
||||
"pkg-config --cflags failed - is the package installed?",
|
||||
));
|
||||
}
|
||||
|
||||
let libs = Command::new("pkg-config")
|
||||
.arg("--libs")
|
||||
.args(deps)
|
||||
.output()
|
||||
.map_err(|_| {
|
||||
std::io::Error::new(std::io::ErrorKind::NotFound, "pkg-config not found")
|
||||
})?;
|
||||
if !libs.status.success() {
|
||||
return Err(std::io::Error::other(
|
||||
"pkg-config --libs failed - is the pacakge installed?",
|
||||
));
|
||||
}
|
||||
|
||||
extra_compile_flags = String::from_utf8_lossy(&cflags.stdout)
|
||||
.split_whitespace()
|
||||
.map(str::to_owned)
|
||||
.collect();
|
||||
extra_link_flags = String::from_utf8_lossy(&libs.stdout)
|
||||
.split_whitespace()
|
||||
.map(str::to_owned)
|
||||
.collect();
|
||||
}
|
||||
|
||||
let source_files: Vec<PathBuf> = glob("src/*.c")
|
||||
.map_err(|e| std::io::Error::new(std::io::ErrorKind::NotFound, format!("{e}")))?
|
||||
.filter_map(|e| e.ok())
|
||||
.collect();
|
||||
|
||||
let mut any_changed = false;
|
||||
|
||||
for src in &source_files {
|
||||
let stem = src.file_stem().unwrap().to_string_lossy();
|
||||
let obj_path = format!("{}/{}.o", obj_dir, stem);
|
||||
let hash_path = format!("{}/{}.c.hash", obj_dir, stem);
|
||||
|
||||
let hash = hash_file(src)?;
|
||||
|
||||
let needs_compile = force_recompile
|
||||
|| match std::fs::read_to_string(&hash_path) {
|
||||
Ok(old) => old.trim() != hash.trim(),
|
||||
Err(_) => true,
|
||||
};
|
||||
|
||||
if needs_compile {
|
||||
println!(" {} {}", "Compiling".green().bold(), src.display());
|
||||
|
||||
let status = Command::new(compiler)
|
||||
.args(&build_config.args)
|
||||
.args(&extra_compile_flags)
|
||||
.arg("-c")
|
||||
.arg(src)
|
||||
.arg("-o")
|
||||
.arg(&obj_path)
|
||||
.status()?;
|
||||
|
||||
if !status.success() {
|
||||
return Err(std::io::Error::other(format!(
|
||||
"failed to compile {}",
|
||||
src.display()
|
||||
)));
|
||||
}
|
||||
|
||||
std::fs::write(&hash_path, &hash)?;
|
||||
any_changed = true;
|
||||
}
|
||||
}
|
||||
|
||||
let binary = format!("target/{}/{}", build_config.name, conf.name);
|
||||
let binary_exists = PathBuf::from(&binary).exists();
|
||||
|
||||
if !any_changed && binary_exists {
|
||||
println!(
|
||||
" {} (code not changed, recompile not made)",
|
||||
"Finished".green().bold()
|
||||
);
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
|
||||
let mut command = Command::new(conf.compiler.as_deref().unwrap_or("gcc"));
|
||||
let obj_files: Vec<String> = source_files
|
||||
.iter()
|
||||
.map(|src| {
|
||||
let stem = src.file_stem().unwrap().to_string_lossy();
|
||||
format!("{}/{}.o", obj_dir, stem)
|
||||
})
|
||||
.collect();
|
||||
|
||||
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
|
||||
let status = Command::new(compiler)
|
||||
.args(&obj_files)
|
||||
.args(&extra_link_flags)
|
||||
.arg("-o")
|
||||
.arg(format!("target/{}/{}", build_config.name, conf.name));
|
||||
|
||||
let status = command.status()?;
|
||||
.arg(&binary)
|
||||
.status()?;
|
||||
|
||||
if !status.success() {
|
||||
return Err(std::io::Error::new(
|
||||
std::io::ErrorKind::Other,
|
||||
format!("compiler exited with status {status}"),
|
||||
));
|
||||
return Err(std::io::Error::other("linking failed"));
|
||||
}
|
||||
|
||||
std::fs::write(format!("target/{}/.build_hash", build_config.name), hash)?;
|
||||
|
||||
let stop = start.elapsed();
|
||||
|
||||
gen_compile_commands(mode)?;
|
||||
|
||||
println!(
|
||||
" {} '{}' profile for project '{}' in {:.2}s",
|
||||
"Finished".green().bold(),
|
||||
@@ -328,16 +681,9 @@ fn build(mode: &Option<String>, force_recompile: bool) -> std::io::Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn hash_src_tree() -> std::io::Result<String> {
|
||||
let mut hashes = String::new();
|
||||
for entry in glob("src/**/*").expect("a valid glob pattern") {
|
||||
if let Ok(file) = entry {
|
||||
let text = std::fs::read_to_string(file)?;
|
||||
let hash = sha256::digest(text);
|
||||
hashes.push_str(hash.as_str());
|
||||
}
|
||||
}
|
||||
Ok(sha256::digest(hashes))
|
||||
fn hash_file(path: &Path) -> std::io::Result<String> {
|
||||
let contents = std::fs::read_to_string(path)?;
|
||||
Ok(sha256::digest(contents))
|
||||
}
|
||||
|
||||
fn run(mode: &Option<String>, args: Option<Vec<String>>) -> std::io::Result<()> {
|
||||
|
||||
@@ -14,6 +14,8 @@ pub struct Config {
|
||||
pub authors: Option<Vec<String>>,
|
||||
/// Build configs
|
||||
pub build: Vec<BuildConf>,
|
||||
/// Build dependnecies verified by pkg-config
|
||||
pub dependencies: Option<Vec<String>>,
|
||||
}
|
||||
|
||||
impl Config {
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
#include <assert.h>
|
||||
|
||||
int main() {
|
||||
assert((1 + 1) == 2);
|
||||
|
||||
return 0;
|
||||
}
|
||||
Reference in New Issue
Block a user