diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b4c59a..52312b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,13 @@ This project follows [semantic versioning](http://semver.org). +### UNRELEASED + +- [changed] Allow to build binary without manpage + ### v0.9.1 (2019-02-16) --[fixed] Fixed bug in new hex secret key functionality +- [fixed] Fixed bug in new hex secret key functionality ### v0.9.0 (2019-02-15) diff --git a/build.rs b/build.rs index 5db73d6..9def714 100644 --- a/build.rs +++ b/build.rs @@ -13,13 +13,20 @@ fn main() { let out_dir = env::var("OUT_DIR").unwrap(); // Compile tun/tap C code - println!("rerun-if-changed=src/c/tuntap.c"); + println!("cargo:rerun-if-changed=src/c/tuntap.c"); cc::Build::new().file("src/c/tuntap.c").include("src").compile("libtuntap.a"); // Process manpage using ronn command - println!("rerun-if-changed=vpncloud.md"); + println!("cargo:rerun-if-changed=vpncloud.md"); fs::copy("vpncloud.md", Path::new(&out_dir).join("vpncloud.1.ronn")).unwrap(); - Command::new("ronn").args(&["-r", "vpncloud.1.ronn"]).current_dir(&Path::new(&out_dir)).status().expect("Failed to process manpage, ronn command missing?"); - Command::new("gzip").args(&["vpncloud.1"]).current_dir(&Path::new(&out_dir)).status().unwrap(); - fs::copy(Path::new(&out_dir).join("vpncloud.1.gz"), "target/vpncloud.1.gz").unwrap(); + match Command::new("ronn").args(&["-r", "vpncloud.1.ronn"]).current_dir(&Path::new(&out_dir)).status() { + Ok(_) => { + Command::new("gzip").args(&["vpncloud.1"]).current_dir(&Path::new(&out_dir)).status().unwrap(); + fs::copy(Path::new(&out_dir).join("vpncloud.1.gz"), "target/vpncloud.1.gz").unwrap(); + }, + Err(err) => { + println!("cargo:warning=Error building manpage: {}", err); + println!("cargo:warning=The manpage will not be build. Do you have 'ronn'?"); + } + } }