mirror of
https://github.com/dexoron/dcr.git
synced 2026-10-21 14:18:36 +00:00
Added:
- Incremental builds (object caching by mtime) - `build.kind` with `staticlib` support - Custom output directory via `build.target`
This commit is contained in:
@@ -1,5 +1,11 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [0.2.5] - 2026-02-26
|
||||||
|
Added:
|
||||||
|
- Incremental builds (object caching by mtime)
|
||||||
|
- `build.kind` with `staticlib` support
|
||||||
|
- Custom output directory via `build.target`
|
||||||
|
|
||||||
## [0.2.4] - 2026-02-22
|
## [0.2.4] - 2026-02-22
|
||||||
Added:
|
Added:
|
||||||
- Custom build flags: `build.cflags` and `build.ldflags`
|
- Custom build flags: `build.cflags` and `build.ldflags`
|
||||||
|
|||||||
@@ -119,6 +119,8 @@ Two profiles are supported:
|
|||||||
|
|
||||||
Custom flags can be added in `dcr.toml` via `build.cflags` and `build.ldflags`.
|
Custom flags can be added in `dcr.toml` via `build.cflags` and `build.ldflags`.
|
||||||
You can also set `build.target` to override the output directory (profile-independent).
|
You can also set `build.target` to override the output directory (profile-independent).
|
||||||
|
Use `build.kind = "staticlib"` to build a static library instead of a binary.
|
||||||
|
`dcr run` is only for `build.kind = "bin"` and will fail for `staticlib`.
|
||||||
|
|
||||||
## Configuration
|
## Configuration
|
||||||
The main project file is `dcr.toml`.
|
The main project file is `dcr.toml`.
|
||||||
@@ -143,6 +145,8 @@ ldflags = ["-lm"]
|
|||||||
|
|
||||||
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.
|
||||||
|
|
||||||
## Requirements
|
## Requirements
|
||||||
- Rust toolchain (`rustc`, `cargo`) - for building DCR from source
|
- Rust toolchain (`rustc`, `cargo`) - for building DCR from source
|
||||||
- C compiler (`clang`, `gcc`, or 'cl'(msvc))
|
- C compiler (`clang`, `gcc`, or 'cl'(msvc))
|
||||||
|
|||||||
3
TODO.md
3
TODO.md
@@ -1,5 +1,6 @@
|
|||||||
# TODO
|
# TODO
|
||||||
|
|
||||||
- Add incremental builds
|
- Add incremental builds
|
||||||
|
- Add header dependency tracking for incremental builds (GCC/Clang: -MMD, MSVC: /showIncludes)
|
||||||
- Add external package managers (Conan, vcpkg)
|
- Add external package managers (Conan, vcpkg)
|
||||||
- Support building static libraries (are .a)
|
- Support building static libraries (ar .a)
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ version = "0.1.0"
|
|||||||
language = "c"
|
language = "c"
|
||||||
standard = "c11"
|
standard = "c11"
|
||||||
compiler = "gcc"
|
compiler = "gcc"
|
||||||
|
# Build kind: "bin" (default) or "staticlib"
|
||||||
|
kind = "bin"
|
||||||
# Output directory for binary (optional)
|
# Output directory for binary (optional)
|
||||||
target = "./dist"
|
target = "./dist"
|
||||||
# Custom compile/link flags (optional)
|
# Custom compile/link flags (optional)
|
||||||
@@ -33,10 +35,15 @@ frecli = { path = "./lib/frecli", include = ["."], lib = ["."], libs = ["frecli"
|
|||||||
- `language` (string, required): `c`, `c++`, `cpp`, or `cxx`
|
- `language` (string, required): `c`, `c++`, `cpp`, or `cxx`
|
||||||
- `standard` (string, required): e.g. `c99`, `c11`, `c++17`
|
- `standard` (string, required): e.g. `c99`, `c11`, `c++17`
|
||||||
- `compiler` (string, required): `gcc`, `clang`, `cl`(msvc), or `clang-cl`
|
- `compiler` (string, required): `gcc`, `clang`, `cl`(msvc), or `clang-cl`
|
||||||
|
- `kind` (string, optional): `bin` (default) or `staticlib`
|
||||||
- `target` (string, optional): output directory for the binary (profile-independent)
|
- `target` (string, optional): output directory for the binary (profile-independent)
|
||||||
- `cflags` (string[], optional): additional compile flags
|
- `cflags` (string[], optional): additional compile flags
|
||||||
- `ldflags` (string[], optional): additional link flags
|
- `ldflags` (string[], optional): additional link flags
|
||||||
|
|
||||||
|
Notes:
|
||||||
|
- `dcr run` is supported only for `kind = "bin"`.
|
||||||
|
- Incremental rebuild currently tracks source file changes (`.c/.cpp`) only.
|
||||||
|
|
||||||
### [dependencies]
|
### [dependencies]
|
||||||
Only `path` dependencies are supported right now.
|
Only `path` dependencies are supported right now.
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ You can add custom compile and link flags in `[build]`:
|
|||||||
[build]
|
[build]
|
||||||
compiler = "gcc"
|
compiler = "gcc"
|
||||||
standard = "c99"
|
standard = "c99"
|
||||||
|
kind = "bin"
|
||||||
target = "./dist"
|
target = "./dist"
|
||||||
cflags = ["-D_POSIX_C_SOURCE=200809L", "-Wall", "-Wextra", "-O2", "-Ilib/frecli"]
|
cflags = ["-D_POSIX_C_SOURCE=200809L", "-Wall", "-Wextra", "-O2", "-Ilib/frecli"]
|
||||||
ldflags = ["-Llib/frecli", "-lfrecli", "-lm"]
|
ldflags = ["-Llib/frecli", "-lfrecli", "-lm"]
|
||||||
@@ -40,3 +41,8 @@ frecli = { path = "./lib/frecli", include = ["."], lib = ["."], libs = ["frecli"
|
|||||||
## Source Discovery
|
## Source Discovery
|
||||||
|
|
||||||
DCR compiles all `.c`/`.cpp` files under `src/` recursively. The file containing `main()` can be in any subdirectory.
|
DCR compiles all `.c`/`.cpp` files under `src/` recursively. The file containing `main()` can be in any subdirectory.
|
||||||
|
|
||||||
|
## Notes
|
||||||
|
|
||||||
|
- `dcr run` works only for `kind = "bin"`.
|
||||||
|
- Incremental rebuild currently tracks source file changes only (`.c/.cpp`).
|
||||||
|
|||||||
@@ -119,6 +119,8 @@ hello/
|
|||||||
|
|
||||||
Кастомные флаги можно добавить через `build.cflags` и `build.ldflags` в `dcr.toml`.
|
Кастомные флаги можно добавить через `build.cflags` и `build.ldflags` в `dcr.toml`.
|
||||||
Можно указать `build.target`, чтобы задать директорию выхода бинарника (без привязки к профилю).
|
Можно указать `build.target`, чтобы задать директорию выхода бинарника (без привязки к профилю).
|
||||||
|
Используйте `build.kind = "staticlib"`, чтобы собрать статическую библиотеку вместо бинарника.
|
||||||
|
`dcr run` работает только для `build.kind = "bin"` и завершится ошибкой для `staticlib`.
|
||||||
|
|
||||||
## Конфигурация
|
## Конфигурация
|
||||||
Основной файл проекта — `dcr.toml`.
|
Основной файл проекта — `dcr.toml`.
|
||||||
@@ -143,6 +145,8 @@ ldflags = ["-lm"]
|
|||||||
|
|
||||||
Поддерживаются path-зависимости. DCR резолвит их при сборке и создаёт `dcr.lock`.
|
Поддерживаются path-зависимости. DCR резолвит их при сборке и создаёт `dcr.lock`.
|
||||||
|
|
||||||
|
Примечание по инкрементальной сборке: пересборка объектников идёт по изменениям `.c/.cpp`. Учет зависимостей заголовков пока не реализован.
|
||||||
|
|
||||||
## Требования
|
## Требования
|
||||||
- Rust toolchain (`rustc`, `cargo`) - Для ручной сборки DCR
|
- Rust toolchain (`rustc`, `cargo`) - Для ручной сборки DCR
|
||||||
- C-компилятор (`clang`, `gcc` или 'cl'(msvc))
|
- C-компилятор (`clang`, `gcc` или 'cl'(msvc))
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ pub fn build(args: &[String]) -> i32 {
|
|||||||
let build_language = get_config_str(&config, "build.language");
|
let build_language = get_config_str(&config, "build.language");
|
||||||
let build_standard = get_config_str(&config, "build.standard");
|
let build_standard = get_config_str(&config, "build.standard");
|
||||||
let build_target = get_config_str(&config, "build.target");
|
let build_target = get_config_str(&config, "build.target");
|
||||||
|
let build_kind = get_config_str(&config, "build.kind");
|
||||||
let build_cflags = match get_config_list(&config, "build.cflags") {
|
let build_cflags = match get_config_list(&config, "build.cflags") {
|
||||||
Ok(v) => v,
|
Ok(v) => v,
|
||||||
Err(msg) => {
|
Err(msg) => {
|
||||||
@@ -76,6 +77,7 @@ pub fn build(args: &[String]) -> i32 {
|
|||||||
language: &build_language,
|
language: &build_language,
|
||||||
standard: &build_standard,
|
standard: &build_standard,
|
||||||
target_dir: normalize_target(&build_target),
|
target_dir: normalize_target(&build_target),
|
||||||
|
kind: normalize_kind(&build_kind),
|
||||||
include_dirs: &resolved.include_dirs,
|
include_dirs: &resolved.include_dirs,
|
||||||
lib_dirs: &resolved.lib_dirs,
|
lib_dirs: &resolved.lib_dirs,
|
||||||
libs: &resolved.libs,
|
libs: &resolved.libs,
|
||||||
@@ -177,3 +179,8 @@ fn normalize_target(target: &str) -> Option<&str> {
|
|||||||
Some(trimmed)
|
Some(trimmed)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn normalize_kind(kind: &str) -> &str {
|
||||||
|
let trimmed = kind.trim();
|
||||||
|
if trimmed.is_empty() { "bin" } else { trimmed }
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,12 +1,10 @@
|
|||||||
use crate::cli::build::build;
|
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::platform;
|
use crate::core::runner::run_binary;
|
||||||
use crate::utils::fs::check_dir;
|
use crate::utils::fs::check_dir;
|
||||||
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;
|
|
||||||
use std::process::Command;
|
|
||||||
|
|
||||||
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();
|
||||||
@@ -28,6 +26,10 @@ pub fn run(args: &[String]) -> i32 {
|
|||||||
.get("package.name")
|
.get("package.name")
|
||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.unwrap_or("");
|
.unwrap_or("");
|
||||||
|
let build_kind = config
|
||||||
|
.get("build.kind")
|
||||||
|
.and_then(|v| v.as_str())
|
||||||
|
.unwrap_or("");
|
||||||
let target_dir = config
|
let target_dir = config
|
||||||
.get("build.target")
|
.get("build.target")
|
||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
@@ -49,40 +51,23 @@ pub fn run(args: &[String]) -> i32 {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if build_kind.trim() == "staticlib" {
|
||||||
|
error("Cannot run static library");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
let build_status = build(args);
|
let build_status = build(args);
|
||||||
let bin_path = platform::bin_path(&active_profile, project_name, target_dir);
|
let bin_path = crate::platform::bin_path(&active_profile, project_name, target_dir);
|
||||||
if build_status == 0 {
|
if build_status == 0 {
|
||||||
println!("\n {} {}", colored("Running", BOLD_GREEN), bin_path);
|
println!("\n {} {}", colored("Running", BOLD_GREEN), bin_path);
|
||||||
println!("--------------------------------");
|
println!("--------------------------------");
|
||||||
return Command::new(bin_path)
|
return run_binary(project_name, &active_profile, target_dir);
|
||||||
.status()
|
|
||||||
.map(|status| status.code().unwrap_or(1))
|
|
||||||
.unwrap_or(1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if target_dir.is_none()
|
let fallback_code = run_binary(project_name, &active_profile, target_dir);
|
||||||
&& check_dir(Some(&format!("target/{active_profile}")))
|
if fallback_code != 1 {
|
||||||
.unwrap_or_default()
|
return fallback_code;
|
||||||
.contains(&active_profile)
|
|
||||||
{
|
|
||||||
warn("Launch of the latest release");
|
|
||||||
return Command::new(platform::bin_path(
|
|
||||||
&active_profile,
|
|
||||||
project_name,
|
|
||||||
target_dir,
|
|
||||||
))
|
|
||||||
.status()
|
|
||||||
.map(|status| status.code().unwrap_or(1))
|
|
||||||
.unwrap_or(1);
|
|
||||||
}
|
|
||||||
if target_dir.is_some() && Path::new(&bin_path).exists() {
|
|
||||||
warn("Launch of the latest release");
|
|
||||||
return Command::new(bin_path)
|
|
||||||
.status()
|
|
||||||
.map(|status| status.code().unwrap_or(1))
|
|
||||||
.unwrap_or(1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
error("Fix errors in the code to run the project");
|
error("Fix errors in the code to run the project");
|
||||||
0
|
1
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +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::process::Command;
|
use std::process::Command;
|
||||||
use std::time::Instant;
|
use std::time::Instant;
|
||||||
|
|
||||||
@@ -11,13 +12,30 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
ctx.compiler
|
ctx.compiler
|
||||||
};
|
};
|
||||||
let start_time = Instant::now();
|
let start_time = Instant::now();
|
||||||
let mut cmd = Command::new(compiler);
|
|
||||||
let sources = collect_sources(ctx.language)?;
|
let sources = collect_sources(ctx.language)?;
|
||||||
for source in &sources {
|
let obj_dir = Path::new("./target").join(ctx.profile).join("obj");
|
||||||
cmd.arg(source);
|
let objects = build_objects(compiler, &sources, &obj_dir, ctx, "o")?;
|
||||||
|
|
||||||
|
if ctx.kind == "staticlib" {
|
||||||
|
let lib_path = platform::lib_path(ctx.profile, ctx.project_name, ctx.target_dir);
|
||||||
|
let mut cmd = Command::new("ar");
|
||||||
|
cmd.arg("rcs").arg(&lib_path);
|
||||||
|
for obj in &objects {
|
||||||
|
cmd.arg(obj);
|
||||||
}
|
}
|
||||||
if !ctx.standard.is_empty() {
|
match cmd.status() {
|
||||||
cmd.arg(format!("-std={}", ctx.standard));
|
Ok(status) if status.success() => {
|
||||||
|
let elapsed = ((start_time.elapsed().as_secs_f64() * 100.0).trunc()) / 100.0;
|
||||||
|
return Ok(elapsed);
|
||||||
|
}
|
||||||
|
Ok(_) => return Err("Build failed".to_string()),
|
||||||
|
Err(err) => return Err(format!("Build failed: {err}")),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut cmd = Command::new(compiler);
|
||||||
|
for obj in &objects {
|
||||||
|
cmd.arg(obj);
|
||||||
}
|
}
|
||||||
for flag in default_flags(ctx.profile) {
|
for flag in default_flags(ctx.profile) {
|
||||||
cmd.arg(flag);
|
cmd.arg(flag);
|
||||||
@@ -25,9 +43,6 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
for flag in ctx.cflags {
|
for flag in ctx.cflags {
|
||||||
cmd.arg(flag);
|
cmd.arg(flag);
|
||||||
}
|
}
|
||||||
for dir in ctx.include_dirs {
|
|
||||||
cmd.arg(format!("-I{dir}"));
|
|
||||||
}
|
|
||||||
for dir in ctx.lib_dirs {
|
for dir in ctx.lib_dirs {
|
||||||
cmd.arg(format!("-L{dir}"));
|
cmd.arg(format!("-L{dir}"));
|
||||||
}
|
}
|
||||||
@@ -106,3 +121,63 @@ fn default_flags(profile: &str) -> &'static [&'static str] {
|
|||||||
_ => &[],
|
_ => &[],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn build_objects(
|
||||||
|
compiler: &str,
|
||||||
|
sources: &[String],
|
||||||
|
obj_dir: &Path,
|
||||||
|
ctx: &BuildContext,
|
||||||
|
obj_ext: &str,
|
||||||
|
) -> Result<Vec<String>, String> {
|
||||||
|
let mut objects = Vec::new();
|
||||||
|
for source in sources {
|
||||||
|
let obj_path = object_path(obj_dir, source, obj_ext);
|
||||||
|
if let Some(parent) = Path::new(&obj_path).parent() {
|
||||||
|
fs::create_dir_all(parent).map_err(|err| format!("obj dir error: {err}"))?;
|
||||||
|
}
|
||||||
|
if needs_rebuild(source, &obj_path) {
|
||||||
|
let mut cmd = Command::new(compiler);
|
||||||
|
cmd.arg("-c").arg(source).arg("-o").arg(&obj_path);
|
||||||
|
if !ctx.standard.is_empty() {
|
||||||
|
cmd.arg(format!("-std={}", ctx.standard));
|
||||||
|
}
|
||||||
|
for flag in default_flags(ctx.profile) {
|
||||||
|
cmd.arg(flag);
|
||||||
|
}
|
||||||
|
for flag in ctx.cflags {
|
||||||
|
cmd.arg(flag);
|
||||||
|
}
|
||||||
|
for dir in ctx.include_dirs {
|
||||||
|
cmd.arg(format!("-I{dir}"));
|
||||||
|
}
|
||||||
|
match cmd.status() {
|
||||||
|
Ok(status) if status.success() => {}
|
||||||
|
Ok(_) => return Err("Build failed".to_string()),
|
||||||
|
Err(err) => return Err(format!("Build failed: {err}")),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
objects.push(obj_path);
|
||||||
|
}
|
||||||
|
Ok(objects)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn object_path(obj_dir: &Path, source: &str, obj_ext: &str) -> String {
|
||||||
|
let src_path = Path::new(source);
|
||||||
|
let rel = src_path
|
||||||
|
.strip_prefix("./src")
|
||||||
|
.or_else(|_| src_path.strip_prefix("src"))
|
||||||
|
.unwrap_or(src_path);
|
||||||
|
let mut out = obj_dir.join(rel);
|
||||||
|
out.set_extension(obj_ext.trim_start_matches('.'));
|
||||||
|
out.to_string_lossy().to_string()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn needs_rebuild(source: &str, object: &str) -> bool {
|
||||||
|
let src_time = fs::metadata(source).and_then(|m| m.modified());
|
||||||
|
let obj_time = fs::metadata(object).and_then(|m| m.modified());
|
||||||
|
match (src_time, obj_time) {
|
||||||
|
(Ok(s), Ok(o)) => s > o,
|
||||||
|
(Ok(_), Err(_)) => true,
|
||||||
|
_ => true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,6 +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::process::Command;
|
use std::process::Command;
|
||||||
use std::time::Instant;
|
use std::time::Instant;
|
||||||
|
|
||||||
@@ -11,13 +12,30 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
ctx.compiler
|
ctx.compiler
|
||||||
};
|
};
|
||||||
let start_time = Instant::now();
|
let start_time = Instant::now();
|
||||||
let mut cmd = Command::new(compiler);
|
|
||||||
let sources = collect_sources(ctx.language)?;
|
let sources = collect_sources(ctx.language)?;
|
||||||
for source in &sources {
|
let obj_dir = Path::new("./target").join(ctx.profile).join("obj");
|
||||||
cmd.arg(source);
|
let objects = build_objects(compiler, &sources, &obj_dir, ctx, "o")?;
|
||||||
|
|
||||||
|
if ctx.kind == "staticlib" {
|
||||||
|
let lib_path = platform::lib_path(ctx.profile, ctx.project_name, ctx.target_dir);
|
||||||
|
let mut cmd = Command::new("ar");
|
||||||
|
cmd.arg("rcs").arg(&lib_path);
|
||||||
|
for obj in &objects {
|
||||||
|
cmd.arg(obj);
|
||||||
}
|
}
|
||||||
if !ctx.standard.is_empty() {
|
match cmd.status() {
|
||||||
cmd.arg(format!("-std={}", ctx.standard));
|
Ok(status) if status.success() => {
|
||||||
|
let elapsed = ((start_time.elapsed().as_secs_f64() * 100.0).trunc()) / 100.0;
|
||||||
|
return Ok(elapsed);
|
||||||
|
}
|
||||||
|
Ok(_) => return Err("Build failed".to_string()),
|
||||||
|
Err(err) => return Err(format!("Build failed: {err}")),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut cmd = Command::new(compiler);
|
||||||
|
for obj in &objects {
|
||||||
|
cmd.arg(obj);
|
||||||
}
|
}
|
||||||
for flag in default_flags(ctx.profile) {
|
for flag in default_flags(ctx.profile) {
|
||||||
cmd.arg(flag);
|
cmd.arg(flag);
|
||||||
@@ -25,9 +43,6 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
for flag in ctx.cflags {
|
for flag in ctx.cflags {
|
||||||
cmd.arg(flag);
|
cmd.arg(flag);
|
||||||
}
|
}
|
||||||
for dir in ctx.include_dirs {
|
|
||||||
cmd.arg(format!("-I{dir}"));
|
|
||||||
}
|
|
||||||
for dir in ctx.lib_dirs {
|
for dir in ctx.lib_dirs {
|
||||||
cmd.arg(format!("-L{dir}"));
|
cmd.arg(format!("-L{dir}"));
|
||||||
}
|
}
|
||||||
@@ -106,3 +121,63 @@ fn default_flags(profile: &str) -> &'static [&'static str] {
|
|||||||
_ => &[],
|
_ => &[],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn build_objects(
|
||||||
|
compiler: &str,
|
||||||
|
sources: &[String],
|
||||||
|
obj_dir: &Path,
|
||||||
|
ctx: &BuildContext,
|
||||||
|
obj_ext: &str,
|
||||||
|
) -> Result<Vec<String>, String> {
|
||||||
|
let mut objects = Vec::new();
|
||||||
|
for source in sources {
|
||||||
|
let obj_path = object_path(obj_dir, source, obj_ext);
|
||||||
|
if let Some(parent) = Path::new(&obj_path).parent() {
|
||||||
|
fs::create_dir_all(parent).map_err(|err| format!("obj dir error: {err}"))?;
|
||||||
|
}
|
||||||
|
if needs_rebuild(source, &obj_path) {
|
||||||
|
let mut cmd = Command::new(compiler);
|
||||||
|
cmd.arg("-c").arg(source).arg("-o").arg(&obj_path);
|
||||||
|
if !ctx.standard.is_empty() {
|
||||||
|
cmd.arg(format!("-std={}", ctx.standard));
|
||||||
|
}
|
||||||
|
for flag in default_flags(ctx.profile) {
|
||||||
|
cmd.arg(flag);
|
||||||
|
}
|
||||||
|
for flag in ctx.cflags {
|
||||||
|
cmd.arg(flag);
|
||||||
|
}
|
||||||
|
for dir in ctx.include_dirs {
|
||||||
|
cmd.arg(format!("-I{dir}"));
|
||||||
|
}
|
||||||
|
match cmd.status() {
|
||||||
|
Ok(status) if status.success() => {}
|
||||||
|
Ok(_) => return Err("Build failed".to_string()),
|
||||||
|
Err(err) => return Err(format!("Build failed: {err}")),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
objects.push(obj_path);
|
||||||
|
}
|
||||||
|
Ok(objects)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn object_path(obj_dir: &Path, source: &str, obj_ext: &str) -> String {
|
||||||
|
let src_path = Path::new(source);
|
||||||
|
let rel = src_path
|
||||||
|
.strip_prefix("./src")
|
||||||
|
.or_else(|_| src_path.strip_prefix("src"))
|
||||||
|
.unwrap_or(src_path);
|
||||||
|
let mut out = obj_dir.join(rel);
|
||||||
|
out.set_extension(obj_ext.trim_start_matches('.'));
|
||||||
|
out.to_string_lossy().to_string()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn needs_rebuild(source: &str, object: &str) -> bool {
|
||||||
|
let src_time = fs::metadata(source).and_then(|m| m.modified());
|
||||||
|
let obj_time = fs::metadata(object).and_then(|m| m.modified());
|
||||||
|
match (src_time, obj_time) {
|
||||||
|
(Ok(s), Ok(o)) => s > o,
|
||||||
|
(Ok(_), Err(_)) => true,
|
||||||
|
_ => true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ pub struct BuildContext<'a> {
|
|||||||
pub language: &'a str,
|
pub language: &'a str,
|
||||||
pub standard: &'a str,
|
pub standard: &'a str,
|
||||||
pub target_dir: Option<&'a str>,
|
pub target_dir: Option<&'a str>,
|
||||||
|
pub kind: &'a str,
|
||||||
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],
|
||||||
|
|||||||
@@ -1,6 +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::process::Command;
|
use std::process::Command;
|
||||||
use std::time::Instant;
|
use std::time::Instant;
|
||||||
|
|
||||||
@@ -11,9 +12,28 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
ctx.compiler
|
ctx.compiler
|
||||||
};
|
};
|
||||||
let start_time = Instant::now();
|
let start_time = Instant::now();
|
||||||
let mut cmd = Command::new(compiler);
|
|
||||||
let sources = collect_sources(ctx.language)?;
|
let sources = collect_sources(ctx.language)?;
|
||||||
|
let obj_dir = Path::new("./target").join(ctx.profile).join("obj");
|
||||||
|
let objects = build_objects(compiler, &sources, &obj_dir, ctx, "obj")?;
|
||||||
|
|
||||||
|
if ctx.kind == "staticlib" {
|
||||||
|
let lib_path = platform::lib_path(ctx.profile, ctx.project_name, ctx.target_dir);
|
||||||
|
let mut cmd = Command::new("lib");
|
||||||
|
cmd.arg("/nologo").arg(format!("/OUT:{lib_path}"));
|
||||||
|
for obj in &objects {
|
||||||
|
cmd.arg(obj);
|
||||||
|
}
|
||||||
|
match cmd.status() {
|
||||||
|
Ok(status) if status.success() => {
|
||||||
|
let elapsed = ((start_time.elapsed().as_secs_f64() * 100.0).trunc()) / 100.0;
|
||||||
|
return Ok(elapsed);
|
||||||
|
}
|
||||||
|
Ok(_) => return Err("Build failed".to_string()),
|
||||||
|
Err(err) => return Err(format!("Build failed: {err}")),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut cmd = Command::new(compiler);
|
||||||
cmd.arg("/nologo");
|
cmd.arg("/nologo");
|
||||||
match ctx.language.to_lowercase().as_str() {
|
match ctx.language.to_lowercase().as_str() {
|
||||||
"c" => {
|
"c" => {
|
||||||
@@ -32,15 +52,15 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
cmd.arg(std_flag);
|
cmd.arg(std_flag);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for obj in &objects {
|
||||||
|
cmd.arg(obj);
|
||||||
|
}
|
||||||
for flag in default_flags(ctx.profile) {
|
for flag in default_flags(ctx.profile) {
|
||||||
cmd.arg(flag);
|
cmd.arg(flag);
|
||||||
}
|
}
|
||||||
for flag in ctx.cflags {
|
for flag in ctx.cflags {
|
||||||
cmd.arg(flag);
|
cmd.arg(flag);
|
||||||
}
|
}
|
||||||
for dir in ctx.include_dirs {
|
|
||||||
cmd.arg(format!("/I{dir}"));
|
|
||||||
}
|
|
||||||
for dir in ctx.lib_dirs {
|
for dir in ctx.lib_dirs {
|
||||||
cmd.arg(format!("/LIBPATH:{dir}"));
|
cmd.arg(format!("/LIBPATH:{dir}"));
|
||||||
}
|
}
|
||||||
@@ -57,10 +77,6 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
|
|||||||
cmd.arg(flag);
|
cmd.arg(flag);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for source in &sources {
|
|
||||||
cmd.arg(source);
|
|
||||||
}
|
|
||||||
cmd.arg(format!(
|
cmd.arg(format!(
|
||||||
"/Fe:{}",
|
"/Fe:{}",
|
||||||
platform::bin_path(ctx.profile, ctx.project_name, ctx.target_dir)
|
platform::bin_path(ctx.profile, ctx.project_name, ctx.target_dir)
|
||||||
@@ -145,3 +161,76 @@ fn default_flags(profile: &str) -> &'static [&'static str] {
|
|||||||
_ => &[],
|
_ => &[],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn build_objects(
|
||||||
|
compiler: &str,
|
||||||
|
sources: &[String],
|
||||||
|
obj_dir: &Path,
|
||||||
|
ctx: &BuildContext,
|
||||||
|
obj_ext: &str,
|
||||||
|
) -> Result<Vec<String>, String> {
|
||||||
|
let mut objects = Vec::new();
|
||||||
|
for source in sources {
|
||||||
|
let obj_path = object_path(obj_dir, source, obj_ext);
|
||||||
|
if let Some(parent) = Path::new(&obj_path).parent() {
|
||||||
|
fs::create_dir_all(parent).map_err(|err| format!("obj dir error: {err}"))?;
|
||||||
|
}
|
||||||
|
if needs_rebuild(source, &obj_path) {
|
||||||
|
let mut cmd = Command::new(compiler);
|
||||||
|
cmd.arg("/nologo");
|
||||||
|
match ctx.language.to_lowercase().as_str() {
|
||||||
|
"c" => {
|
||||||
|
cmd.arg("/TC");
|
||||||
|
}
|
||||||
|
"c++" | "cpp" | "cxx" => {
|
||||||
|
cmd.arg("/TP");
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
return Err("Unsupported language".to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !ctx.standard.is_empty() {
|
||||||
|
let std_flag = msvc_standard_flag(ctx.language, ctx.standard)?;
|
||||||
|
cmd.arg(std_flag);
|
||||||
|
}
|
||||||
|
for flag in default_flags(ctx.profile) {
|
||||||
|
cmd.arg(flag);
|
||||||
|
}
|
||||||
|
for flag in ctx.cflags {
|
||||||
|
cmd.arg(flag);
|
||||||
|
}
|
||||||
|
for dir in ctx.include_dirs {
|
||||||
|
cmd.arg(format!("/I{dir}"));
|
||||||
|
}
|
||||||
|
cmd.arg("/c").arg(source).arg(format!("/Fo:{}", obj_path));
|
||||||
|
match cmd.status() {
|
||||||
|
Ok(status) if status.success() => {}
|
||||||
|
Ok(_) => return Err("Build failed".to_string()),
|
||||||
|
Err(err) => return Err(format!("Build failed: {err}")),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
objects.push(obj_path);
|
||||||
|
}
|
||||||
|
Ok(objects)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn object_path(obj_dir: &Path, source: &str, obj_ext: &str) -> String {
|
||||||
|
let src_path = Path::new(source);
|
||||||
|
let rel = src_path
|
||||||
|
.strip_prefix("./src")
|
||||||
|
.or_else(|_| src_path.strip_prefix("src"))
|
||||||
|
.unwrap_or(src_path);
|
||||||
|
let mut out = obj_dir.join(rel);
|
||||||
|
out.set_extension(obj_ext.trim_start_matches('.'));
|
||||||
|
out.to_string_lossy().to_string()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn needs_rebuild(source: &str, object: &str) -> bool {
|
||||||
|
let src_time = fs::metadata(source).and_then(|m| m.modified());
|
||||||
|
let obj_time = fs::metadata(object).and_then(|m| m.modified());
|
||||||
|
match (src_time, obj_time) {
|
||||||
|
(Ok(s), Ok(o)) => s > o,
|
||||||
|
(Ok(_), Err(_)) => true,
|
||||||
|
_ => true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ const DEFAULT_VERSION: &str = "0.1.0";
|
|||||||
const DEFAULT_LANGUAGE: &str = "c";
|
const DEFAULT_LANGUAGE: &str = "c";
|
||||||
const DEFAULT_STANDARD: &str = "c11";
|
const DEFAULT_STANDARD: &str = "c11";
|
||||||
const DEFAULT_COMPILER: &str = "clang";
|
const DEFAULT_COMPILER: &str = "clang";
|
||||||
|
const DEFAULT_KIND: &str = "bin";
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub enum ConfigError {
|
pub enum ConfigError {
|
||||||
@@ -114,12 +115,18 @@ 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"] {
|
for key in ["language", "standard", "compiler", "kind"] {
|
||||||
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")));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if let Some(kind) = build.get("kind").and_then(|v| v.as_str()) {
|
||||||
|
let kind = kind.trim();
|
||||||
|
if kind != "bin" && kind != "staticlib" {
|
||||||
|
return Err(ConfigError::Invalid("build.kind is invalid".into()));
|
||||||
|
}
|
||||||
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -171,6 +178,7 @@ fn default_toml() -> Result<Value, ConfigError> {
|
|||||||
"compiler".to_string(),
|
"compiler".to_string(),
|
||||||
Value::String(DEFAULT_COMPILER.to_string()),
|
Value::String(DEFAULT_COMPILER.to_string()),
|
||||||
);
|
);
|
||||||
|
build.insert("kind".to_string(), Value::String(DEFAULT_KIND.to_string()));
|
||||||
|
|
||||||
let mut root = Map::new();
|
let mut root = Map::new();
|
||||||
root.insert("package".to_string(), Value::Table(package));
|
root.insert("package".to_string(), Value::Table(package));
|
||||||
@@ -217,6 +225,11 @@ fn format_toml(value: &Value) -> Result<String, ConfigError> {
|
|||||||
out.push_str(&format!("language = \"{language}\"\n"));
|
out.push_str(&format!("language = \"{language}\"\n"));
|
||||||
out.push_str(&format!("standard = \"{standard}\"\n"));
|
out.push_str(&format!("standard = \"{standard}\"\n"));
|
||||||
out.push_str(&format!("compiler = \"{compiler}\"\n"));
|
out.push_str(&format!("compiler = \"{compiler}\"\n"));
|
||||||
|
let kind = build
|
||||||
|
.get("kind")
|
||||||
|
.and_then(|v| v.as_str())
|
||||||
|
.unwrap_or(DEFAULT_KIND);
|
||||||
|
out.push_str(&format!("kind = \"{kind}\"\n"));
|
||||||
if let Some(target) = build.get("target").and_then(|v| v.as_str())
|
if let Some(target) = build.get("target").and_then(|v| v.as_str())
|
||||||
&& !target.trim().is_empty()
|
&& !target.trim().is_empty()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
pub mod builder;
|
pub mod builder;
|
||||||
pub mod config;
|
pub mod config;
|
||||||
pub mod deps;
|
pub mod deps;
|
||||||
|
pub mod runner;
|
||||||
|
|||||||
37
src/core/runner.rs
Normal file
37
src/core/runner.rs
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
use crate::platform;
|
||||||
|
use crate::utils::fs::check_dir;
|
||||||
|
use crate::utils::log::warn;
|
||||||
|
use std::path::Path;
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
|
pub fn run_binary(project_name: &str, profile: &str, target_dir: Option<&str>) -> i32 {
|
||||||
|
let bin_path = platform::bin_path(profile, project_name, target_dir);
|
||||||
|
if Path::new(&bin_path).exists() {
|
||||||
|
return Command::new(bin_path)
|
||||||
|
.status()
|
||||||
|
.map(|status| status.code().unwrap_or(1))
|
||||||
|
.unwrap_or(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if target_dir.is_none()
|
||||||
|
&& check_dir(Some(&format!("target/{profile}")))
|
||||||
|
.unwrap_or_default()
|
||||||
|
.contains(&profile.to_string())
|
||||||
|
{
|
||||||
|
warn("Launch of the latest release");
|
||||||
|
return Command::new(platform::bin_path(profile, project_name, target_dir))
|
||||||
|
.status()
|
||||||
|
.map(|status| status.code().unwrap_or(1))
|
||||||
|
.unwrap_or(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if target_dir.is_some() && Path::new(&bin_path).exists() {
|
||||||
|
warn("Launch of the latest release");
|
||||||
|
return Command::new(bin_path)
|
||||||
|
.status()
|
||||||
|
.map(|status| status.code().unwrap_or(1))
|
||||||
|
.unwrap_or(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
1
|
||||||
|
}
|
||||||
@@ -4,3 +4,10 @@ pub fn bin_path(profile: &str, name: &str, target_dir: Option<&str>) -> String {
|
|||||||
None => format!("./target/{profile}/{name}"),
|
None => format!("./target/{profile}/{name}"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn lib_path(profile: &str, name: &str, target_dir: Option<&str>) -> String {
|
||||||
|
match target_dir {
|
||||||
|
Some(dir) => format!("{}/lib{}.a", dir.trim_end_matches('/'), name),
|
||||||
|
None => format!("./target/{profile}/lib{name}.a"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -4,3 +4,10 @@ pub fn bin_path(profile: &str, name: &str, target_dir: Option<&str>) -> String {
|
|||||||
None => format!("./target/{profile}/{name}"),
|
None => format!("./target/{profile}/{name}"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn lib_path(profile: &str, name: &str, target_dir: Option<&str>) -> String {
|
||||||
|
match target_dir {
|
||||||
|
Some(dir) => format!("{}/lib{}.a", dir.trim_end_matches('/'), name),
|
||||||
|
None => format!("./target/{profile}/lib{name}.a"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -26,3 +26,25 @@ pub fn bin_path(profile: &str, name: &str, target_dir: Option<&str>) -> String {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn lib_path(profile: &str, name: &str, target_dir: Option<&str>) -> String {
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
{
|
||||||
|
linux::lib_path(profile, name, target_dir)
|
||||||
|
}
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
{
|
||||||
|
return macos::lib_path(profile, name, target_dir);
|
||||||
|
}
|
||||||
|
#[cfg(target_os = "windows")]
|
||||||
|
{
|
||||||
|
return windows::lib_path(profile, name, target_dir);
|
||||||
|
}
|
||||||
|
#[cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows")))]
|
||||||
|
{
|
||||||
|
match target_dir {
|
||||||
|
Some(dir) => format!("{}/lib{}.a", dir.trim_end_matches('/'), name),
|
||||||
|
None => format!("./target/{profile}/lib{name}.a"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -4,3 +4,10 @@ pub fn bin_path(profile: &str, name: &str, target_dir: Option<&str>) -> String {
|
|||||||
None => format!("./target/{profile}/{name}.exe"),
|
None => format!("./target/{profile}/{name}.exe"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn lib_path(profile: &str, name: &str, target_dir: Option<&str>) -> String {
|
||||||
|
match target_dir {
|
||||||
|
Some(dir) => format!("{}/{}.lib", dir.trim_end_matches('/'), name),
|
||||||
|
None => format!("./target/{profile}/{name}.lib"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user