link and version

CHANGES.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+- Set the link flag of gdal-sys to "libgdal". Emit the libgdal version via cargo:version_number. Remove wrong build-dependency on gdal-sys and remove docs_rs workaround.
+
+  - <https://github.com/georust/gdal/pull/377>
+
 - Added `Geometry::from_geojson`
 
   - <https://github.com/georust/gdal/pull/375>
@@ -42,7 +46,7 @@
 
   - <https://github.com/georust/gdal/pull/355>
 
-- Exposed various functions on `Geometry`:  `make_valid`, `geometry_name`, and `point_count`.
+- Exposed various functions on `Geometry`: `make_valid`, `geometry_name`, and `point_count`.
 
   - <https://github.com/georust/gdal/pull/356>
 
@@ -53,7 +57,7 @@
 - Exposed spatial predicates over `Geometry`: `intersects`, `contains`, `disjoint`, `touches`, `crosses`, `within`, and `overlaps`.
 
   - <https://github.com/georust/gdal/pull/366>
-  
+
 - Added `Geometry::envelope` and `Geometry::envelope_3d`.
 
   - <https://github.com/georust/gdal/pull/370>

Cargo.toml

@@ -27,7 +27,6 @@ bitflags = "1.3"
 once_cell = "1.9"
 
 [build-dependencies]
-gdal-sys = { path = "gdal-sys", version = "^0.8" }
 semver = "1.0"
 
 [dev-dependencies]

build.rs

@@ -1,11 +1,8 @@
-use std::str::FromStr;
-
-fn gdal_version_info() -> String {
-    gdal_sys::gdal_version_docs_rs_wrapper()
-}
+use std::{env, str::FromStr};
 
 fn main() {
-    let gdal_version_string = gdal_version_info();
+    let gdal_version_string = env::var("DEP_GDAL_VERSION_NUMBER")
+        .expect("The GDAL-SYS crate must emit the version of libgdal via cargo:version_number");
     println!("GDAL version string: \"{gdal_version_string}\"");
 
     // this version string is the result of:

gdal-sys/Cargo.toml

@@ -7,6 +7,7 @@ repository = "https://github.com/georust/gdal"
 authors = ["Johannes Drönner <[email protected]>"]
 edition = "2018"
 rust-version = "1.58"
+links="gdal"
 
 [dependencies]
 libc = "0.2"

gdal-sys/build.rs

@@ -59,45 +59,24 @@ fn find_gdal_dll(lib_dir: &Path) -> io::Result<Option<String>> {
     Ok(None)
 }
 
-fn add_docs_rs_helper(version: Option<&str>) {
-    let out_path = PathBuf::from(env::var("OUT_DIR").unwrap()).join("docs_rs_helper.rs");
-    let docs_helper_code = if let Some(version) = version {
-        format!(
-            r#"
-        pub fn gdal_version_docs_rs_wrapper() -> String {{
-            "{version}".to_string()
-        }}"#
-        )
-    } else {
-        r#"
-        pub fn gdal_version_docs_rs_wrapper() -> String {
-            let key = "VERSION_NUM";
-            let c_key = std::ffi::CString::new(key.as_bytes()).unwrap();
-
-            unsafe {
-                let res_ptr = crate::GDALVersionInfo(c_key.as_ptr());
-                let c_res = std::ffi::CStr::from_ptr(res_ptr);
-                c_res.to_string_lossy().into_owned()
-            }
-        }"#
-        .to_string()
-    };
-    std::fs::write(out_path, docs_helper_code.as_bytes()).unwrap();
-}
-
 fn main() {
     let out_path = PathBuf::from(env::var("OUT_DIR").unwrap()).join("bindings.rs");
 
     // Hardcode a prebuilt binding version while generating docs.
     // Otherwise docs.rs will explode due to not actually having libgdal installed.
     if std::env::var("DOCS_RS").is_ok() {
         let version = Version::parse("3.5.0").expect("invalid version for docs.rs");
-        add_docs_rs_helper(Some("3050000"));
         println!(
             "cargo:rustc-cfg=gdal_sys_{}_{}_{}",
             version.major, version.minor, version.patch
         );
 
+        // this version string is the result of:
+        // #define GDAL_COMPUTE_VERSION(maj,min,rev) ((maj)*1000000+(min)*10000+(rev)*100)
+        let gdal_version_number_string =
+            version.major * 1_000_000 + version.minor * 10_000 + version.patch * 100;
+        println!("cargo:version_number={}", gdal_version_number_string);
+
         let binding_path = PathBuf::from(format!(
             "prebuilt-bindings/gdal_{}.{}.rs",
             version.major, version.minor
@@ -112,7 +91,6 @@ fn main() {
         return;
     }
 
-    add_docs_rs_helper(None);
     println!("cargo:rerun-if-env-changed=GDAL_STATIC");
     println!("cargo:rerun-if-env-changed=GDAL_DYNAMIC");
     println!("cargo:rerun-if-env-changed=GDAL_INCLUDE_DIR");
@@ -231,6 +209,14 @@ fn main() {
         }
     }
 
+    if let Some(gdal_version) = &version {
+        // this version string is the result of:
+        // #define GDAL_COMPUTE_VERSION(maj,min,rev) ((maj)*1000000+(min)*10000+(rev)*100)
+        let gdal_version_number_string =
+            gdal_version.major * 1_000_000 + gdal_version.minor * 10_000 + gdal_version.patch * 100;
+        println!("cargo:version_number={}", gdal_version_number_string);
+    }
+
     #[cfg(feature = "bindgen")]
     write_bindings(include_paths, &out_path);
 

gdal-sys/src/lib.rs

@@ -5,4 +5,3 @@
 #![allow(rustdoc::bare_urls)]
 
 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
-include!(concat!(env!("OUT_DIR"), "/docs_rs_helper.rs"));