mirror of
https://github.com/dexoron/dcr.git
synced 2026-10-21 17:29:36 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4ea6267a88 | |||
| 617ba85442 |
17
CHANGELOG.md
17
CHANGELOG.md
@@ -1,5 +1,22 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [0.2.8] - 2026-03-06
|
||||||
|
Added:
|
||||||
|
- Workspace support (`[workspace]` with deps ordering)
|
||||||
|
- `clean --all` for workspace members
|
||||||
|
Changed:
|
||||||
|
- Project root discovery for `build/run/clean` (searches parent dirs)
|
||||||
|
- Workspace paths are excluded from root source scan
|
||||||
|
- Build output now uses a Cargo-style `Compiling <name> v<version>` line
|
||||||
|
- Build time now reports total time for the whole build stage (workspace included)
|
||||||
|
- Cache hits are silent (no compile line when nothing is rebuilt)
|
||||||
|
- Safer build cache: fingerprints include headers and resolved library files
|
||||||
|
|
||||||
|
## [0.2.7] - 2026-03-03
|
||||||
|
Added:
|
||||||
|
- Toolchain overrides via `[toolchain]` and env (`DCR_*`)
|
||||||
|
- ASM `.S` preprocessing via GCC/Clang (`-x assembler-with-cpp`)
|
||||||
|
|
||||||
## [0.2.6] - 2026-03-01
|
## [0.2.6] - 2026-03-01
|
||||||
Added:
|
Added:
|
||||||
- `sharedlib` build kind (shared library output)
|
- `sharedlib` build kind (shared library output)
|
||||||
|
|||||||
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -90,7 +90,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dcr"
|
name = "dcr"
|
||||||
version = "0.2.6"
|
version = "0.2.8"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"reqwest",
|
"reqwest",
|
||||||
"self-replace",
|
"self-replace",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "dcr"
|
name = "dcr"
|
||||||
version = "0.2.6"
|
version = "0.2.8"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
build = "build.rs"
|
build = "build.rs"
|
||||||
|
|
||||||
|
|||||||
18
README.md
18
README.md
@@ -113,6 +113,7 @@ Run manually:
|
|||||||
|
|
||||||
### `dcr clean`
|
### `dcr clean`
|
||||||
Removes the `target` directory in the project root.
|
Removes the `target` directory in the project root.
|
||||||
|
Use `dcr clean --all` in a workspace root to clean all member projects.
|
||||||
|
|
||||||
## Build Profiles
|
## Build Profiles
|
||||||
Two profiles are supported:
|
Two profiles are supported:
|
||||||
@@ -146,9 +147,26 @@ compiler = "clang"
|
|||||||
cflags = ["-Wall", "-Wextra"]
|
cflags = ["-Wall", "-Wextra"]
|
||||||
ldflags = ["-lm"]
|
ldflags = ["-lm"]
|
||||||
|
|
||||||
|
[toolchain]
|
||||||
|
# Optional tool overrides:
|
||||||
|
# cc = "clang"
|
||||||
|
# cxx = "clang++"
|
||||||
|
# as = "as"
|
||||||
|
# ar = "ar"
|
||||||
|
# ld = "ld"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Workspace example:
|
||||||
|
|
||||||
|
```toml
|
||||||
|
[workspace]
|
||||||
|
kernel = { path = "src/kernel", deps = ["core", "userspace"] }
|
||||||
|
core = { path = "src/core", deps = ["userspace"] }
|
||||||
|
userspace = { path = "src/userspace" }
|
||||||
|
```
|
||||||
|
|
||||||
Path dependencies are supported. DCR will resolve them on build and generate `dcr.lock`.
|
Path dependencies are supported. DCR will resolve them on build and generate `dcr.lock`.
|
||||||
|
|
||||||
Incremental build note: object files are rebuilt when source `.c/.cpp` files change. Header dependency tracking is not implemented yet.
|
Incremental build note: object files are rebuilt when source `.c/.cpp` files change. Header dependency tracking is not implemented yet.
|
||||||
|
|||||||
3
TODO.md
3
TODO.md
@@ -2,8 +2,5 @@
|
|||||||
|
|
||||||
- Add header dependency tracking for incremental builds (GCC/Clang: -MMD, MSVC: /showIncludes)
|
- Add header dependency tracking for incremental builds (GCC/Clang: -MMD, MSVC: /showIncludes)
|
||||||
- Add external package managers (Conan, vcpkg)
|
- Add external package managers (Conan, vcpkg)
|
||||||
- Multi-target
|
|
||||||
- ASM support
|
|
||||||
- Linker script + direct linker control
|
- Linker script + direct linker control
|
||||||
- Custom targets/steps
|
- Custom targets/steps
|
||||||
- Tool overrides and env vars
|
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ Current DCR focuses on a simple, predictable workflow:
|
|||||||
- `sharedlib`
|
- `sharedlib`
|
||||||
- Optional custom output directory via `build.target`.
|
- Optional custom output directory via `build.target`.
|
||||||
- Optional `build.platform` to pass architecture hints (`-march` / `/arch`).
|
- Optional `build.platform` to pass architecture hints (`-march` / `/arch`).
|
||||||
|
- Workspace builds via `[workspace]` with per-project `dcr.toml`.
|
||||||
- Path dependencies with include/lib resolution and `dcr.lock` generation.
|
- Path dependencies with include/lib resolution and `dcr.lock` generation.
|
||||||
|
|
||||||
## Important behavior notes
|
## Important behavior notes
|
||||||
|
|||||||
@@ -43,3 +43,4 @@ dcr build --release
|
|||||||
- Unknown profile flags return an error.
|
- Unknown profile flags return an error.
|
||||||
- Incremental rebuild is based on source/object mtime comparison.
|
- Incremental rebuild is based on source/object mtime comparison.
|
||||||
- For `language = "asm"` with `compiler = "as"`/`"gas"`, use `.s` files (no preprocessing). For `.S`, use `gcc` or `clang`.
|
- For `language = "asm"` with `compiler = "as"`/`"gas"`, use `.s` files (no preprocessing). For `.S`, use `gcc` or `clang`.
|
||||||
|
- In workspace root, `dcr build` builds all members in dependency order.
|
||||||
|
|||||||
@@ -8,16 +8,18 @@ Removes build artifacts in `target/`.
|
|||||||
dcr clean
|
dcr clean
|
||||||
dcr clean --debug
|
dcr clean --debug
|
||||||
dcr clean --release
|
dcr clean --release
|
||||||
|
dcr clean --all
|
||||||
|
dcr clean --release --all
|
||||||
```
|
```
|
||||||
|
|
||||||
## Behavior
|
## Behavior
|
||||||
|
|
||||||
- Without arguments: removes entire `target/`.
|
- Without arguments: removes entire `target/`.
|
||||||
- With profile: removes only `target/<profile>/`.
|
- With profile: removes only `target/<profile>/`.
|
||||||
|
- With `--all`: also cleans all workspace members.
|
||||||
|
|
||||||
## Validation
|
## Validation
|
||||||
|
|
||||||
- `dcr.toml` must exist.
|
- `dcr.toml` must exist.
|
||||||
- More than one argument is treated as error.
|
- Unknown flags are treated as error.
|
||||||
- Unknown profile is treated as error.
|
|
||||||
- If `target` or selected profile directory does not exist, command prints a warning.
|
- If `target` or selected profile directory does not exist, command prints a warning.
|
||||||
|
|||||||
@@ -26,6 +26,17 @@ kind = "bin"
|
|||||||
- `cflags` (string array, optional): extra compile flags.
|
- `cflags` (string array, optional): extra compile flags.
|
||||||
- `ldflags` (string array, optional): extra link flags.
|
- `ldflags` (string array, optional): extra link flags.
|
||||||
|
|
||||||
|
## Toolchain section
|
||||||
|
|
||||||
|
```toml
|
||||||
|
[toolchain]
|
||||||
|
cc = "clang"
|
||||||
|
cxx = "clang++"
|
||||||
|
as = "as"
|
||||||
|
ar = "ar"
|
||||||
|
ld = "ld"
|
||||||
|
```
|
||||||
|
|
||||||
## Behavior notes
|
## Behavior notes
|
||||||
|
|
||||||
- Compiler backend is selected by compiler string (`gcc`, `clang`, `cl`, `clang-cl`).
|
- Compiler backend is selected by compiler string (`gcc`, `clang`, `cl`, `clang-cl`).
|
||||||
|
|||||||
@@ -26,6 +26,9 @@ kind = "bin"
|
|||||||
- `[build]`
|
- `[build]`
|
||||||
- `[dependencies]`
|
- `[dependencies]`
|
||||||
|
|
||||||
|
Workspace-only root:
|
||||||
|
- `[workspace]` may be used instead of `[package]`/`[build]` for a workspace root.
|
||||||
|
|
||||||
## Required keys
|
## Required keys
|
||||||
|
|
||||||
- `package.name`
|
- `package.name`
|
||||||
@@ -43,3 +46,5 @@ kind = "bin"
|
|||||||
- `build.cflags`
|
- `build.cflags`
|
||||||
- `build.ldflags`
|
- `build.ldflags`
|
||||||
- dependency fields (`include`, `lib`, `libs`, `system`)
|
- dependency fields (`include`, `lib`, `libs`, `system`)
|
||||||
|
- `[toolchain]` overrides (`cc`, `cxx`, `as`, `ar`, `ld`)
|
||||||
|
- `[workspace]` members
|
||||||
|
|||||||
@@ -39,6 +39,18 @@ If `build.platform` is set, DCR passes it as an architecture hint:
|
|||||||
- GCC/Clang: `-march=<platform>`
|
- GCC/Clang: `-march=<platform>`
|
||||||
- MSVC: maps to `/arch:*` for known values (`x86`, `i386`, `i486`, `i586`, `i686`, `sse2`, `avx`, `avx2`)
|
- MSVC: maps to `/arch:*` for known values (`x86`, `i386`, `i486`, `i586`, `i686`, `sse2`, `avx`, `avx2`)
|
||||||
|
|
||||||
|
## Toolchain overrides
|
||||||
|
|
||||||
|
If `[toolchain]` is set, DCR uses its values to override compiler/linker tools:
|
||||||
|
|
||||||
|
- `cc`, `cxx`, `as` override compilers for C/C++/ASM
|
||||||
|
- `ar` overrides the archiver (used for `staticlib`)
|
||||||
|
- `ld` overrides the linker (used by GCC/Clang/NASM/GAS backends)
|
||||||
|
|
||||||
|
Environment overrides (highest priority):
|
||||||
|
- `DCR_COMPILER` (all languages)
|
||||||
|
- `DCR_CC`, `DCR_CXX`, `DCR_AS`, `DCR_AR`, `DCR_LD`
|
||||||
|
|
||||||
## Linking
|
## Linking
|
||||||
|
|
||||||
For `kind = "bin"`:
|
For `kind = "bin"`:
|
||||||
|
|||||||
@@ -37,6 +37,8 @@ Profile-only cleanup:
|
|||||||
```sh
|
```sh
|
||||||
dcr clean --debug
|
dcr clean --debug
|
||||||
dcr clean --release
|
dcr clean --release
|
||||||
|
dcr clean --all
|
||||||
|
dcr clean --release --all
|
||||||
```
|
```
|
||||||
|
|
||||||
## Notes
|
## Notes
|
||||||
@@ -44,3 +46,4 @@ dcr clean --release
|
|||||||
- `run` is unavailable for `build.kind = "staticlib"` and `build.kind = "sharedlib"`.
|
- `run` is unavailable for `build.kind = "staticlib"` and `build.kind = "sharedlib"`.
|
||||||
- Build profile flag is parsed from the first command argument.
|
- Build profile flag is parsed from the first command argument.
|
||||||
- Unknown profile flags produce an error.
|
- Unknown profile flags produce an error.
|
||||||
|
- In workspace root, `clean --all` cleans all member projects.
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ dcr new <name>
|
|||||||
dcr init
|
dcr init
|
||||||
dcr build [--debug|--release]
|
dcr build [--debug|--release]
|
||||||
dcr run [--debug|--release]
|
dcr run [--debug|--release]
|
||||||
dcr clean [--debug|--release]
|
dcr clean [--debug|--release] [--all]
|
||||||
dcr --help
|
dcr --help
|
||||||
dcr --version
|
dcr --version
|
||||||
dcr --update
|
dcr --update
|
||||||
@@ -18,7 +18,7 @@ dcr --update
|
|||||||
- Most commands parse profile from the first argument.
|
- Most commands parse profile from the first argument.
|
||||||
- `new` requires exactly one argument.
|
- `new` requires exactly one argument.
|
||||||
- `init` and `--update` do not accept extra arguments.
|
- `init` and `--update` do not accept extra arguments.
|
||||||
- `clean` accepts at most one argument.
|
- `clean` accepts `--debug|--release` and optional `--all`.
|
||||||
|
|
||||||
## Exit behavior overview
|
## Exit behavior overview
|
||||||
|
|
||||||
|
|||||||
@@ -17,6 +17,16 @@ platform = "string" # optional
|
|||||||
cflags = ["string", "..."] # optional
|
cflags = ["string", "..."] # optional
|
||||||
ldflags = ["string", "..."] # optional
|
ldflags = ["string", "..."] # optional
|
||||||
|
|
||||||
|
[toolchain]
|
||||||
|
cc = "string" # optional
|
||||||
|
cxx = "string" # optional
|
||||||
|
as = "string" # optional
|
||||||
|
ar = "string" # optional
|
||||||
|
ld = "string" # optional
|
||||||
|
|
||||||
|
[workspace]
|
||||||
|
name = { path = "string", deps = ["string", "..."] }
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
name = {
|
name = {
|
||||||
path = "string", # required for each dependency
|
path = "string", # required for each dependency
|
||||||
|
|||||||
519
src/cli/build.rs
519
src/cli/build.rs
@@ -1,100 +1,41 @@
|
|||||||
use crate::config::{PROFILE, flags};
|
use crate::config::{PROFILE, flags};
|
||||||
use crate::core::builder::{BuildContext, build as build_project};
|
use crate::core::builder::{BuildContext, build as build_project, collect_sources};
|
||||||
use crate::core::config::Config;
|
use crate::core::config::Config;
|
||||||
use crate::core::deps::resolve_deps;
|
use crate::core::deps::resolve_deps;
|
||||||
use crate::utils::fs::check_dir;
|
use crate::core::workspace::parse_workspace;
|
||||||
|
use crate::utils::fs::{check_dir, find_project_root};
|
||||||
use crate::utils::log::{error, warn};
|
use crate::utils::log::{error, warn};
|
||||||
use crate::utils::text::{BOLD_GREEN, colored};
|
use crate::utils::text::{BOLD_GREEN, colored};
|
||||||
|
use sha2::{Digest, Sha256};
|
||||||
use std::fs;
|
use std::fs;
|
||||||
|
use std::path::Path;
|
||||||
use std::time::Instant;
|
use std::time::Instant;
|
||||||
|
|
||||||
pub fn build(args: &[String]) -> i32 {
|
pub fn build(args: &[String]) -> i32 {
|
||||||
let items = check_dir(None).unwrap_or_default();
|
let start_dir = match std::env::current_dir() {
|
||||||
if !items.contains(&"dcr.toml".to_string()) {
|
Ok(dir) => dir,
|
||||||
error("dcr.toml file not found");
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
let config = match Config::open("./dcr.toml") {
|
|
||||||
Ok(cfg) => cfg,
|
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
|
error("Failed to determine current directory");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let root = match find_project_root(&start_dir) {
|
||||||
|
Ok(Some(dir)) => dir,
|
||||||
|
Ok(None) => {
|
||||||
error("dcr.toml file not found");
|
error("dcr.toml file not found");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
Err(_) => {
|
||||||
|
error("Failed to find project root");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
let active_profile = match parse_profile(args) {
|
let active_profile = match parse_profile(args) {
|
||||||
Ok(profile) => profile,
|
Ok(profile) => profile,
|
||||||
Err(code) => return code,
|
Err(code) => return code,
|
||||||
};
|
};
|
||||||
let project_name = get_config_str(&config, "package.name");
|
match with_dir(&root, || build_from_root(&root, &active_profile)) {
|
||||||
let project_compiler = get_config_str(&config, "build.compiler");
|
Ok(()) => 0,
|
||||||
let build_language = get_config_str(&config, "build.language");
|
|
||||||
let build_standard = get_config_str(&config, "build.standard");
|
|
||||||
let build_target = get_config_str(&config, "build.target");
|
|
||||||
let build_kind = get_config_str(&config, "build.kind");
|
|
||||||
let build_platform = get_config_str(&config, "build.platform");
|
|
||||||
let build_cflags = match get_config_list(&config, "build.cflags") {
|
|
||||||
Ok(v) => v,
|
|
||||||
Err(msg) => {
|
|
||||||
error(&msg);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
let build_ldflags = match get_config_list(&config, "build.ldflags") {
|
|
||||||
Ok(v) => v,
|
|
||||||
Err(msg) => {
|
|
||||||
error(&msg);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
println!(
|
|
||||||
" Building project `{}`\n Profile: {}\n Compiler: {}\n",
|
|
||||||
colored(&project_name, BOLD_GREEN),
|
|
||||||
colored(&active_profile, BOLD_GREEN),
|
|
||||||
colored(&project_compiler, BOLD_GREEN)
|
|
||||||
);
|
|
||||||
|
|
||||||
ensure_target_dirs(&items, &active_profile, normalize_target(&build_target));
|
|
||||||
|
|
||||||
let project_root = match std::env::current_dir() {
|
|
||||||
Ok(p) => p,
|
|
||||||
Err(_) => {
|
|
||||||
error("Failed to determine project root");
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
let resolved = match resolve_deps(&config, &active_profile, &project_root) {
|
|
||||||
Ok(r) => r,
|
|
||||||
Err(msg) => {
|
|
||||||
error(&msg);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
let ctx = BuildContext {
|
|
||||||
profile: &active_profile,
|
|
||||||
project_name: &project_name,
|
|
||||||
compiler: &project_compiler,
|
|
||||||
language: &build_language,
|
|
||||||
standard: &build_standard,
|
|
||||||
target_dir: normalize_target(&build_target),
|
|
||||||
kind: normalize_kind(&build_kind),
|
|
||||||
platform: normalize_platform(&build_platform),
|
|
||||||
include_dirs: &resolved.include_dirs,
|
|
||||||
lib_dirs: &resolved.lib_dirs,
|
|
||||||
libs: &resolved.libs,
|
|
||||||
cflags: &build_cflags,
|
|
||||||
ldflags: &build_ldflags,
|
|
||||||
};
|
|
||||||
match run_build(&ctx) {
|
|
||||||
Ok(times) => {
|
|
||||||
println!(
|
|
||||||
" {} Build completed successfully in {} seconds",
|
|
||||||
colored("✔", BOLD_GREEN),
|
|
||||||
colored(×.to_string(), BOLD_GREEN)
|
|
||||||
);
|
|
||||||
0
|
|
||||||
}
|
|
||||||
Err(msg) => {
|
Err(msg) => {
|
||||||
error(&msg);
|
error(&msg);
|
||||||
1
|
1
|
||||||
@@ -126,6 +67,16 @@ fn get_config_str(config: &Config, key: &str) -> String {
|
|||||||
.to_string()
|
.to_string()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn get_config_opt(config: &Config, key: &str) -> Option<String> {
|
||||||
|
let value = config.get(key)?.as_str()?;
|
||||||
|
let trimmed = value.trim();
|
||||||
|
if trimmed.is_empty() {
|
||||||
|
None
|
||||||
|
} else {
|
||||||
|
Some(trimmed.to_string())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn get_config_list(config: &Config, key: &str) -> Result<Vec<String>, String> {
|
fn get_config_list(config: &Config, key: &str) -> Result<Vec<String>, String> {
|
||||||
let value = match config.get(key) {
|
let value = match config.get(key) {
|
||||||
Some(v) => v,
|
Some(v) => v,
|
||||||
@@ -173,6 +124,136 @@ fn run_build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn build_from_root(root: &Path, profile: &str) -> Result<(), String> {
|
||||||
|
let config = Config::open("./dcr.toml").map_err(|err| err.to_string())?;
|
||||||
|
let project_name = get_config_str(&config, "package.name");
|
||||||
|
let start_time = Instant::now();
|
||||||
|
println!(
|
||||||
|
" Building project `{}`\n Profile: {}",
|
||||||
|
colored(&project_name, BOLD_GREEN),
|
||||||
|
colored(profile, BOLD_GREEN)
|
||||||
|
);
|
||||||
|
if let Some(workspace) = parse_workspace(&config, root)? {
|
||||||
|
build_workspace(&workspace, profile)?;
|
||||||
|
let excludes: Vec<std::path::PathBuf> =
|
||||||
|
workspace.members.iter().map(|m| m.path.clone()).collect();
|
||||||
|
build_project_at(root, profile, &excludes)?;
|
||||||
|
let elapsed = ((start_time.elapsed().as_secs_f64() * 100.0).trunc()) / 100.0;
|
||||||
|
println!(
|
||||||
|
" {} Build completed successfully in {} seconds",
|
||||||
|
colored("✔", BOLD_GREEN),
|
||||||
|
colored(&elapsed.to_string(), BOLD_GREEN)
|
||||||
|
);
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
build_project_at(root, profile, &[])?;
|
||||||
|
let elapsed = ((start_time.elapsed().as_secs_f64() * 100.0).trunc()) / 100.0;
|
||||||
|
println!(
|
||||||
|
" {} Build completed successfully in {} seconds",
|
||||||
|
colored("✔", BOLD_GREEN),
|
||||||
|
colored(&elapsed.to_string(), BOLD_GREEN)
|
||||||
|
);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn build_workspace(
|
||||||
|
workspace: &crate::core::workspace::Workspace,
|
||||||
|
profile: &str,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
for member in &workspace.members {
|
||||||
|
build_project_at(&member.path, profile, &[])?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn build_project_at(
|
||||||
|
project_root: &Path,
|
||||||
|
profile: &str,
|
||||||
|
exclude_dirs: &[std::path::PathBuf],
|
||||||
|
) -> Result<(), String> {
|
||||||
|
with_dir(project_root, || {
|
||||||
|
let items = check_dir(None).map_err(|_| "Failed to read project directory".to_string())?;
|
||||||
|
if !items.contains(&"dcr.toml".to_string()) {
|
||||||
|
return Err("dcr.toml file not found".to_string());
|
||||||
|
}
|
||||||
|
let config = Config::open("./dcr.toml").map_err(|err| err.to_string())?;
|
||||||
|
let project_name = get_config_str(&config, "package.name");
|
||||||
|
let project_version = get_config_str(&config, "package.version");
|
||||||
|
let project_compiler = get_config_str(&config, "build.compiler");
|
||||||
|
let build_language = get_config_str(&config, "build.language");
|
||||||
|
let build_standard = get_config_str(&config, "build.standard");
|
||||||
|
let build_target = get_config_str(&config, "build.target");
|
||||||
|
let build_kind = get_config_str(&config, "build.kind");
|
||||||
|
let build_platform = get_config_str(&config, "build.platform");
|
||||||
|
let tc_cc = get_config_opt(&config, "toolchain.cc");
|
||||||
|
let tc_cxx = get_config_opt(&config, "toolchain.cxx");
|
||||||
|
let tc_as = get_config_opt(&config, "toolchain.as");
|
||||||
|
let tc_ar = get_config_opt(&config, "toolchain.ar");
|
||||||
|
let tc_ld = get_config_opt(&config, "toolchain.ld");
|
||||||
|
let build_cflags = get_config_list(&config, "build.cflags")?;
|
||||||
|
let build_ldflags = get_config_list(&config, "build.ldflags")?;
|
||||||
|
|
||||||
|
let resolved_compiler = resolve_compiler(
|
||||||
|
&build_language,
|
||||||
|
&project_compiler,
|
||||||
|
tc_cc.as_deref(),
|
||||||
|
tc_cxx.as_deref(),
|
||||||
|
tc_as.as_deref(),
|
||||||
|
);
|
||||||
|
let resolved_linker = resolve_tool("DCR_LD", tc_ld.as_deref());
|
||||||
|
let resolved_archiver = resolve_tool("DCR_AR", tc_ar.as_deref());
|
||||||
|
|
||||||
|
ensure_target_dirs(&items, profile, normalize_target(&build_target));
|
||||||
|
|
||||||
|
let resolved = resolve_deps(&config, profile, project_root)?;
|
||||||
|
let ctx = BuildContext {
|
||||||
|
profile,
|
||||||
|
project_name: &project_name,
|
||||||
|
compiler: &resolved_compiler,
|
||||||
|
language: &build_language,
|
||||||
|
standard: &build_standard,
|
||||||
|
target_dir: normalize_target(&build_target),
|
||||||
|
kind: normalize_kind(&build_kind),
|
||||||
|
platform: normalize_platform(&build_platform),
|
||||||
|
linker: resolved_linker.as_deref(),
|
||||||
|
archiver: resolved_archiver.as_deref(),
|
||||||
|
exclude_dirs,
|
||||||
|
include_dirs: &resolved.include_dirs,
|
||||||
|
lib_dirs: &resolved.lib_dirs,
|
||||||
|
libs: &resolved.libs,
|
||||||
|
cflags: &build_cflags,
|
||||||
|
ldflags: &build_ldflags,
|
||||||
|
};
|
||||||
|
let sources = collect_sources(&ctx)?;
|
||||||
|
let headers = collect_header_files(&ctx, project_root)?;
|
||||||
|
let lib_files = collect_lib_files(&ctx);
|
||||||
|
let fingerprint = compute_build_fingerprint(&ctx, &sources, &headers, &lib_files)?;
|
||||||
|
if should_skip_build(&ctx, &fingerprint) {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
println!(
|
||||||
|
" {} {} v{}",
|
||||||
|
colored("Compiling", BOLD_GREEN),
|
||||||
|
project_name,
|
||||||
|
project_version
|
||||||
|
);
|
||||||
|
run_build(&ctx)?;
|
||||||
|
write_build_fingerprint(&ctx, &fingerprint)?;
|
||||||
|
Ok(())
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn with_dir<F, T>(dir: &Path, f: F) -> Result<T, String>
|
||||||
|
where
|
||||||
|
F: FnOnce() -> Result<T, String>,
|
||||||
|
{
|
||||||
|
let prev = std::env::current_dir().map_err(|_| "Failed to get current dir".to_string())?;
|
||||||
|
std::env::set_current_dir(dir).map_err(|_| "Failed to change directory".to_string())?;
|
||||||
|
let result = f();
|
||||||
|
let _ = std::env::set_current_dir(prev);
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
fn normalize_target(target: &str) -> Option<&str> {
|
fn normalize_target(target: &str) -> Option<&str> {
|
||||||
let trimmed = target.trim();
|
let trimmed = target.trim();
|
||||||
if trimmed.is_empty() {
|
if trimmed.is_empty() {
|
||||||
@@ -195,3 +276,283 @@ fn normalize_platform(platform: &str) -> Option<&str> {
|
|||||||
Some(trimmed)
|
Some(trimmed)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn resolve_compiler(
|
||||||
|
language: &str,
|
||||||
|
compiler: &str,
|
||||||
|
tc_cc: Option<&str>,
|
||||||
|
tc_cxx: Option<&str>,
|
||||||
|
tc_as: Option<&str>,
|
||||||
|
) -> String {
|
||||||
|
let lang = language.to_lowercase();
|
||||||
|
env_override_compiler(&lang)
|
||||||
|
.or_else(|| toolchain_override_compiler(&lang, tc_cc, tc_cxx, tc_as))
|
||||||
|
.unwrap_or_else(|| compiler.to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn env_override_compiler(lang: &str) -> Option<String> {
|
||||||
|
if let Ok(value) = std::env::var("DCR_COMPILER") {
|
||||||
|
let trimmed = value.trim();
|
||||||
|
if !trimmed.is_empty() {
|
||||||
|
return Some(trimmed.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if lang == "asm" {
|
||||||
|
if let Ok(value) = std::env::var("DCR_AS") {
|
||||||
|
let trimmed = value.trim();
|
||||||
|
if !trimmed.is_empty() {
|
||||||
|
return Some(trimmed.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
if (lang == "c++" || lang == "cpp" || lang == "cxx")
|
||||||
|
&& let Ok(value) = std::env::var("DCR_CXX")
|
||||||
|
{
|
||||||
|
let trimmed = value.trim();
|
||||||
|
if !trimmed.is_empty() {
|
||||||
|
return Some(trimmed.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if let Ok(value) = std::env::var("DCR_CC") {
|
||||||
|
let trimmed = value.trim();
|
||||||
|
if !trimmed.is_empty() {
|
||||||
|
return Some(trimmed.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
fn toolchain_override_compiler(
|
||||||
|
lang: &str,
|
||||||
|
tc_cc: Option<&str>,
|
||||||
|
tc_cxx: Option<&str>,
|
||||||
|
tc_as: Option<&str>,
|
||||||
|
) -> Option<String> {
|
||||||
|
if lang == "asm" {
|
||||||
|
return tc_as.map(|v| v.to_string());
|
||||||
|
}
|
||||||
|
if (lang == "c++" || lang == "cpp" || lang == "cxx")
|
||||||
|
&& let Some(v) = tc_cxx
|
||||||
|
{
|
||||||
|
return Some(v.to_string());
|
||||||
|
}
|
||||||
|
tc_cc.map(|v| v.to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn resolve_tool(env_key: &str, fallback: Option<&str>) -> Option<String> {
|
||||||
|
if let Ok(value) = std::env::var(env_key) {
|
||||||
|
let trimmed = value.trim();
|
||||||
|
if !trimmed.is_empty() {
|
||||||
|
return Some(trimmed.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fallback.map(|v| v.to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn compute_build_fingerprint(
|
||||||
|
ctx: &BuildContext,
|
||||||
|
sources: &[String],
|
||||||
|
headers: &[std::path::PathBuf],
|
||||||
|
lib_files: &[std::path::PathBuf],
|
||||||
|
) -> Result<String, String> {
|
||||||
|
let mut hasher = Sha256::new();
|
||||||
|
hasher.update(ctx.profile.as_bytes());
|
||||||
|
hasher.update(ctx.project_name.as_bytes());
|
||||||
|
hasher.update(ctx.compiler.as_bytes());
|
||||||
|
hasher.update(ctx.language.as_bytes());
|
||||||
|
hasher.update(ctx.standard.as_bytes());
|
||||||
|
hasher.update(ctx.kind.as_bytes());
|
||||||
|
if let Some(v) = ctx.target_dir {
|
||||||
|
hasher.update(v.as_bytes());
|
||||||
|
}
|
||||||
|
if let Some(v) = ctx.platform {
|
||||||
|
hasher.update(v.as_bytes());
|
||||||
|
}
|
||||||
|
if let Some(v) = ctx.linker {
|
||||||
|
hasher.update(v.as_bytes());
|
||||||
|
}
|
||||||
|
if let Some(v) = ctx.archiver {
|
||||||
|
hasher.update(v.as_bytes());
|
||||||
|
}
|
||||||
|
for value in ctx.include_dirs {
|
||||||
|
hasher.update(value.as_bytes());
|
||||||
|
}
|
||||||
|
for value in ctx.lib_dirs {
|
||||||
|
hasher.update(value.as_bytes());
|
||||||
|
}
|
||||||
|
for value in ctx.libs {
|
||||||
|
hasher.update(value.as_bytes());
|
||||||
|
}
|
||||||
|
for value in ctx.cflags {
|
||||||
|
hasher.update(value.as_bytes());
|
||||||
|
}
|
||||||
|
for value in ctx.ldflags {
|
||||||
|
hasher.update(value.as_bytes());
|
||||||
|
}
|
||||||
|
let toml =
|
||||||
|
fs::read_to_string("dcr.toml").map_err(|err| format!("Failed to read dcr.toml: {err}"))?;
|
||||||
|
hasher.update(toml.as_bytes());
|
||||||
|
if let Ok(lock) = fs::read_to_string("dcr.lock") {
|
||||||
|
hasher.update(lock.as_bytes());
|
||||||
|
}
|
||||||
|
for source in sources {
|
||||||
|
let path = Path::new(source);
|
||||||
|
update_hasher_with_file(&mut hasher, path)?;
|
||||||
|
}
|
||||||
|
for header in headers {
|
||||||
|
update_hasher_with_file(&mut hasher, header)?;
|
||||||
|
}
|
||||||
|
for lib in lib_files {
|
||||||
|
update_hasher_with_file(&mut hasher, lib)?;
|
||||||
|
}
|
||||||
|
Ok(to_hex(&hasher.finalize()))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn should_skip_build(ctx: &BuildContext, fingerprint: &str) -> bool {
|
||||||
|
let output = build_output_path(ctx);
|
||||||
|
if !Path::new(&output).is_file() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
let cache_path = build_cache_path(ctx.profile, ctx.target_dir);
|
||||||
|
let cached = fs::read_to_string(cache_path).unwrap_or_default();
|
||||||
|
cached.trim() == fingerprint
|
||||||
|
}
|
||||||
|
|
||||||
|
fn write_build_fingerprint(ctx: &BuildContext, fingerprint: &str) -> Result<(), String> {
|
||||||
|
let cache_path = build_cache_path(ctx.profile, ctx.target_dir);
|
||||||
|
if let Some(parent) = cache_path.parent() {
|
||||||
|
fs::create_dir_all(parent).map_err(|err| format!("Failed to create cache dir: {err}"))?;
|
||||||
|
}
|
||||||
|
fs::write(cache_path, format!("{fingerprint}\n"))
|
||||||
|
.map_err(|err| format!("Failed to write cache: {err}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn build_cache_path(profile: &str, target_dir: Option<&str>) -> std::path::PathBuf {
|
||||||
|
match target_dir {
|
||||||
|
Some(dir) => Path::new(dir).join(format!(".dcr-build.{profile}.hash")),
|
||||||
|
None => Path::new("./target").join(profile).join(".dcr-build.hash"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn build_output_path(ctx: &BuildContext) -> String {
|
||||||
|
if ctx.kind == "staticlib" {
|
||||||
|
return crate::platform::lib_path(ctx.profile, ctx.project_name, ctx.target_dir);
|
||||||
|
}
|
||||||
|
if ctx.kind == "sharedlib" {
|
||||||
|
return crate::platform::shared_lib_path(ctx.profile, ctx.project_name, ctx.target_dir);
|
||||||
|
}
|
||||||
|
crate::platform::bin_path(ctx.profile, ctx.project_name, ctx.target_dir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn collect_header_files(
|
||||||
|
ctx: &BuildContext,
|
||||||
|
project_root: &Path,
|
||||||
|
) -> Result<Vec<std::path::PathBuf>, String> {
|
||||||
|
let mut out = Vec::new();
|
||||||
|
let mut roots = Vec::new();
|
||||||
|
roots.push(project_root.join("src"));
|
||||||
|
for dir in ctx.include_dirs {
|
||||||
|
roots.push(Path::new(dir).to_path_buf());
|
||||||
|
}
|
||||||
|
for root in roots {
|
||||||
|
if !root.exists() {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
collect_header_files_rec(&root, &mut out, ctx.exclude_dirs)?;
|
||||||
|
}
|
||||||
|
out.sort();
|
||||||
|
out.dedup();
|
||||||
|
Ok(out)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn collect_header_files_rec(
|
||||||
|
dir: &Path,
|
||||||
|
out: &mut Vec<std::path::PathBuf>,
|
||||||
|
exclude_dirs: &[std::path::PathBuf],
|
||||||
|
) -> Result<(), String> {
|
||||||
|
if is_excluded(dir, exclude_dirs) {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
for entry in fs::read_dir(dir).map_err(|err| format!("read_dir error: {err}"))? {
|
||||||
|
let entry = entry.map_err(|err| format!("read_dir error: {err}"))?;
|
||||||
|
let path = entry.path();
|
||||||
|
if path.is_dir() {
|
||||||
|
if is_excluded(&path, exclude_dirs) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
collect_header_files_rec(&path, out, exclude_dirs)?;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if !path.is_file() {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if is_header_file(&path) {
|
||||||
|
out.push(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn is_header_file(path: &Path) -> bool {
|
||||||
|
let ext = path.extension().and_then(|v| v.to_str()).unwrap_or("");
|
||||||
|
matches!(ext, "h" | "hpp" | "hh" | "hxx" | "inc")
|
||||||
|
}
|
||||||
|
|
||||||
|
fn collect_lib_files(ctx: &BuildContext) -> Vec<std::path::PathBuf> {
|
||||||
|
let mut out = Vec::new();
|
||||||
|
for dir in ctx.lib_dirs {
|
||||||
|
let dir_path = Path::new(dir);
|
||||||
|
for lib in ctx.libs {
|
||||||
|
for candidate in lib_candidates(lib) {
|
||||||
|
let path = dir_path.join(candidate);
|
||||||
|
if path.is_file() {
|
||||||
|
out.push(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
fn lib_candidates(name: &str) -> Vec<String> {
|
||||||
|
if cfg!(target_os = "windows") {
|
||||||
|
return vec![format!("{name}.lib")];
|
||||||
|
}
|
||||||
|
if cfg!(target_os = "macos") {
|
||||||
|
return vec![
|
||||||
|
format!("lib{name}.a"),
|
||||||
|
format!("lib{name}.dylib"),
|
||||||
|
format!("lib{name}.so"),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
vec![
|
||||||
|
format!("lib{name}.a"),
|
||||||
|
format!("lib{name}.so"),
|
||||||
|
format!("lib{name}.so.0"),
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
fn update_hasher_with_file(hasher: &mut Sha256, path: &Path) -> Result<(), String> {
|
||||||
|
hasher.update(path.to_string_lossy().as_bytes());
|
||||||
|
let meta = fs::metadata(path).map_err(|err| format!("source read error: {err}"))?;
|
||||||
|
hasher.update(meta.len().to_le_bytes());
|
||||||
|
if let Ok(modified) = meta.modified()
|
||||||
|
&& let Ok(duration) = modified.duration_since(std::time::UNIX_EPOCH)
|
||||||
|
{
|
||||||
|
hasher.update(duration.as_nanos().to_le_bytes());
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn is_excluded(path: &Path, exclude_dirs: &[std::path::PathBuf]) -> bool {
|
||||||
|
exclude_dirs.iter().any(|dir| path.starts_with(dir))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn to_hex(bytes: &[u8]) -> String {
|
||||||
|
let mut out = String::with_capacity(bytes.len() * 2);
|
||||||
|
for b in bytes {
|
||||||
|
out.push_str(&format!("{:02x}", b));
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|||||||
171
src/cli/clean.rs
171
src/cli/clean.rs
@@ -1,63 +1,138 @@
|
|||||||
use crate::config::flags;
|
use crate::config::flags;
|
||||||
use crate::utils::fs::check_dir;
|
use crate::core::config::Config;
|
||||||
|
use crate::core::workspace::parse_workspace;
|
||||||
|
use crate::utils::fs::{check_dir, find_project_root};
|
||||||
use crate::utils::log::{error, warn};
|
use crate::utils::log::{error, warn};
|
||||||
use crate::utils::text::{BOLD_GREEN, colored};
|
use crate::utils::text::{BOLD_GREEN, colored};
|
||||||
use std::fs;
|
use std::fs;
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
pub fn clean(args: &[String]) -> i32 {
|
pub fn clean(args: &[String]) -> i32 {
|
||||||
let project_name = std::env::current_dir()
|
let start_dir = match std::env::current_dir() {
|
||||||
.ok()
|
Ok(dir) => dir,
|
||||||
.and_then(|p| p.file_name().map(|v| v.to_string_lossy().to_string()))
|
Err(_) => {
|
||||||
.unwrap_or_else(|| "project".to_string());
|
error("Failed to determine current directory");
|
||||||
let items = check_dir(None).unwrap_or_default();
|
|
||||||
|
|
||||||
if args.len() > 1 {
|
|
||||||
error("Unknown argument");
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
if !items.contains(&"dcr.toml".to_string()) {
|
|
||||||
error("dcr.toml file not found");
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
println!(
|
|
||||||
" Cleaning project `{}`",
|
|
||||||
colored(&project_name, BOLD_GREEN)
|
|
||||||
);
|
|
||||||
if !items.contains(&"target".to_string()) {
|
|
||||||
warn("Directory target not found");
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(arg) = args.first() {
|
|
||||||
let mut profile = arg.clone();
|
|
||||||
if profile.starts_with("--") {
|
|
||||||
profile = profile.trim_start_matches("--").to_string();
|
|
||||||
}
|
|
||||||
if flags(&profile).is_none() {
|
|
||||||
error("Unknown profile");
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
};
|
||||||
let target_items = check_dir(Some("target")).unwrap_or_default();
|
let root = match find_project_root(&start_dir) {
|
||||||
if !target_items.contains(&profile) {
|
Ok(Some(dir)) => dir,
|
||||||
warn(&format!("Directory target/{profile} not found"));
|
Ok(None) => {
|
||||||
|
error("dcr.toml file not found");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
Err(_) => {
|
||||||
|
error("Failed to find project root");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let flags = match parse_clean_flags(args) {
|
||||||
|
Ok(v) => v,
|
||||||
|
Err(msg) => {
|
||||||
|
error(&msg);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
println!(" Profile: {}", colored(&profile, BOLD_GREEN));
|
match with_dir(&root, || clean_from_root(&root, &flags)) {
|
||||||
let _ = fs::remove_dir_all(format!("target/{profile}"));
|
Ok(()) => 0,
|
||||||
|
Err(msg) => {
|
||||||
|
error(&msg);
|
||||||
|
1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
struct CleanFlags {
|
||||||
|
profile: Option<String>,
|
||||||
|
all: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn parse_clean_flags(args: &[String]) -> Result<CleanFlags, String> {
|
||||||
|
let mut profile: Option<String> = None;
|
||||||
|
let mut all = false;
|
||||||
|
for arg in args {
|
||||||
|
if arg == "--all" {
|
||||||
|
all = true;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if arg.starts_with("--") {
|
||||||
|
let candidate = arg.trim_start_matches("--").to_string();
|
||||||
|
if flags(&candidate).is_some() {
|
||||||
|
if profile.is_some() {
|
||||||
|
return Err("Duplicate profile flag".to_string());
|
||||||
|
}
|
||||||
|
profile = Some(candidate);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Err("Unknown argument".to_string());
|
||||||
|
}
|
||||||
|
Ok(CleanFlags { profile, all })
|
||||||
|
}
|
||||||
|
|
||||||
|
fn clean_from_root(root: &Path, flags: &CleanFlags) -> Result<(), String> {
|
||||||
|
let config = Config::open("./dcr.toml").map_err(|err| err.to_string())?;
|
||||||
|
if flags.all
|
||||||
|
&& let Some(workspace) = parse_workspace(&config, root)?
|
||||||
|
{
|
||||||
|
for member in &workspace.members {
|
||||||
|
clean_project_at(&member.path, flags.profile.as_deref())?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
clean_project_at(root, flags.profile.as_deref())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn clean_project_at(project_root: &Path, profile: Option<&str>) -> Result<(), String> {
|
||||||
|
with_dir(project_root, || {
|
||||||
|
let project_name = std::env::current_dir()
|
||||||
|
.ok()
|
||||||
|
.and_then(|p| p.file_name().map(|v| v.to_string_lossy().to_string()))
|
||||||
|
.unwrap_or_else(|| "project".to_string());
|
||||||
|
let items = check_dir(None).map_err(|_| "Failed to read project directory".to_string())?;
|
||||||
|
if !items.contains(&"dcr.toml".to_string()) {
|
||||||
|
return Err("dcr.toml file not found".to_string());
|
||||||
|
}
|
||||||
println!(
|
println!(
|
||||||
"{} Removed directory target/{profile}",
|
" Cleaning project `{}`",
|
||||||
|
colored(&project_name, BOLD_GREEN)
|
||||||
|
);
|
||||||
|
if !items.contains(&"target".to_string()) {
|
||||||
|
warn("Directory target not found");
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(profile) = profile {
|
||||||
|
let target_items = check_dir(Some("target")).unwrap_or_default();
|
||||||
|
if !target_items.contains(&profile.to_string()) {
|
||||||
|
warn(&format!("Directory target/{profile} not found"));
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
println!(" Profile: {}", colored(profile, BOLD_GREEN));
|
||||||
|
let _ = fs::remove_dir_all(format!("target/{profile}"));
|
||||||
|
println!(
|
||||||
|
"{} Removed directory target/{profile}",
|
||||||
|
colored("\n ✔", BOLD_GREEN)
|
||||||
|
);
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
let _ = fs::remove_dir_all("target");
|
||||||
|
println!(
|
||||||
|
"{} Removed directory target",
|
||||||
colored("\n ✔", BOLD_GREEN)
|
colored("\n ✔", BOLD_GREEN)
|
||||||
);
|
);
|
||||||
return 0;
|
Ok(())
|
||||||
}
|
})
|
||||||
|
}
|
||||||
let _ = fs::remove_dir_all("target");
|
|
||||||
println!(
|
fn with_dir<F, T>(dir: &Path, f: F) -> Result<T, String>
|
||||||
"{} Removed directory target",
|
where
|
||||||
colored("\n ✔", BOLD_GREEN)
|
F: FnOnce() -> Result<T, String>,
|
||||||
);
|
{
|
||||||
0
|
let prev = std::env::current_dir().map_err(|_| "Failed to get current dir".to_string())?;
|
||||||
|
std::env::set_current_dir(dir).map_err(|_| "Failed to change directory".to_string())?;
|
||||||
|
let result = f();
|
||||||
|
let _ = std::env::set_current_dir(prev);
|
||||||
|
result
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,25 +2,40 @@ use crate::cli::build::build;
|
|||||||
use crate::config::{PROFILE, flags};
|
use crate::config::{PROFILE, flags};
|
||||||
use crate::core::config::Config;
|
use crate::core::config::Config;
|
||||||
use crate::core::runner::run_binary;
|
use crate::core::runner::run_binary;
|
||||||
use crate::utils::fs::check_dir;
|
use crate::utils::fs::find_project_root;
|
||||||
use crate::utils::log::{error, warn};
|
use crate::utils::log::{error, warn};
|
||||||
use crate::utils::text::{BOLD_GREEN, colored};
|
use crate::utils::text::{BOLD_GREEN, colored};
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
pub fn run(args: &[String]) -> i32 {
|
pub fn run(args: &[String]) -> i32 {
|
||||||
let mut active_profile = PROFILE.to_string();
|
let mut active_profile = PROFILE.to_string();
|
||||||
|
|
||||||
let items = check_dir(None).unwrap_or_default();
|
let start_dir = match std::env::current_dir() {
|
||||||
if !items.contains(&"dcr.toml".to_string()) {
|
Ok(dir) => dir,
|
||||||
error("dcr.toml file not found");
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
let config = match Config::open("./dcr.toml") {
|
|
||||||
Ok(cfg) => cfg,
|
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
|
error("Failed to determine current directory");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let root = match find_project_root(&start_dir) {
|
||||||
|
Ok(Some(dir)) => dir,
|
||||||
|
Ok(None) => {
|
||||||
error("dcr.toml file not found");
|
error("dcr.toml file not found");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
Err(_) => {
|
||||||
|
error("Failed to find project root");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let config = match with_dir(&root, || {
|
||||||
|
Config::open("./dcr.toml").map_err(|err| err.to_string())
|
||||||
|
}) {
|
||||||
|
Ok(cfg) => cfg,
|
||||||
|
Err(err) => {
|
||||||
|
error(&err);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
let project_name: &str = config
|
let project_name: &str = config
|
||||||
.get("package.name")
|
.get("package.name")
|
||||||
@@ -72,3 +87,14 @@ pub fn run(args: &[String]) -> i32 {
|
|||||||
error("Fix errors in the code to run the project");
|
error("Fix errors in the code to run the project");
|
||||||
1
|
1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn with_dir<F, T>(dir: &Path, f: F) -> Result<T, String>
|
||||||
|
where
|
||||||
|
F: FnOnce() -> Result<T, String>,
|
||||||
|
{
|
||||||
|
let prev = std::env::current_dir().map_err(|_| "Failed to get current dir".to_string())?;
|
||||||
|
std::env::set_current_dir(dir).map_err(|_| "Failed to change directory".to_string())?;
|
||||||
|
let result = f();
|
||||||
|
let _ = std::env::set_current_dir(prev);
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use crate::core::builder::BuildContext;
|
use crate::core::builder::BuildContext;
|
||||||
use crate::platform;
|
use crate::platform;
|
||||||
use std::fs;
|
use std::fs;
|
||||||
use std::path::Path;
|
use std::path::{Path, PathBuf};
|
||||||
use std::process::Command;
|
use std::process::Command;
|
||||||
use std::time::Instant;
|
use std::time::Instant;
|
||||||
|
|
||||||
@@ -12,13 +12,13 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
ctx.compiler
|
ctx.compiler
|
||||||
};
|
};
|
||||||
let start_time = Instant::now();
|
let start_time = Instant::now();
|
||||||
let sources = collect_sources(ctx.language)?;
|
let sources = collect_sources(ctx.language, ctx.exclude_dirs)?;
|
||||||
let obj_dir = Path::new("./target").join(ctx.profile).join("obj");
|
let obj_dir = Path::new("./target").join(ctx.profile).join("obj");
|
||||||
let objects = build_objects(compiler, &sources, &obj_dir, ctx, "o")?;
|
let objects = build_objects(compiler, &sources, &obj_dir, ctx, "o")?;
|
||||||
|
|
||||||
if ctx.kind == "staticlib" {
|
if ctx.kind == "staticlib" {
|
||||||
let lib_path = platform::lib_path(ctx.profile, ctx.project_name, ctx.target_dir);
|
let lib_path = platform::lib_path(ctx.profile, ctx.project_name, ctx.target_dir);
|
||||||
let mut cmd = Command::new("ar");
|
let mut cmd = Command::new(ctx.archiver.unwrap_or("ar"));
|
||||||
cmd.arg("rcs").arg(&lib_path);
|
cmd.arg("rcs").arg(&lib_path);
|
||||||
for obj in &objects {
|
for obj in &objects {
|
||||||
cmd.arg(obj);
|
cmd.arg(obj);
|
||||||
@@ -33,7 +33,7 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut cmd = Command::new(compiler);
|
let mut cmd = Command::new(ctx.linker.unwrap_or(compiler));
|
||||||
if ctx.kind == "sharedlib" {
|
if ctx.kind == "sharedlib" {
|
||||||
if cfg!(target_os = "macos") {
|
if cfg!(target_os = "macos") {
|
||||||
cmd.arg("-dynamiclib");
|
cmd.arg("-dynamiclib");
|
||||||
@@ -76,10 +76,13 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn collect_sources(language: &str) -> Result<Vec<String>, String> {
|
pub(crate) fn collect_sources(
|
||||||
|
language: &str,
|
||||||
|
exclude_dirs: &[PathBuf],
|
||||||
|
) -> Result<Vec<String>, String> {
|
||||||
let lang = language.to_lowercase();
|
let lang = language.to_lowercase();
|
||||||
let mut sources = Vec::new();
|
let mut sources = Vec::new();
|
||||||
collect_sources_rec("./src", &lang, &mut sources)?;
|
collect_sources_rec("./src", &lang, &mut sources, exclude_dirs)?;
|
||||||
sources.sort();
|
sources.sort();
|
||||||
if sources.is_empty() {
|
if sources.is_empty() {
|
||||||
return Err("No source files found in ./src".to_string());
|
return Err("No source files found in ./src".to_string());
|
||||||
@@ -87,13 +90,32 @@ fn collect_sources(language: &str) -> Result<Vec<String>, String> {
|
|||||||
Ok(sources)
|
Ok(sources)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn collect_sources_rec(dir: &str, lang: &str, out: &mut Vec<String>) -> Result<(), String> {
|
fn collect_sources_rec(
|
||||||
let entries = fs::read_dir(dir).map_err(|err| format!("src dir error: {err}"))?;
|
dir: &str,
|
||||||
|
lang: &str,
|
||||||
|
out: &mut Vec<String>,
|
||||||
|
exclude_dirs: &[PathBuf],
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let dir_path = Path::new(dir);
|
||||||
|
let full_dir = if dir_path.is_absolute() {
|
||||||
|
dir_path.to_path_buf()
|
||||||
|
} else {
|
||||||
|
std::env::current_dir()
|
||||||
|
.map_err(|err| format!("src dir error: {err}"))?
|
||||||
|
.join(dir_path)
|
||||||
|
};
|
||||||
|
if is_excluded(&full_dir, exclude_dirs) {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let entries = fs::read_dir(&full_dir).map_err(|err| format!("src dir error: {err}"))?;
|
||||||
for entry in entries {
|
for entry in entries {
|
||||||
let entry = entry.map_err(|err| format!("src dir error: {err}"))?;
|
let entry = entry.map_err(|err| format!("src dir error: {err}"))?;
|
||||||
let path = entry.path();
|
let path = entry.path();
|
||||||
if path.is_dir() {
|
if path.is_dir() {
|
||||||
collect_sources_rec(&path.to_string_lossy(), lang, out)?;
|
if is_excluded(&path, exclude_dirs) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
collect_sources_rec(&path.to_string_lossy(), lang, out, exclude_dirs)?;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if !path.is_file() {
|
if !path.is_file() {
|
||||||
@@ -104,7 +126,7 @@ fn collect_sources_rec(dir: &str, lang: &str, out: &mut Vec<String>) -> Result<(
|
|||||||
.and_then(|v| v.to_str())
|
.and_then(|v| v.to_str())
|
||||||
.unwrap_or("")
|
.unwrap_or("")
|
||||||
.to_lowercase();
|
.to_lowercase();
|
||||||
let file = path.to_string_lossy().to_string();
|
let file = normalize_source_path(&path);
|
||||||
let allowed = (lang == "c" && ext == "c")
|
let allowed = (lang == "c" && ext == "c")
|
||||||
|| ((lang == "c++" || lang == "cpp" || lang == "cxx")
|
|| ((lang == "c++" || lang == "cpp" || lang == "cxx")
|
||||||
&& (ext == "cpp" || ext == "cxx" || ext == "cc"))
|
&& (ext == "cpp" || ext == "cxx" || ext == "cc"))
|
||||||
@@ -116,6 +138,22 @@ fn collect_sources_rec(dir: &str, lang: &str, out: &mut Vec<String>) -> Result<(
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn is_excluded(path: &Path, exclude_dirs: &[PathBuf]) -> bool {
|
||||||
|
exclude_dirs.iter().any(|dir| path.starts_with(dir))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn normalize_source_path(path: &Path) -> String {
|
||||||
|
if !path.is_absolute() {
|
||||||
|
return path.to_string_lossy().to_string();
|
||||||
|
}
|
||||||
|
if let Ok(base) = std::env::current_dir()
|
||||||
|
&& let Ok(rel) = path.strip_prefix(&base)
|
||||||
|
{
|
||||||
|
return format!("./{}", rel.to_string_lossy());
|
||||||
|
}
|
||||||
|
path.to_string_lossy().to_string()
|
||||||
|
}
|
||||||
|
|
||||||
fn default_flags(profile: &str) -> &'static [&'static str] {
|
fn default_flags(profile: &str) -> &'static [&'static str] {
|
||||||
match profile {
|
match profile {
|
||||||
"release" => &["-O3", "-DNDEBUG", "-march=native"],
|
"release" => &["-O3", "-DNDEBUG", "-march=native"],
|
||||||
@@ -150,6 +188,9 @@ fn build_objects(
|
|||||||
if ctx.kind == "sharedlib" {
|
if ctx.kind == "sharedlib" {
|
||||||
cmd.arg("-fPIC");
|
cmd.arg("-fPIC");
|
||||||
}
|
}
|
||||||
|
if let Some(flag) = asm_lang_flag(source) {
|
||||||
|
cmd.arg("-x").arg(flag);
|
||||||
|
}
|
||||||
if let Some(platform) = ctx.platform
|
if let Some(platform) = ctx.platform
|
||||||
&& !platform.trim().is_empty()
|
&& !platform.trim().is_empty()
|
||||||
{
|
{
|
||||||
@@ -178,6 +219,15 @@ fn build_objects(
|
|||||||
Ok(objects)
|
Ok(objects)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn asm_lang_flag(source: &str) -> Option<&'static str> {
|
||||||
|
let ext = Path::new(source).extension().and_then(|v| v.to_str())?;
|
||||||
|
match ext {
|
||||||
|
"S" => Some("assembler-with-cpp"),
|
||||||
|
"s" | "asm" => Some("assembler"),
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn object_path(obj_dir: &Path, source: &str, obj_ext: &str) -> String {
|
fn object_path(obj_dir: &Path, source: &str, obj_ext: &str) -> String {
|
||||||
let src_path = Path::new(source);
|
let src_path = Path::new(source);
|
||||||
let rel = src_path
|
let rel = src_path
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use crate::core::builder::BuildContext;
|
use crate::core::builder::BuildContext;
|
||||||
use crate::platform;
|
use crate::platform;
|
||||||
use std::fs;
|
use std::fs;
|
||||||
use std::path::Path;
|
use std::path::{Path, PathBuf};
|
||||||
use std::process::Command;
|
use std::process::Command;
|
||||||
use std::time::Instant;
|
use std::time::Instant;
|
||||||
|
|
||||||
@@ -15,18 +15,19 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
ctx.compiler
|
ctx.compiler
|
||||||
};
|
};
|
||||||
let start_time = Instant::now();
|
let start_time = Instant::now();
|
||||||
let sources = collect_sources(ctx.language)?;
|
let sources = collect_sources(ctx.language, ctx.exclude_dirs)?;
|
||||||
let obj_dir = Path::new("./target").join(ctx.profile).join("obj");
|
let obj_dir = Path::new("./target").join(ctx.profile).join("obj");
|
||||||
let objects = build_objects(assembler, &sources, &obj_dir, ctx, "o")?;
|
let objects = build_objects(assembler, &sources, &obj_dir, ctx, "o")?;
|
||||||
|
|
||||||
if ctx.kind == "staticlib" {
|
if ctx.kind == "staticlib" {
|
||||||
let lib_path = platform::lib_path(ctx.profile, ctx.project_name, ctx.target_dir);
|
let lib_path = platform::lib_path(ctx.profile, ctx.project_name, ctx.target_dir);
|
||||||
let mut cmd = Command::new(if cfg!(target_os = "windows") {
|
let archiver = ctx.archiver.unwrap_or(if cfg!(target_os = "windows") {
|
||||||
"lib"
|
"lib"
|
||||||
} else {
|
} else {
|
||||||
"ar"
|
"ar"
|
||||||
});
|
});
|
||||||
if cfg!(target_os = "windows") {
|
let mut cmd = Command::new(archiver);
|
||||||
|
if cfg!(target_os = "windows") && archiver == "lib" {
|
||||||
cmd.arg("/nologo").arg(format!("/OUT:{lib_path}"));
|
cmd.arg("/nologo").arg(format!("/OUT:{lib_path}"));
|
||||||
} else {
|
} else {
|
||||||
cmd.arg("rcs").arg(&lib_path);
|
cmd.arg("rcs").arg(&lib_path);
|
||||||
@@ -44,7 +45,7 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut cmd = Command::new("cc");
|
let mut cmd = Command::new(ctx.linker.unwrap_or("cc"));
|
||||||
if ctx.kind == "sharedlib" {
|
if ctx.kind == "sharedlib" {
|
||||||
if cfg!(target_os = "macos") {
|
if cfg!(target_os = "macos") {
|
||||||
cmd.arg("-dynamiclib");
|
cmd.arg("-dynamiclib");
|
||||||
@@ -81,10 +82,13 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn collect_sources(language: &str) -> Result<Vec<String>, String> {
|
pub(crate) fn collect_sources(
|
||||||
|
language: &str,
|
||||||
|
exclude_dirs: &[PathBuf],
|
||||||
|
) -> Result<Vec<String>, String> {
|
||||||
let lang = language.to_lowercase();
|
let lang = language.to_lowercase();
|
||||||
let mut sources = Vec::new();
|
let mut sources = Vec::new();
|
||||||
collect_sources_rec("./src", &lang, &mut sources)?;
|
collect_sources_rec("./src", &lang, &mut sources, exclude_dirs)?;
|
||||||
sources.sort();
|
sources.sort();
|
||||||
if sources.is_empty() {
|
if sources.is_empty() {
|
||||||
return Err("No source files found in ./src".to_string());
|
return Err("No source files found in ./src".to_string());
|
||||||
@@ -92,13 +96,32 @@ fn collect_sources(language: &str) -> Result<Vec<String>, String> {
|
|||||||
Ok(sources)
|
Ok(sources)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn collect_sources_rec(dir: &str, lang: &str, out: &mut Vec<String>) -> Result<(), String> {
|
fn collect_sources_rec(
|
||||||
let entries = fs::read_dir(dir).map_err(|err| format!("src dir error: {err}"))?;
|
dir: &str,
|
||||||
|
lang: &str,
|
||||||
|
out: &mut Vec<String>,
|
||||||
|
exclude_dirs: &[PathBuf],
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let dir_path = Path::new(dir);
|
||||||
|
let full_dir = if dir_path.is_absolute() {
|
||||||
|
dir_path.to_path_buf()
|
||||||
|
} else {
|
||||||
|
std::env::current_dir()
|
||||||
|
.map_err(|err| format!("src dir error: {err}"))?
|
||||||
|
.join(dir_path)
|
||||||
|
};
|
||||||
|
if is_excluded(&full_dir, exclude_dirs) {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let entries = fs::read_dir(&full_dir).map_err(|err| format!("src dir error: {err}"))?;
|
||||||
for entry in entries {
|
for entry in entries {
|
||||||
let entry = entry.map_err(|err| format!("src dir error: {err}"))?;
|
let entry = entry.map_err(|err| format!("src dir error: {err}"))?;
|
||||||
let path = entry.path();
|
let path = entry.path();
|
||||||
if path.is_dir() {
|
if path.is_dir() {
|
||||||
collect_sources_rec(&path.to_string_lossy(), lang, out)?;
|
if is_excluded(&path, exclude_dirs) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
collect_sources_rec(&path.to_string_lossy(), lang, out, exclude_dirs)?;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if !path.is_file() {
|
if !path.is_file() {
|
||||||
@@ -106,7 +129,7 @@ fn collect_sources_rec(dir: &str, lang: &str, out: &mut Vec<String>) -> Result<(
|
|||||||
}
|
}
|
||||||
let ext_raw = path.extension().and_then(|v| v.to_str()).unwrap_or("");
|
let ext_raw = path.extension().and_then(|v| v.to_str()).unwrap_or("");
|
||||||
let ext = ext_raw.to_lowercase();
|
let ext = ext_raw.to_lowercase();
|
||||||
let file = path.to_string_lossy().to_string();
|
let file = normalize_source_path(&path);
|
||||||
let allowed = lang == "asm" && ext == "s" && ext_raw == "s";
|
let allowed = lang == "asm" && ext == "s" && ext_raw == "s";
|
||||||
if allowed {
|
if allowed {
|
||||||
out.push(file);
|
out.push(file);
|
||||||
@@ -115,6 +138,22 @@ fn collect_sources_rec(dir: &str, lang: &str, out: &mut Vec<String>) -> Result<(
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn is_excluded(path: &Path, exclude_dirs: &[PathBuf]) -> bool {
|
||||||
|
exclude_dirs.iter().any(|dir| path.starts_with(dir))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn normalize_source_path(path: &Path) -> String {
|
||||||
|
if !path.is_absolute() {
|
||||||
|
return path.to_string_lossy().to_string();
|
||||||
|
}
|
||||||
|
if let Ok(base) = std::env::current_dir()
|
||||||
|
&& let Ok(rel) = path.strip_prefix(&base)
|
||||||
|
{
|
||||||
|
return format!("./{}", rel.to_string_lossy());
|
||||||
|
}
|
||||||
|
path.to_string_lossy().to_string()
|
||||||
|
}
|
||||||
|
|
||||||
fn build_objects(
|
fn build_objects(
|
||||||
assembler: &str,
|
assembler: &str,
|
||||||
sources: &[String],
|
sources: &[String],
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use crate::core::builder::BuildContext;
|
use crate::core::builder::BuildContext;
|
||||||
use crate::platform;
|
use crate::platform;
|
||||||
use std::fs;
|
use std::fs;
|
||||||
use std::path::Path;
|
use std::path::{Path, PathBuf};
|
||||||
use std::process::Command;
|
use std::process::Command;
|
||||||
use std::time::Instant;
|
use std::time::Instant;
|
||||||
|
|
||||||
@@ -12,13 +12,13 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
ctx.compiler
|
ctx.compiler
|
||||||
};
|
};
|
||||||
let start_time = Instant::now();
|
let start_time = Instant::now();
|
||||||
let sources = collect_sources(ctx.language)?;
|
let sources = collect_sources(ctx.language, ctx.exclude_dirs)?;
|
||||||
let obj_dir = Path::new("./target").join(ctx.profile).join("obj");
|
let obj_dir = Path::new("./target").join(ctx.profile).join("obj");
|
||||||
let objects = build_objects(compiler, &sources, &obj_dir, ctx, "o")?;
|
let objects = build_objects(compiler, &sources, &obj_dir, ctx, "o")?;
|
||||||
|
|
||||||
if ctx.kind == "staticlib" {
|
if ctx.kind == "staticlib" {
|
||||||
let lib_path = platform::lib_path(ctx.profile, ctx.project_name, ctx.target_dir);
|
let lib_path = platform::lib_path(ctx.profile, ctx.project_name, ctx.target_dir);
|
||||||
let mut cmd = Command::new("ar");
|
let mut cmd = Command::new(ctx.archiver.unwrap_or("ar"));
|
||||||
cmd.arg("rcs").arg(&lib_path);
|
cmd.arg("rcs").arg(&lib_path);
|
||||||
for obj in &objects {
|
for obj in &objects {
|
||||||
cmd.arg(obj);
|
cmd.arg(obj);
|
||||||
@@ -33,7 +33,7 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut cmd = Command::new(compiler);
|
let mut cmd = Command::new(ctx.linker.unwrap_or(compiler));
|
||||||
if ctx.kind == "sharedlib" {
|
if ctx.kind == "sharedlib" {
|
||||||
if cfg!(target_os = "macos") {
|
if cfg!(target_os = "macos") {
|
||||||
cmd.arg("-dynamiclib");
|
cmd.arg("-dynamiclib");
|
||||||
@@ -76,10 +76,13 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn collect_sources(language: &str) -> Result<Vec<String>, String> {
|
pub(crate) fn collect_sources(
|
||||||
|
language: &str,
|
||||||
|
exclude_dirs: &[PathBuf],
|
||||||
|
) -> Result<Vec<String>, String> {
|
||||||
let lang = language.to_lowercase();
|
let lang = language.to_lowercase();
|
||||||
let mut sources = Vec::new();
|
let mut sources = Vec::new();
|
||||||
collect_sources_rec("./src", &lang, &mut sources)?;
|
collect_sources_rec("./src", &lang, &mut sources, exclude_dirs)?;
|
||||||
sources.sort();
|
sources.sort();
|
||||||
if sources.is_empty() {
|
if sources.is_empty() {
|
||||||
return Err("No source files found in ./src".to_string());
|
return Err("No source files found in ./src".to_string());
|
||||||
@@ -87,13 +90,32 @@ fn collect_sources(language: &str) -> Result<Vec<String>, String> {
|
|||||||
Ok(sources)
|
Ok(sources)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn collect_sources_rec(dir: &str, lang: &str, out: &mut Vec<String>) -> Result<(), String> {
|
fn collect_sources_rec(
|
||||||
let entries = fs::read_dir(dir).map_err(|err| format!("src dir error: {err}"))?;
|
dir: &str,
|
||||||
|
lang: &str,
|
||||||
|
out: &mut Vec<String>,
|
||||||
|
exclude_dirs: &[PathBuf],
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let dir_path = Path::new(dir);
|
||||||
|
let full_dir = if dir_path.is_absolute() {
|
||||||
|
dir_path.to_path_buf()
|
||||||
|
} else {
|
||||||
|
std::env::current_dir()
|
||||||
|
.map_err(|err| format!("src dir error: {err}"))?
|
||||||
|
.join(dir_path)
|
||||||
|
};
|
||||||
|
if is_excluded(&full_dir, exclude_dirs) {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let entries = fs::read_dir(&full_dir).map_err(|err| format!("src dir error: {err}"))?;
|
||||||
for entry in entries {
|
for entry in entries {
|
||||||
let entry = entry.map_err(|err| format!("src dir error: {err}"))?;
|
let entry = entry.map_err(|err| format!("src dir error: {err}"))?;
|
||||||
let path = entry.path();
|
let path = entry.path();
|
||||||
if path.is_dir() {
|
if path.is_dir() {
|
||||||
collect_sources_rec(&path.to_string_lossy(), lang, out)?;
|
if is_excluded(&path, exclude_dirs) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
collect_sources_rec(&path.to_string_lossy(), lang, out, exclude_dirs)?;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if !path.is_file() {
|
if !path.is_file() {
|
||||||
@@ -104,7 +126,7 @@ fn collect_sources_rec(dir: &str, lang: &str, out: &mut Vec<String>) -> Result<(
|
|||||||
.and_then(|v| v.to_str())
|
.and_then(|v| v.to_str())
|
||||||
.unwrap_or("")
|
.unwrap_or("")
|
||||||
.to_lowercase();
|
.to_lowercase();
|
||||||
let file = path.to_string_lossy().to_string();
|
let file = normalize_source_path(&path);
|
||||||
let allowed = (lang == "c" && ext == "c")
|
let allowed = (lang == "c" && ext == "c")
|
||||||
|| ((lang == "c++" || lang == "cpp" || lang == "cxx")
|
|| ((lang == "c++" || lang == "cpp" || lang == "cxx")
|
||||||
&& (ext == "cpp" || ext == "cxx" || ext == "cc"))
|
&& (ext == "cpp" || ext == "cxx" || ext == "cc"))
|
||||||
@@ -116,6 +138,22 @@ fn collect_sources_rec(dir: &str, lang: &str, out: &mut Vec<String>) -> Result<(
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn is_excluded(path: &Path, exclude_dirs: &[PathBuf]) -> bool {
|
||||||
|
exclude_dirs.iter().any(|dir| path.starts_with(dir))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn normalize_source_path(path: &Path) -> String {
|
||||||
|
if !path.is_absolute() {
|
||||||
|
return path.to_string_lossy().to_string();
|
||||||
|
}
|
||||||
|
if let Ok(base) = std::env::current_dir()
|
||||||
|
&& let Ok(rel) = path.strip_prefix(&base)
|
||||||
|
{
|
||||||
|
return format!("./{}", rel.to_string_lossy());
|
||||||
|
}
|
||||||
|
path.to_string_lossy().to_string()
|
||||||
|
}
|
||||||
|
|
||||||
fn default_flags(profile: &str) -> &'static [&'static str] {
|
fn default_flags(profile: &str) -> &'static [&'static str] {
|
||||||
match profile {
|
match profile {
|
||||||
"release" => &["-O3", "-DNDEBUG", "-march=native"],
|
"release" => &["-O3", "-DNDEBUG", "-march=native"],
|
||||||
@@ -150,6 +188,9 @@ fn build_objects(
|
|||||||
if ctx.kind == "sharedlib" {
|
if ctx.kind == "sharedlib" {
|
||||||
cmd.arg("-fPIC");
|
cmd.arg("-fPIC");
|
||||||
}
|
}
|
||||||
|
if let Some(flag) = asm_lang_flag(source) {
|
||||||
|
cmd.arg("-x").arg(flag);
|
||||||
|
}
|
||||||
if let Some(platform) = ctx.platform
|
if let Some(platform) = ctx.platform
|
||||||
&& !platform.trim().is_empty()
|
&& !platform.trim().is_empty()
|
||||||
{
|
{
|
||||||
@@ -178,6 +219,15 @@ fn build_objects(
|
|||||||
Ok(objects)
|
Ok(objects)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn asm_lang_flag(source: &str) -> Option<&'static str> {
|
||||||
|
let ext = Path::new(source).extension().and_then(|v| v.to_str())?;
|
||||||
|
match ext {
|
||||||
|
"S" => Some("assembler-with-cpp"),
|
||||||
|
"s" | "asm" => Some("assembler"),
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn object_path(obj_dir: &Path, source: &str, obj_ext: &str) -> String {
|
fn object_path(obj_dir: &Path, source: &str, obj_ext: &str) -> String {
|
||||||
let src_path = Path::new(source);
|
let src_path = Path::new(source);
|
||||||
let rel = src_path
|
let rel = src_path
|
||||||
|
|||||||
@@ -13,6 +13,9 @@ pub struct BuildContext<'a> {
|
|||||||
pub target_dir: Option<&'a str>,
|
pub target_dir: Option<&'a str>,
|
||||||
pub kind: &'a str,
|
pub kind: &'a str,
|
||||||
pub platform: Option<&'a str>,
|
pub platform: Option<&'a str>,
|
||||||
|
pub linker: Option<&'a str>,
|
||||||
|
pub archiver: Option<&'a str>,
|
||||||
|
pub exclude_dirs: &'a [std::path::PathBuf],
|
||||||
pub include_dirs: &'a [String],
|
pub include_dirs: &'a [String],
|
||||||
pub lib_dirs: &'a [String],
|
pub lib_dirs: &'a [String],
|
||||||
pub libs: &'a [String],
|
pub libs: &'a [String],
|
||||||
@@ -42,3 +45,26 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
}
|
}
|
||||||
clang::build(ctx)
|
clang::build(ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn collect_sources(ctx: &BuildContext) -> Result<Vec<String>, String> {
|
||||||
|
let compiler = ctx.compiler.to_lowercase();
|
||||||
|
if compiler.contains("clang-cl") {
|
||||||
|
return msvc::collect_sources(ctx.language, ctx.exclude_dirs);
|
||||||
|
}
|
||||||
|
if compiler == "as" || compiler.contains("gas") {
|
||||||
|
return gas::collect_sources(ctx.language, ctx.exclude_dirs);
|
||||||
|
}
|
||||||
|
if compiler.contains("nasm") {
|
||||||
|
return nasm::collect_sources(ctx.language, ctx.exclude_dirs);
|
||||||
|
}
|
||||||
|
if compiler.contains("gcc") || compiler.contains("g++") {
|
||||||
|
return gcc::collect_sources(ctx.language, ctx.exclude_dirs);
|
||||||
|
}
|
||||||
|
if compiler.contains("clang") || compiler.contains("clang++") {
|
||||||
|
return clang::collect_sources(ctx.language, ctx.exclude_dirs);
|
||||||
|
}
|
||||||
|
if compiler == "cl" || compiler.contains("msvc") {
|
||||||
|
return msvc::collect_sources(ctx.language, ctx.exclude_dirs);
|
||||||
|
}
|
||||||
|
clang::collect_sources(ctx.language, ctx.exclude_dirs)
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use crate::core::builder::BuildContext;
|
use crate::core::builder::BuildContext;
|
||||||
use crate::platform;
|
use crate::platform;
|
||||||
use std::fs;
|
use std::fs;
|
||||||
use std::path::Path;
|
use std::path::{Path, PathBuf};
|
||||||
use std::process::Command;
|
use std::process::Command;
|
||||||
use std::time::Instant;
|
use std::time::Instant;
|
||||||
|
|
||||||
@@ -15,13 +15,13 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
return Err("MSVC backend does not support build.language = \"asm\"".to_string());
|
return Err("MSVC backend does not support build.language = \"asm\"".to_string());
|
||||||
}
|
}
|
||||||
let start_time = Instant::now();
|
let start_time = Instant::now();
|
||||||
let sources = collect_sources(ctx.language)?;
|
let sources = collect_sources(ctx.language, ctx.exclude_dirs)?;
|
||||||
let obj_dir = Path::new("./target").join(ctx.profile).join("obj");
|
let obj_dir = Path::new("./target").join(ctx.profile).join("obj");
|
||||||
let objects = build_objects(compiler, &sources, &obj_dir, ctx, "obj")?;
|
let objects = build_objects(compiler, &sources, &obj_dir, ctx, "obj")?;
|
||||||
|
|
||||||
if ctx.kind == "staticlib" {
|
if ctx.kind == "staticlib" {
|
||||||
let lib_path = platform::lib_path(ctx.profile, ctx.project_name, ctx.target_dir);
|
let lib_path = platform::lib_path(ctx.profile, ctx.project_name, ctx.target_dir);
|
||||||
let mut cmd = Command::new("lib");
|
let mut cmd = Command::new(ctx.archiver.unwrap_or("lib"));
|
||||||
cmd.arg("/nologo").arg(format!("/OUT:{lib_path}"));
|
cmd.arg("/nologo").arg(format!("/OUT:{lib_path}"));
|
||||||
for obj in &objects {
|
for obj in &objects {
|
||||||
cmd.arg(obj);
|
cmd.arg(obj);
|
||||||
@@ -100,10 +100,13 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn collect_sources(language: &str) -> Result<Vec<String>, String> {
|
pub(crate) fn collect_sources(
|
||||||
|
language: &str,
|
||||||
|
exclude_dirs: &[PathBuf],
|
||||||
|
) -> Result<Vec<String>, String> {
|
||||||
let lang = language.to_lowercase();
|
let lang = language.to_lowercase();
|
||||||
let mut sources = Vec::new();
|
let mut sources = Vec::new();
|
||||||
collect_sources_rec("./src", &lang, &mut sources)?;
|
collect_sources_rec("./src", &lang, &mut sources, exclude_dirs)?;
|
||||||
sources.sort();
|
sources.sort();
|
||||||
if sources.is_empty() {
|
if sources.is_empty() {
|
||||||
return Err("No source files found in ./src".to_string());
|
return Err("No source files found in ./src".to_string());
|
||||||
@@ -111,13 +114,32 @@ fn collect_sources(language: &str) -> Result<Vec<String>, String> {
|
|||||||
Ok(sources)
|
Ok(sources)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn collect_sources_rec(dir: &str, lang: &str, out: &mut Vec<String>) -> Result<(), String> {
|
fn collect_sources_rec(
|
||||||
let entries = fs::read_dir(dir).map_err(|err| format!("src dir error: {err}"))?;
|
dir: &str,
|
||||||
|
lang: &str,
|
||||||
|
out: &mut Vec<String>,
|
||||||
|
exclude_dirs: &[PathBuf],
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let dir_path = Path::new(dir);
|
||||||
|
let full_dir = if dir_path.is_absolute() {
|
||||||
|
dir_path.to_path_buf()
|
||||||
|
} else {
|
||||||
|
std::env::current_dir()
|
||||||
|
.map_err(|err| format!("src dir error: {err}"))?
|
||||||
|
.join(dir_path)
|
||||||
|
};
|
||||||
|
if is_excluded(&full_dir, exclude_dirs) {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let entries = fs::read_dir(&full_dir).map_err(|err| format!("src dir error: {err}"))?;
|
||||||
for entry in entries {
|
for entry in entries {
|
||||||
let entry = entry.map_err(|err| format!("src dir error: {err}"))?;
|
let entry = entry.map_err(|err| format!("src dir error: {err}"))?;
|
||||||
let path = entry.path();
|
let path = entry.path();
|
||||||
if path.is_dir() {
|
if path.is_dir() {
|
||||||
collect_sources_rec(&path.to_string_lossy(), lang, out)?;
|
if is_excluded(&path, exclude_dirs) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
collect_sources_rec(&path.to_string_lossy(), lang, out, exclude_dirs)?;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if !path.is_file() {
|
if !path.is_file() {
|
||||||
@@ -128,7 +150,7 @@ fn collect_sources_rec(dir: &str, lang: &str, out: &mut Vec<String>) -> Result<(
|
|||||||
.and_then(|v| v.to_str())
|
.and_then(|v| v.to_str())
|
||||||
.unwrap_or("")
|
.unwrap_or("")
|
||||||
.to_lowercase();
|
.to_lowercase();
|
||||||
let file = path.to_string_lossy().to_string();
|
let file = normalize_source_path(&path);
|
||||||
let allowed = (lang == "c" && ext == "c")
|
let allowed = (lang == "c" && ext == "c")
|
||||||
|| ((lang == "c++" || lang == "cpp" || lang == "cxx")
|
|| ((lang == "c++" || lang == "cpp" || lang == "cxx")
|
||||||
&& (ext == "cpp" || ext == "cxx" || ext == "cc"))
|
&& (ext == "cpp" || ext == "cxx" || ext == "cc"))
|
||||||
@@ -140,6 +162,22 @@ fn collect_sources_rec(dir: &str, lang: &str, out: &mut Vec<String>) -> Result<(
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn is_excluded(path: &Path, exclude_dirs: &[PathBuf]) -> bool {
|
||||||
|
exclude_dirs.iter().any(|dir| path.starts_with(dir))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn normalize_source_path(path: &Path) -> String {
|
||||||
|
if !path.is_absolute() {
|
||||||
|
return path.to_string_lossy().to_string();
|
||||||
|
}
|
||||||
|
if let Ok(base) = std::env::current_dir()
|
||||||
|
&& let Ok(rel) = path.strip_prefix(&base)
|
||||||
|
{
|
||||||
|
return format!("./{}", rel.to_string_lossy());
|
||||||
|
}
|
||||||
|
path.to_string_lossy().to_string()
|
||||||
|
}
|
||||||
|
|
||||||
fn msvc_standard_flag(language: &str, standard: &str) -> Result<String, String> {
|
fn msvc_standard_flag(language: &str, standard: &str) -> Result<String, String> {
|
||||||
let lang = language.to_lowercase();
|
let lang = language.to_lowercase();
|
||||||
let std = standard.to_lowercase();
|
let std = standard.to_lowercase();
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use crate::core::builder::BuildContext;
|
use crate::core::builder::BuildContext;
|
||||||
use crate::platform;
|
use crate::platform;
|
||||||
use std::fs;
|
use std::fs;
|
||||||
use std::path::Path;
|
use std::path::{Path, PathBuf};
|
||||||
use std::process::Command;
|
use std::process::Command;
|
||||||
use std::time::Instant;
|
use std::time::Instant;
|
||||||
|
|
||||||
@@ -15,18 +15,19 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
ctx.compiler
|
ctx.compiler
|
||||||
};
|
};
|
||||||
let start_time = Instant::now();
|
let start_time = Instant::now();
|
||||||
let sources = collect_sources(ctx.language)?;
|
let sources = collect_sources(ctx.language, ctx.exclude_dirs)?;
|
||||||
let obj_dir = Path::new("./target").join(ctx.profile).join("obj");
|
let obj_dir = Path::new("./target").join(ctx.profile).join("obj");
|
||||||
let objects = build_objects(assembler, &sources, &obj_dir, ctx, "o")?;
|
let objects = build_objects(assembler, &sources, &obj_dir, ctx, "o")?;
|
||||||
|
|
||||||
if ctx.kind == "staticlib" {
|
if ctx.kind == "staticlib" {
|
||||||
let lib_path = platform::lib_path(ctx.profile, ctx.project_name, ctx.target_dir);
|
let lib_path = platform::lib_path(ctx.profile, ctx.project_name, ctx.target_dir);
|
||||||
let mut cmd = Command::new(if cfg!(target_os = "windows") {
|
let archiver = ctx.archiver.unwrap_or(if cfg!(target_os = "windows") {
|
||||||
"lib"
|
"lib"
|
||||||
} else {
|
} else {
|
||||||
"ar"
|
"ar"
|
||||||
});
|
});
|
||||||
if cfg!(target_os = "windows") {
|
let mut cmd = Command::new(archiver);
|
||||||
|
if cfg!(target_os = "windows") && archiver == "lib" {
|
||||||
cmd.arg("/nologo").arg(format!("/OUT:{lib_path}"));
|
cmd.arg("/nologo").arg(format!("/OUT:{lib_path}"));
|
||||||
} else {
|
} else {
|
||||||
cmd.arg("rcs").arg(&lib_path);
|
cmd.arg("rcs").arg(&lib_path);
|
||||||
@@ -44,8 +45,7 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let linker = "cc";
|
let mut cmd = Command::new(ctx.linker.unwrap_or("cc"));
|
||||||
let mut cmd = Command::new(linker);
|
|
||||||
if ctx.kind == "sharedlib" {
|
if ctx.kind == "sharedlib" {
|
||||||
if cfg!(target_os = "macos") {
|
if cfg!(target_os = "macos") {
|
||||||
cmd.arg("-dynamiclib");
|
cmd.arg("-dynamiclib");
|
||||||
@@ -82,10 +82,13 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn collect_sources(language: &str) -> Result<Vec<String>, String> {
|
pub(crate) fn collect_sources(
|
||||||
|
language: &str,
|
||||||
|
exclude_dirs: &[PathBuf],
|
||||||
|
) -> Result<Vec<String>, String> {
|
||||||
let lang = language.to_lowercase();
|
let lang = language.to_lowercase();
|
||||||
let mut sources = Vec::new();
|
let mut sources = Vec::new();
|
||||||
collect_sources_rec("./src", &lang, &mut sources)?;
|
collect_sources_rec("./src", &lang, &mut sources, exclude_dirs)?;
|
||||||
sources.sort();
|
sources.sort();
|
||||||
if sources.is_empty() {
|
if sources.is_empty() {
|
||||||
return Err("No source files found in ./src".to_string());
|
return Err("No source files found in ./src".to_string());
|
||||||
@@ -93,13 +96,32 @@ fn collect_sources(language: &str) -> Result<Vec<String>, String> {
|
|||||||
Ok(sources)
|
Ok(sources)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn collect_sources_rec(dir: &str, lang: &str, out: &mut Vec<String>) -> Result<(), String> {
|
fn collect_sources_rec(
|
||||||
let entries = fs::read_dir(dir).map_err(|err| format!("src dir error: {err}"))?;
|
dir: &str,
|
||||||
|
lang: &str,
|
||||||
|
out: &mut Vec<String>,
|
||||||
|
exclude_dirs: &[PathBuf],
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let dir_path = Path::new(dir);
|
||||||
|
let full_dir = if dir_path.is_absolute() {
|
||||||
|
dir_path.to_path_buf()
|
||||||
|
} else {
|
||||||
|
std::env::current_dir()
|
||||||
|
.map_err(|err| format!("src dir error: {err}"))?
|
||||||
|
.join(dir_path)
|
||||||
|
};
|
||||||
|
if is_excluded(&full_dir, exclude_dirs) {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let entries = fs::read_dir(&full_dir).map_err(|err| format!("src dir error: {err}"))?;
|
||||||
for entry in entries {
|
for entry in entries {
|
||||||
let entry = entry.map_err(|err| format!("src dir error: {err}"))?;
|
let entry = entry.map_err(|err| format!("src dir error: {err}"))?;
|
||||||
let path = entry.path();
|
let path = entry.path();
|
||||||
if path.is_dir() {
|
if path.is_dir() {
|
||||||
collect_sources_rec(&path.to_string_lossy(), lang, out)?;
|
if is_excluded(&path, exclude_dirs) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
collect_sources_rec(&path.to_string_lossy(), lang, out, exclude_dirs)?;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if !path.is_file() {
|
if !path.is_file() {
|
||||||
@@ -107,7 +129,7 @@ fn collect_sources_rec(dir: &str, lang: &str, out: &mut Vec<String>) -> Result<(
|
|||||||
}
|
}
|
||||||
let ext_raw = path.extension().and_then(|v| v.to_str()).unwrap_or("");
|
let ext_raw = path.extension().and_then(|v| v.to_str()).unwrap_or("");
|
||||||
let ext = ext_raw.to_lowercase();
|
let ext = ext_raw.to_lowercase();
|
||||||
let file = path.to_string_lossy().to_string();
|
let file = normalize_source_path(&path);
|
||||||
let allowed = lang == "asm" && (ext == "asm" || (ext == "s" && ext_raw == "s"));
|
let allowed = lang == "asm" && (ext == "asm" || (ext == "s" && ext_raw == "s"));
|
||||||
if allowed {
|
if allowed {
|
||||||
out.push(file);
|
out.push(file);
|
||||||
@@ -116,6 +138,22 @@ fn collect_sources_rec(dir: &str, lang: &str, out: &mut Vec<String>) -> Result<(
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn is_excluded(path: &Path, exclude_dirs: &[PathBuf]) -> bool {
|
||||||
|
exclude_dirs.iter().any(|dir| path.starts_with(dir))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn normalize_source_path(path: &Path) -> String {
|
||||||
|
if !path.is_absolute() {
|
||||||
|
return path.to_string_lossy().to_string();
|
||||||
|
}
|
||||||
|
if let Ok(base) = std::env::current_dir()
|
||||||
|
&& let Ok(rel) = path.strip_prefix(&base)
|
||||||
|
{
|
||||||
|
return format!("./{}", rel.to_string_lossy());
|
||||||
|
}
|
||||||
|
path.to_string_lossy().to_string()
|
||||||
|
}
|
||||||
|
|
||||||
fn build_objects(
|
fn build_objects(
|
||||||
assembler: &str,
|
assembler: &str,
|
||||||
sources: &[String],
|
sources: &[String],
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ impl Config {
|
|||||||
.and_then(|v| v.as_table())
|
.and_then(|v| v.as_table())
|
||||||
.ok_or_else(|| ConfigError::Invalid("missing [build]".into()))?;
|
.ok_or_else(|| ConfigError::Invalid("missing [build]".into()))?;
|
||||||
|
|
||||||
for key in ["language", "standard", "compiler", "kind"] {
|
for key in ["language", "standard", "compiler"] {
|
||||||
let value = build.get(key).and_then(|v| v.as_str()).unwrap_or("");
|
let value = build.get(key).and_then(|v| v.as_str()).unwrap_or("");
|
||||||
if value.trim().is_empty() {
|
if value.trim().is_empty() {
|
||||||
return Err(ConfigError::Invalid(format!("build.{key} is empty")));
|
return Err(ConfigError::Invalid(format!("build.{key} is empty")));
|
||||||
@@ -129,12 +129,22 @@ impl Config {
|
|||||||
{
|
{
|
||||||
return Err(ConfigError::Invalid("build.platform is empty".into()));
|
return Err(ConfigError::Invalid("build.platform is empty".into()));
|
||||||
}
|
}
|
||||||
|
if let Some(toolchain) = self.get("toolchain").and_then(|v| v.as_table()) {
|
||||||
|
for key in ["cc", "cxx", "as", "ar", "ld"] {
|
||||||
|
if let Some(v) = toolchain.get(key)
|
||||||
|
&& !v.as_str().map(|s| !s.trim().is_empty()).unwrap_or(false)
|
||||||
|
{
|
||||||
|
return Err(ConfigError::Invalid(format!("toolchain.{key} is invalid")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
if let Some(kind) = build.get("kind").and_then(|v| v.as_str()) {
|
if let Some(kind) = build.get("kind").and_then(|v| v.as_str()) {
|
||||||
let kind = kind.trim();
|
let kind = kind.trim();
|
||||||
if kind != "bin" && kind != "staticlib" && kind != "sharedlib" {
|
if !kind.is_empty() && kind != "bin" && kind != "staticlib" && kind != "sharedlib" {
|
||||||
return Err(ConfigError::Invalid("build.kind is invalid".into()));
|
return Err(ConfigError::Invalid("build.kind is invalid".into()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
self.validate_workspace()?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -150,6 +160,39 @@ impl Config {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Config {
|
||||||
|
fn validate_workspace(&self) -> Result<(), ConfigError> {
|
||||||
|
let Some(workspace) = self.get("workspace").and_then(|v| v.as_table()) else {
|
||||||
|
return Ok(());
|
||||||
|
};
|
||||||
|
for (name, value) in workspace {
|
||||||
|
let tbl = value
|
||||||
|
.as_table()
|
||||||
|
.ok_or_else(|| ConfigError::Invalid(format!("workspace.{name} must be a table")))?;
|
||||||
|
let path = tbl.get("path").and_then(|v| v.as_str()).unwrap_or("");
|
||||||
|
if path.trim().is_empty() {
|
||||||
|
return Err(ConfigError::Invalid(format!(
|
||||||
|
"workspace.{name}.path is empty"
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
if let Some(deps) = tbl.get("deps") {
|
||||||
|
let arr = deps.as_array().ok_or_else(|| {
|
||||||
|
ConfigError::Invalid(format!("workspace.{name}.deps must be array"))
|
||||||
|
})?;
|
||||||
|
for item in arr {
|
||||||
|
let s = item.as_str().unwrap_or("");
|
||||||
|
if s.trim().is_empty() {
|
||||||
|
return Err(ConfigError::Invalid(format!(
|
||||||
|
"workspace.{name}.deps contains empty value"
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn read_toml(path: &Path) -> Result<Value, ConfigError> {
|
fn read_toml(path: &Path) -> Result<Value, ConfigError> {
|
||||||
let content = fs::read_to_string(path)?;
|
let content = fs::read_to_string(path)?;
|
||||||
Ok(toml::from_str(&content)?)
|
Ok(toml::from_str(&content)?)
|
||||||
@@ -213,6 +256,7 @@ fn format_toml(value: &Value) -> Result<String, ConfigError> {
|
|||||||
.get("dependencies")
|
.get("dependencies")
|
||||||
.and_then(|v| v.as_table())
|
.and_then(|v| v.as_table())
|
||||||
.ok_or_else(|| ConfigError::Invalid("missing [dependencies]".into()))?;
|
.ok_or_else(|| ConfigError::Invalid("missing [dependencies]".into()))?;
|
||||||
|
let toolchain = root.get("toolchain").and_then(|v| v.as_table());
|
||||||
|
|
||||||
let name = package.get("name").and_then(|v| v.as_str()).unwrap_or("");
|
let name = package.get("name").and_then(|v| v.as_str()).unwrap_or("");
|
||||||
let version = package
|
let version = package
|
||||||
@@ -251,6 +295,24 @@ fn format_toml(value: &Value) -> Result<String, ConfigError> {
|
|||||||
}
|
}
|
||||||
out.push('\n');
|
out.push('\n');
|
||||||
|
|
||||||
|
if let Some(toolchain) = toolchain {
|
||||||
|
let mut lines = Vec::new();
|
||||||
|
for key in ["cc", "cxx", "as", "ar", "ld"] {
|
||||||
|
if let Some(value) = toolchain.get(key).and_then(|v| v.as_str())
|
||||||
|
&& !value.trim().is_empty()
|
||||||
|
{
|
||||||
|
lines.push(format!("{key} = \"{value}\""));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !lines.is_empty() {
|
||||||
|
out.push_str("[toolchain]\n");
|
||||||
|
for line in lines {
|
||||||
|
out.push_str(&format!("{line}\n"));
|
||||||
|
}
|
||||||
|
out.push('\n');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
out.push_str("[dependencies]\n");
|
out.push_str("[dependencies]\n");
|
||||||
if !deps.is_empty() {
|
if !deps.is_empty() {
|
||||||
let mut keys: Vec<&String> = deps.keys().collect();
|
let mut keys: Vec<&String> = deps.keys().collect();
|
||||||
|
|||||||
@@ -2,3 +2,4 @@ pub mod builder;
|
|||||||
pub mod config;
|
pub mod config;
|
||||||
pub mod deps;
|
pub mod deps;
|
||||||
pub mod runner;
|
pub mod runner;
|
||||||
|
pub mod workspace;
|
||||||
|
|||||||
124
src/core/workspace.rs
Normal file
124
src/core/workspace.rs
Normal file
@@ -0,0 +1,124 @@
|
|||||||
|
use crate::core::config::Config;
|
||||||
|
use std::collections::{HashMap, HashSet};
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use toml::Value;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub struct WorkspaceMember {
|
||||||
|
pub name: String,
|
||||||
|
pub path: PathBuf,
|
||||||
|
pub deps: Vec<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub struct Workspace {
|
||||||
|
pub members: Vec<WorkspaceMember>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn parse_workspace(config: &Config, root: &Path) -> Result<Option<Workspace>, String> {
|
||||||
|
let table = match config.get("workspace").and_then(|v| v.as_table()) {
|
||||||
|
Some(t) => t,
|
||||||
|
None => return Ok(None),
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut members = Vec::new();
|
||||||
|
for (name, value) in table {
|
||||||
|
let tbl = value
|
||||||
|
.as_table()
|
||||||
|
.ok_or_else(|| format!("workspace.{name} must be a table with path and deps"))?;
|
||||||
|
let path_raw = tbl
|
||||||
|
.get("path")
|
||||||
|
.and_then(|v| v.as_str())
|
||||||
|
.ok_or_else(|| format!("workspace.{name}.path is required"))?;
|
||||||
|
let path = resolve_path(root, path_raw)?;
|
||||||
|
if !path.join("dcr.toml").is_file() {
|
||||||
|
return Err(format!(
|
||||||
|
"workspace.{name}.path does not contain dcr.toml: {}",
|
||||||
|
path.display()
|
||||||
|
));
|
||||||
|
}
|
||||||
|
let deps = parse_deps(tbl.get("deps"))?;
|
||||||
|
members.push(WorkspaceMember {
|
||||||
|
name: name.to_string(),
|
||||||
|
path,
|
||||||
|
deps,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut ws = Workspace { members };
|
||||||
|
ws.members = topo_sort(&ws.members)?;
|
||||||
|
Ok(Some(ws))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn resolve_path(root: &Path, raw: &str) -> Result<PathBuf, String> {
|
||||||
|
let p = Path::new(raw);
|
||||||
|
let full = if p.is_absolute() {
|
||||||
|
p.to_path_buf()
|
||||||
|
} else {
|
||||||
|
root.join(p)
|
||||||
|
};
|
||||||
|
Ok(full)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn parse_deps(value: Option<&Value>) -> Result<Vec<String>, String> {
|
||||||
|
let Some(value) = value else {
|
||||||
|
return Ok(Vec::new());
|
||||||
|
};
|
||||||
|
let arr = value
|
||||||
|
.as_array()
|
||||||
|
.ok_or_else(|| "workspace deps must be an array of strings".to_string())?;
|
||||||
|
let mut out = Vec::new();
|
||||||
|
for item in arr {
|
||||||
|
let s = item
|
||||||
|
.as_str()
|
||||||
|
.ok_or_else(|| "workspace deps must be an array of strings".to_string())?;
|
||||||
|
out.push(s.to_string());
|
||||||
|
}
|
||||||
|
Ok(out)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn topo_sort(members: &[WorkspaceMember]) -> Result<Vec<WorkspaceMember>, String> {
|
||||||
|
let mut map = HashMap::new();
|
||||||
|
for m in members {
|
||||||
|
map.insert(m.name.clone(), m.clone());
|
||||||
|
}
|
||||||
|
let mut state: HashMap<String, u8> = HashMap::new();
|
||||||
|
let mut order: Vec<WorkspaceMember> = Vec::new();
|
||||||
|
|
||||||
|
for name in map.keys() {
|
||||||
|
if *state.get(name).unwrap_or(&0) == 0 {
|
||||||
|
visit(name, &map, &mut state, &mut order)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(order)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn visit(
|
||||||
|
name: &str,
|
||||||
|
map: &HashMap<String, WorkspaceMember>,
|
||||||
|
state: &mut HashMap<String, u8>,
|
||||||
|
order: &mut Vec<WorkspaceMember>,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
match state.get(name).copied().unwrap_or(0) {
|
||||||
|
1 => return Err(format!("workspace dependency cycle at {name}")),
|
||||||
|
2 => return Ok(()),
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
state.insert(name.to_string(), 1);
|
||||||
|
let member = map
|
||||||
|
.get(name)
|
||||||
|
.ok_or_else(|| format!("unknown workspace member {name}"))?;
|
||||||
|
let mut seen = HashSet::new();
|
||||||
|
for dep in &member.deps {
|
||||||
|
if !seen.insert(dep) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if !map.contains_key(dep) {
|
||||||
|
return Err(format!("workspace dependency '{dep}' not found"));
|
||||||
|
}
|
||||||
|
visit(dep, map, state, order)?;
|
||||||
|
}
|
||||||
|
state.insert(name.to_string(), 2);
|
||||||
|
order.push(member.clone());
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
use std::io;
|
use std::io;
|
||||||
use std::path::PathBuf;
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
pub fn check_dir(dir: Option<&str>) -> io::Result<Vec<String>> {
|
pub fn check_dir(dir: Option<&str>) -> io::Result<Vec<String>> {
|
||||||
@@ -16,3 +16,16 @@ pub fn check_dir(dir: Option<&str>) -> io::Result<Vec<String>> {
|
|||||||
|
|
||||||
Ok(items)
|
Ok(items)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn find_project_root(start: &Path) -> io::Result<Option<PathBuf>> {
|
||||||
|
let mut current = start.to_path_buf();
|
||||||
|
loop {
|
||||||
|
if current.join("dcr.toml").is_file() {
|
||||||
|
return Ok(Some(current));
|
||||||
|
}
|
||||||
|
if !current.pop() {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(None)
|
||||||
|
}
|
||||||
|
|||||||
@@ -19,25 +19,32 @@ fn bin_path() -> PathBuf {
|
|||||||
path
|
path
|
||||||
}
|
}
|
||||||
|
|
||||||
fn unique_temp_dir(prefix: &str) -> PathBuf {
|
fn unique_sandbox_dir(prefix: &str) -> PathBuf {
|
||||||
let pid = std::process::id();
|
let pid = std::process::id();
|
||||||
let n = COUNTER.fetch_add(1, Ordering::SeqCst);
|
let n = COUNTER.fetch_add(1, Ordering::SeqCst);
|
||||||
let now = SystemTime::now()
|
let now = SystemTime::now()
|
||||||
.duration_since(UNIX_EPOCH)
|
.duration_since(UNIX_EPOCH)
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
.as_nanos();
|
.as_nanos();
|
||||||
let mut path = std::env::temp_dir();
|
let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
|
||||||
|
path.push("sandbox");
|
||||||
|
path.push("cli-tests");
|
||||||
path.push(format!("dcr_{prefix}_{pid}_{n}_{now}"));
|
path.push(format!("dcr_{prefix}_{pid}_{n}_{now}"));
|
||||||
std::fs::create_dir_all(&path).expect("failed to create temp dir");
|
std::fs::create_dir_all(&path).expect("failed to create temp dir");
|
||||||
path
|
path
|
||||||
}
|
}
|
||||||
|
|
||||||
fn run_dcr(args: &[&str], cwd: &Path) -> std::process::Output {
|
fn run_dcr(args: &[&str], cwd: &Path) -> std::process::Output {
|
||||||
Command::new(bin_path())
|
run_dcr_env(args, cwd, &[])
|
||||||
.args(args)
|
}
|
||||||
.current_dir(cwd)
|
|
||||||
.output()
|
fn run_dcr_env(args: &[&str], cwd: &Path, envs: &[(&str, &str)]) -> std::process::Output {
|
||||||
.expect("failed to run dcr")
|
let mut cmd = Command::new(bin_path());
|
||||||
|
cmd.args(args).current_dir(cwd);
|
||||||
|
for (k, v) in envs {
|
||||||
|
cmd.env(k, v);
|
||||||
|
}
|
||||||
|
cmd.output().expect("failed to run dcr")
|
||||||
}
|
}
|
||||||
|
|
||||||
fn ensure_bin_built() {
|
fn ensure_bin_built() {
|
||||||
@@ -51,9 +58,23 @@ fn ensure_bin_built() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn available_compiler() -> Option<&'static str> {
|
||||||
|
for candidate in ["clang", "gcc", "cc"] {
|
||||||
|
let ok = Command::new(candidate)
|
||||||
|
.arg("--version")
|
||||||
|
.output()
|
||||||
|
.map(|o| o.status.success())
|
||||||
|
.unwrap_or(false);
|
||||||
|
if ok {
|
||||||
|
return Some(candidate);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn help_and_version_work() {
|
fn help_and_version_work() {
|
||||||
let dir = unique_temp_dir("help");
|
let dir = unique_sandbox_dir("help");
|
||||||
let out = run_dcr(&["--help"], &dir);
|
let out = run_dcr(&["--help"], &dir);
|
||||||
assert!(out.status.success(), "--help should succeed");
|
assert!(out.status.success(), "--help should succeed");
|
||||||
|
|
||||||
@@ -65,7 +86,7 @@ fn help_and_version_work() {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn new_creates_project_layout() {
|
fn new_creates_project_layout() {
|
||||||
let dir = unique_temp_dir("new");
|
let dir = unique_sandbox_dir("new");
|
||||||
let out = run_dcr(&["new", "hello"], &dir);
|
let out = run_dcr(&["new", "hello"], &dir);
|
||||||
assert!(out.status.success(), "dcr new should succeed");
|
assert!(out.status.success(), "dcr new should succeed");
|
||||||
|
|
||||||
@@ -80,7 +101,7 @@ fn new_creates_project_layout() {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn init_and_clean_remove_target() {
|
fn init_and_clean_remove_target() {
|
||||||
let dir = unique_temp_dir("init");
|
let dir = unique_sandbox_dir("init");
|
||||||
let out = run_dcr(&["init"], &dir);
|
let out = run_dcr(&["init"], &dir);
|
||||||
assert!(out.status.success(), "dcr init should succeed");
|
assert!(out.status.success(), "dcr init should succeed");
|
||||||
|
|
||||||
@@ -92,3 +113,108 @@ fn init_and_clean_remove_target() {
|
|||||||
assert!(out.status.success(), "dcr clean should succeed");
|
assert!(out.status.success(), "dcr clean should succeed");
|
||||||
assert!(!dir.join("target").exists(), "target should be removed");
|
assert!(!dir.join("target").exists(), "target should be removed");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn build_run_clean_flags_normal_project() {
|
||||||
|
let Some(compiler) = available_compiler() else {
|
||||||
|
eprintln!("no compiler found; skipping build/run test");
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
|
||||||
|
let dir = unique_sandbox_dir("normal");
|
||||||
|
let out = run_dcr(&["init"], &dir);
|
||||||
|
assert!(out.status.success(), "dcr init should succeed");
|
||||||
|
|
||||||
|
let envs = [("DCR_COMPILER", compiler)];
|
||||||
|
let out = run_dcr_env(&["build"], &dir, &envs);
|
||||||
|
assert!(out.status.success(), "dcr build should succeed");
|
||||||
|
|
||||||
|
let out = run_dcr_env(&["build", "--release"], &dir, &envs);
|
||||||
|
assert!(out.status.success(), "dcr build --release should succeed");
|
||||||
|
|
||||||
|
let out = run_dcr_env(&["run"], &dir, &envs);
|
||||||
|
assert!(out.status.success(), "dcr run should succeed");
|
||||||
|
let stdout = String::from_utf8_lossy(&out.stdout);
|
||||||
|
assert!(stdout.contains("Hello World!"), "run output missing");
|
||||||
|
|
||||||
|
let out = run_dcr_env(&["clean", "--release"], &dir, &envs);
|
||||||
|
assert!(out.status.success(), "dcr clean --release should succeed");
|
||||||
|
assert!(
|
||||||
|
!dir.join("target").join("release").exists(),
|
||||||
|
"target/release should be removed"
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
dir.join("target").join("debug").is_dir(),
|
||||||
|
"target/debug should remain"
|
||||||
|
);
|
||||||
|
|
||||||
|
let out = run_dcr_env(&["clean"], &dir, &envs);
|
||||||
|
assert!(out.status.success(), "dcr clean should succeed");
|
||||||
|
assert!(!dir.join("target").exists(), "target should be removed");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn workspace_build_and_clean_all() {
|
||||||
|
let Some(compiler) = available_compiler() else {
|
||||||
|
eprintln!("no compiler found; skipping workspace test");
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
|
||||||
|
let root = unique_sandbox_dir("workspace");
|
||||||
|
let out = run_dcr(&["init"], &root);
|
||||||
|
assert!(out.status.success(), "root init should succeed");
|
||||||
|
|
||||||
|
let members = [
|
||||||
|
("userspace", &[][..]),
|
||||||
|
("core", &["userspace"][..]),
|
||||||
|
("kernel", &["core"][..]),
|
||||||
|
];
|
||||||
|
for (name, _) in &members {
|
||||||
|
let member_dir = root.join("src").join(name);
|
||||||
|
std::fs::create_dir_all(&member_dir).expect("failed to create member dir");
|
||||||
|
let out = run_dcr(&["init"], &member_dir);
|
||||||
|
assert!(out.status.success(), "member init should succeed");
|
||||||
|
}
|
||||||
|
|
||||||
|
let workspace_toml = "[package]\nname = \"ws-root\"\nversion = \"0.1.0\"\n\n[build]\nlanguage = \"c\"\nstandard = \"c11\"\ncompiler = \"clang\"\nkind = \"bin\"\n\n[workspace]\nuserspace = { path = \"src/userspace\", deps = [] }\ncore = { path = \"src/core\", deps = [\"userspace\"] }\nkernel = { path = \"src/kernel\", deps = [\"core\"] }\n\n[dependencies]\n";
|
||||||
|
std::fs::write(root.join("dcr.toml"), workspace_toml).expect("failed to write root dcr.toml");
|
||||||
|
|
||||||
|
let envs = [("DCR_COMPILER", compiler)];
|
||||||
|
let out = run_dcr_env(&["build"], &root, &envs);
|
||||||
|
assert!(out.status.success(), "workspace build should succeed");
|
||||||
|
|
||||||
|
let out = run_dcr_env(&["build"], &root, &envs);
|
||||||
|
assert!(out.status.success(), "workspace build should succeed");
|
||||||
|
|
||||||
|
let out = run_dcr_env(&["build", "--release"], &root, &envs);
|
||||||
|
assert!(
|
||||||
|
out.status.success(),
|
||||||
|
"workspace build --release should succeed"
|
||||||
|
);
|
||||||
|
|
||||||
|
let out = run_dcr_env(&["clean", "--release", "--all"], &root, &envs);
|
||||||
|
assert!(
|
||||||
|
out.status.success(),
|
||||||
|
"workspace clean --all --release should succeed"
|
||||||
|
);
|
||||||
|
|
||||||
|
for (name, _) in &members {
|
||||||
|
let member = root.join("src").join(name);
|
||||||
|
assert!(
|
||||||
|
!member.join("target").join("release").exists(),
|
||||||
|
"member target/release should be removed"
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
member.join("target").join("debug").exists(),
|
||||||
|
"member target/debug should remain"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
assert!(
|
||||||
|
!root.join("target").join("release").exists(),
|
||||||
|
"root target/release should be removed"
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
root.join("target").join("debug").exists(),
|
||||||
|
"root target/debug should remain"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user