Quellcode durchsuchen

Don't display Git hash for debug builds

This means we don't need to run git-rev-parse on every debug build, making the development cycle a smidge faster.

Also, bump version number to 0.2.0-pre to see this working in release mode.
Benjamin Sago vor 4 Jahren
Ursprung
Commit
5ba43e8b61
5 geänderte Dateien mit 15 neuen und 9 gelöschten Zeilen
  1. 3 3
      Cargo.lock
  2. 1 1
      Cargo.toml
  3. 9 3
      build.rs
  4. 1 1
      dns-transport/Cargo.toml
  5. 1 1
      dns/Cargo.toml

+ 3 - 3
Cargo.lock

@@ -130,7 +130,7 @@ checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
 
 [[package]]
 name = "dns"
-version = "0.1.0"
+version = "0.2.0-pre"
 dependencies = [
  "base64",
  "byteorder",
@@ -142,7 +142,7 @@ dependencies = [
 
 [[package]]
 name = "dns-transport"
-version = "0.1.0"
+version = "0.2.0-pre"
 dependencies = [
  "dns",
  "httparse",
@@ -152,7 +152,7 @@ dependencies = [
 
 [[package]]
 name = "dog"
-version = "0.1.0"
+version = "0.2.0-pre"
 dependencies = [
  "ansi_term",
  "atty",

+ 1 - 1
Cargo.toml

@@ -11,7 +11,7 @@ exclude = [
 ]
 homepage = "https://dns.lookup.dog/"
 license = "EUPL-1.2"
-version = "0.1.0"
+version = "0.2.0-pre"
 
 [[bin]]
 name = "dog"

+ 9 - 3
build.rs

@@ -30,7 +30,11 @@ fn main() -> io::Result<()> {
     let tagline = "dog \\1;32m●\\0m command-line DNS client";
     let url     = "https://dns.lookup.dog/";
 
-    let ver = if is_development_version() {
+    let ver =
+        if is_debug_build() {
+            format!("{}\nv{} \\1;31m(pre-release debug build!)\\0m\n\\1;4;34m{}\\0m", tagline, cargo_version(), url)
+        }
+        else if is_development_version() {
             format!("{}\nv{} [{}] built on {} \\1;31m(pre-release!)\\0m\n\\1;4;34m{}\\0m", tagline, cargo_version(), git_hash(), build_date(), url)
         }
         else {
@@ -74,7 +78,6 @@ fn git_hash() -> String {
             .stdout).trim().to_string()
 }
 
-
 /// Whether we should show pre-release info in the version string.
 ///
 /// Both weekly releases and actual releases are --release releases,
@@ -83,13 +86,16 @@ fn is_development_version() -> bool {
     cargo_version().ends_with("-pre") || env::var("PROFILE").unwrap() == "debug"
 }
 
+/// Whether we are building in debug mode.
+fn is_debug_build() -> bool {
+    env::var("PROFILE").unwrap() == "debug"
+}
 
 /// Retrieves the [package] version in Cargo.toml as a string.
 fn cargo_version() -> String {
     env::var("CARGO_PKG_VERSION").unwrap()
 }
 
-
 /// Formats the current date as an ISO 8601 string.
 fn build_date() -> String {
     let now = LocalDateTime::now();

+ 1 - 1
dns-transport/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dns-transport"
-version = "0.1.0"
+version = "0.2.0-pre"
 authors = ["Benjamin Sago <[email protected]>"]
 edition = "2018"
 

+ 1 - 1
dns/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dns"
-version = "0.1.0"
+version = "0.2.0-pre"
 authors = ["Benjamin Sago <[email protected]>"]
 edition = "2018"