NixOS · Apr 24, 2020 · Apr 24, 2020 · Apr 24, 2020
Showing with 38 additions and 11 deletions.

+8 −0 {ofborg → }/Cargo.lock

+12 −0 Cargo.toml

+10 −0 ofborg-simple-build/Cargo.toml

+8 −4 ofborg/src/bin/simple-build.rs → ofborg-simple-build/src/main.rs

+0 −7 ofborg/Cargo.toml
diff --git a/ofborg/Cargo.lock → Cargo.lock b/ofborg/Cargo.lock → Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -0,0 +1,12 @@
+[workspace]
+members = [
+    "ofborg",
+    "ofborg-simple-build"
+]
+
+[profile.release]
+debug = true
+
+[patch.crates-io]
+#hubcaps = { path = "../hubcaps" }
+#amq-proto = { path = "rust-amq-proto" }
diff --git a/ofborg-simple-build/Cargo.toml b/ofborg-simple-build/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "ofborg-simple-build"
+version = "0.1.0"
+authors = ["Daiderd Jordan <daiderd@gmail.com>"]
+edition = "2018"
+
+[dependencies]
+ofborg = { path = "../ofborg" }
+
+log = "0.3.8"
diff --git a/ofborg/src/bin/simple-build.rs → ofborg-simple-build/src/main.rs b/ofborg/src/bin/simple-build.rs → ofborg-simple-build/src/main.rs
@@ -1,18 +1,22 @@
-use ofborg::config;
-use ofborg::nix;
+#[macro_use]
+extern crate log;
 
 use std::env;
 use std::fs::File;
 use std::io::Read;
 use std::path::Path;
 
-fn main() {
-    let cfg = config::load(env::args().nth(1).unwrap().as_ref());
+use ofborg::config;
+use ofborg::nix;
 
+fn main() {
     ofborg::setup_log();
 
+    log::info!("Loading config...");
+    let cfg = config::load(env::args().nth(1).unwrap().as_ref());
     let nix = cfg.nix();
 
+    log::info!("Running build...");
     match nix.safely_build_attrs(
         &Path::new("./"),
         nix::File::DefaultNixpkgs,

diff --git a/ofborg/Cargo.toml b/ofborg/Cargo.toml
@@ -28,10 +28,3 @@ nom = "4.0.0-beta3"
 sys-info = "0.5.6"
 chrono = "0.4.6"
 separator = "0.4.1"
-
-[profile.release]
-debug = true
-
-[patch.crates-io]
-#hubcaps = { path = "../hubcaps" }
-#amq-proto = { path = "rust-amq-proto" }