diff --git a/Cargo.lock b/Cargo.lock index ec9c9d8..1e7afa5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -41,7 +41,7 @@ dependencies = [ [[package]] name = "anda" -version = "0.1.14" +version = "0.1.15" dependencies = [ "anda-config", "andax", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "anda-config" -version = "0.1.4" +version = "0.1.5" dependencies = [ "chrono", "dotenv", @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "andax" -version = "0.1.2" +version = "0.1.3" dependencies = [ "anda-config", "color-eyre", @@ -185,9 +185,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f0778972c64420fdedc63f09919c8a88bda7b25135357fd25a5d9f3257e832" +checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" dependencies = [ "memchr", "serde", diff --git a/Cargo.toml b/Cargo.toml index 6e9e324..009b0c4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ # Cargo workspace [package] name = "anda" -version = "0.1.14" +version = "0.1.15" edition = "2021" description = "Andaman Build toolchain" license = "MIT" diff --git a/LICENSE.md b/LICENSE.md index b0a9a17..56c5bbb 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 Fyra Labs +Copyright (c) 2022-2023 Fyra Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index fcf213a..fc42f0c 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,15 @@ Andaman is simply a meta-build system that calls upon other build systems to bui ## How we use it at Fyra Labs -We use Andaman to quickly build packages for our distributions, Ultramarine Linux and tauOS. -The artifacts generated by Andaman are then sent to Subatomic, our compose and repository manager. +We use Andaman to quickly build packages for our distributions, [Ultramarine Linux] and [TauOS]. +Another notable usage is the [Terra] repository, which provides more than 1000 packages for Fedora-based distributions. +The artifacts generated by Andaman are then sent to [Subatomic], our compose and repository manager. ## History The Andaman project has gone through many forms. We initially wrote Andaman as a custom RPM frontend as an alternative to DNF that is similar to that of an AUR helper. However, there were issues with rust and RPM support and we decided to move to a more general CI server based on BuildKit. This however turned into a massive feature creep of projects and so we decided to simply write a build system that can build artifacts for various package formats. +[Subatomic]: https://github.com/FyraLabs/subatomic +[Terra]: https://terra.fyralabs.com +[Ultramarine Linux]: https://ultramarine-linux.org +[TauOS]: https://github.com/tau-OS diff --git a/anda-config/Cargo.toml b/anda-config/Cargo.toml index c7af5fa..b86069b 100644 --- a/anda-config/Cargo.toml +++ b/anda-config/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "anda-config" description = "Configuration module for Andaman" -version = "0.1.4" +version = "0.1.5" edition = "2021" license = "MIT" diff --git a/andax/Cargo.toml b/andax/Cargo.toml index b3af7d8..0e0b8b2 100644 --- a/andax/Cargo.toml +++ b/andax/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "andax" -version = "0.1.2" +version = "0.1.3" edition = "2021" license = "MIT" description = "Andaman scripting runtime" diff --git a/andax/src/run.rs b/andax/src/run.rs index 9234da8..3320fd4 100644 --- a/andax/src/run.rs +++ b/andax/src/run.rs @@ -111,17 +111,6 @@ lazy_static! { #[instrument(name = "traceback")] pub fn _tb(proj: &str, scr: &Path, nanitozo: TbErr, pos: Position, rhai_fn: &str, fn_src: &str) { - // { - // let _proj = proj.to_string(); - // let _nntz = format!("{nanitozo}"); - // let _fn = rhai_fn.to_string(); - // let _src = fn_src.to_string(); - // let _pos = format!("{pos:?}"); - // let _scr = scr.display().to_string(); - // std::panic::set_hook(Box::new(move |_| { - // error!(_proj, ?_scr, _nntz, _pos, _fn, _src, "BUG: PANIC during traceback generation"); - // })); - // } if let Some((line, col)) = _gpos(pos) { // Print code let f = std::fs::File::open(scr); diff --git a/rust-anda-git.spec b/rust-anda-git.spec index b64fa58..6a1554d 100644 --- a/rust-anda-git.spec +++ b/rust-anda-git.spec @@ -4,7 +4,7 @@ %global crate anda -%global _version 0.1.14 +%global _version 0.1.15 Name: rust-anda Version: %{_version}.%{autogitversion} diff --git a/rust-anda.spec b/rust-anda.spec index 3bc152a..f696fbc 100644 --- a/rust-anda.spec +++ b/rust-anda.spec @@ -5,7 +5,7 @@ %global crate anda Name: rust-anda -Version: 0.1.14 +Version: 0.1.15 Release: 1%{?dist} Summary: Andaman Build toolchain