move netcdf-c to netcdf-src

Author: magnusuMET

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "netcdf-sys/source"]
-	path = netcdf-sys/source
+	path = netcdf-src/source
 	url = https://github.com/Unidata/netcdf-c.git

Cargo.toml

@@ -30,6 +30,7 @@ structopt = "0.3.3"
 [workspace]
 members = [
     "netcdf-sys",
+    "netcdf-src",
 ]
 
 [patch]

netcdf-src/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "netcdf-src"
+version = "0.1.0"
+authors = ["Magnus Ulimoen <magnusu@met.no>"]
+edition = "2018"
+description = "Build scripts for building `netCDF` from source"
+build = "build.rs"
+license-file = "source/COPYRIGHT"
+links = "netcdfsrc"
+
+[features]
+dap = []
+
+[dependencies]
+hdf5-sys = { version = "*", features=["hl", "deprecated", "zlib"] }
+
+[build-dependencies]
+cmake = "0.1.42"

netcdf-src/build.rs

@@ -0,0 +1,43 @@
+macro_rules! feature {
+    ($feature:expr) => {
+        std::env::var(concat!("CARGO_FEATURE_", $feature))
+    };
+}
+
+fn main() {
+    println!("cargo:rerun-if-changed=build.rs");
+
+    let hdf5_incdir = std::env::var("DEP_HDF5_INCLUDE").unwrap();
+    let hdf5_lib = std::env::var("DEP_HDF5_LIBRARY").unwrap();
+    let hdf5_hl_lib = std::env::var("DEP_HDF5_HL_LIBRARY").unwrap();
+
+    let mut netcdf_config = cmake::Config::new("source");
+    netcdf_config
+        .define("BUILD_SHARED_LIBS", "OFF")
+        .define("NC_FIND_SHARED_LIBS", "OFF")
+        .define("BUILD_UTILITIES", "OFF")
+        .define("ENABLE_EXAMPLES", "OFF")
+        .define("ENABLE_DAP_REMOTE_TESTS", "OFF")
+        .define("ENABLE_TESTS", "OFF")
+        .define("ENABLE_EXTREME_NUMBERS", "OFF")
+        .define("ENABLE_PARALLEL_TESTS", "OFF")
+        .define("ENABLE_FILTER_TESTING", "OFF")
+        .define("ENABLE_BASH_SCRIPT_TESTING", "OFF")
+        //
+        .define("HDF5_C_LIBRARY", &hdf5_lib)
+        .define("HDF5_HL_LIBRARY", &hdf5_hl_lib)
+        .define("HDF5_INCLUDE_DIR", hdf5_incdir)
+        //
+        .define("ENABLE_DAP", "OFF") // TODO: feature flag, requires curl
+        //
+        .profile("RelWithDebInfo"); // TODO: detect opt-level
+
+    if feature!("DAP").is_ok() {
+        netcdf_config.define("ENABLE_DAP", "ON");
+    }
+
+    let netcdf = netcdf_config.build();
+
+    println!("cargo:lib={}", "netcdf");
+    println!("cargo:search={}/lib", netcdf.display());
+}

netcdf-src/source

@@ -0,0 +1 @@
+//! Dummy crate for building `netCDF` from source

netcdf-src/src/lib.rs

@@ -36,20 +36,14 @@ exclude = [
 libz-sys = { version = "1.0.25" }
 curl-sys = { version = "0.4.25", optional = true }
 hdf5-sys = { version = "0.6.0", features = ["hl", "deprecated", "zlib"] }
+netcdf-src = { path = "../netcdf-src", version = "0.1.0", optional = true }
 
 [dev-dependencies]
 lazy_static = "1.4.0"
 
-[build-dependencies]
-cmake = "0.1.42"
-
 [features]
 default = []
 memio = []
-static = ["libz-sys/static", "hdf5-sys/static"]
+static = ["libz-sys/static", "hdf5-sys/static", "netcdf-src"]
 # TODO: Link static curl (but only when using "dap") "curl-sys/static-curl", "curl-sys/static-ssl"
 dap = ["curl-sys"]
-
-[patch]
-[patch.crates-io]
-hdf5-sys = { git = "https://github.com/magnusuMET/hdf5-rust", branch = "feature/static_build" }

netcdf-sys/Cargo.toml

@@ -6,48 +6,15 @@ macro_rules! feature {
 
 fn main() {
     println!("cargo:rerun-if-changed=build.rs");
-    if feature!("STATIC").is_ok() {
-        build();
-        return;
-    }
-    // Link to the system netcdf
-    println!("cargo:rustc-link-lib=netcdf");
-    println!("cargo:rerun-if-changed=build.rs");
-}
-
-fn build() {
-    let hdf5_incdir = std::env::var("DEP_HDF5_INCLUDE").unwrap();
-    let hdf5_lib = std::env::var("DEP_HDF5_LIBRARY").unwrap();
-    let hdf5_hl_lib = std::env::var("DEP_HDF5_HL_LIBRARY").unwrap();
 
+    if feature!("STATIC").is_ok() {
+        let netcdf_lib = std::env::var("DEP_NETCDFSRC_LIB").unwrap();
+        let netcdf_path = std::env::var("DEP_NETCDFSRC_SEARCH").unwrap();
 
-    let mut netcdf_config = cmake::Config::new("source");
-    netcdf_config
-        .define("BUILD_SHARED_LIBS", "OFF")
-        .define("NC_FIND_SHARED_LIBS", "OFF")
-        .define("BUILD_UTILITIES", "OFF")
-        .define("ENABLE_EXAMPLES", "OFF")
-        .define("ENABLE_DAP_REMOTE_TESTS", "OFF")
-        .define("ENABLE_TESTS", "OFF")
-        .define("ENABLE_EXTREME_NUMBERS", "OFF")
-        .define("ENABLE_PARALLEL_TESTS", "OFF")
-        .define("ENABLE_FILTER_TESTING", "OFF")
-        .define("ENABLE_BASH_SCRIPT_TESTING", "OFF")
-        //
-        .define("HDF5_C_LIBRARY", &hdf5_lib)
-        .define("HDF5_HL_LIBRARY", &hdf5_hl_lib)
-        .define("HDF5_INCLUDE_DIR", hdf5_incdir)
-        //
-        .define("ENABLE_DAP", "OFF") // TODO: feature flag, requires curl
-        //
-        .profile("RelWithDebInfo"); // TODO: detect opt-level
-
-    if feature!("DAP").is_ok() {
-        netcdf_config.define("ENABLE_DAP", "ON");
+        println!("cargo:rustc-link-lib=static={}", netcdf_lib);
+        println!("cargo:rustc-link-search=native={}", netcdf_path);
+    } else {
+        // Link to the system netcdf
+        println!("cargo:rustc-link-lib=netcdf");
     }
-
-    let netcdf = netcdf_config.build();
-
-    println!("cargo:rustc-link-lib=static=netcdf");
-    println!("cargo:rustc-link-search=native={}/lib", netcdf.display());
 }

netcdf-sys/build.rs

@@ -6,6 +6,9 @@ extern crate hdf5_sys;
 #[cfg(feature = "dap")]
 extern crate curl_sys;
 
+#[cfg(feature = "static")]
+extern crate netcdf_src;
+
 mod netcdf_bindings;
 mod netcdf_const;
 pub use netcdf_bindings::*;