diff --git a/CHANGELOG.md b/CHANGELOG.md index d7e28135..e264dac7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,21 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.10.2] - 2024 - 08 - 10 + +### Fixes + +- The `driver-path` property from the configuration file wasn't being picked when declared + +## [0.10.1] - 2024 - 08 - 10 + +### Fixes + +- GitHub code coverage actions + ## [0.10.0] - 2024 - 08 - 07 -### Feature +### Features - **Breaking** - *Targets*: `Executable` and `Tests` toml entries are removed in favour of `[targets.]` entries. Each targets allow the user to build *N* independent final products, being these `binaries (executables)` for now, while static diff --git a/zork++/Cargo.lock b/zork++/Cargo.lock index 6f6c2c98..3ad9d3e1 100644 --- a/zork++/Cargo.lock +++ b/zork++/Cargo.lock @@ -428,7 +428,7 @@ dependencies = [ name = "fastrand" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "9fc0.10.24f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "gimli" @@ -1149,7 +1149,7 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "zork" -version = "0.10.0" +version = "0.10.2" dependencies = [ "chrono", "clap 4.5.13", diff --git a/zork++/Cargo.toml b/zork++/Cargo.toml index 87a77909..fd984266 100644 --- a/zork++/Cargo.toml +++ b/zork++/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zork" -version = "0.10.0" +version = "0.10.2" authors = ["Zero Day Code"] edition = "2021" description = "A modern C++ project manager and build system for modern C++" diff --git a/zork++/src/lib/cli/input/mod.rs b/zork++/src/lib/cli/input/mod.rs index 9ea35079..20e1d8d7 100644 --- a/zork++/src/lib/cli/input/mod.rs +++ b/zork++/src/lib/cli/input/mod.rs @@ -30,7 +30,7 @@ use crate::project_model; #[derive(Parser, Debug, Default)] #[command(name = "Zork++")] #[command(author = "Zero Day Code")] -#[command(version = "0.10.0")] +#[command(version = "0.10.2")] #[command( about = "Zork++ is a build system for modern C++ projects", long_about = "Zork++ is a project of Zero Day Code. Find us: https://github.com/zerodaycode/Zork" diff --git a/zork++/src/lib/utils/reader.rs b/zork++/src/lib/utils/reader.rs index 81a10519..244b9892 100644 --- a/zork++/src/lib/utils/reader.rs +++ b/zork++/src/lib/utils/reader.rs @@ -152,11 +152,11 @@ fn assemble_compiler_model<'a>( CompilerModel { cpp_compiler: config.cpp_compiler.into(), - driver_path: if let Some(driver_path) = cli_args.driver_path.as_ref() { - Cow::Borrowed(driver_path) + driver_path: Cow::Borrowed(if let Some(driver_path) = cli_args.driver_path.as_ref() { + driver_path } else { - Cow::Owned(cli_args.driver_path.clone().unwrap_or_default()) - }, + config.driver_path.unwrap_or_default() + }), cpp_standard: config.cpp_standard.clone().into(), std_lib: config.std_lib.clone().map(|lib| lib.into()), extra_args,