Merge pull request #9 from thijsc/rust-openssl

Move to openssl-sys

.gitignore

@@ -1,4 +1,4 @@
 target
 Cargo.lock
-mongo_c_driver_wrapper/mongo-c-driver*
+mongoc-sys/mongo-c-driver*
-mongo_c_driver_wrapper/src/bindings.rs
+mongoc-sys/src/bindings.rs

Cargo.toml

@@ -17,6 +17,6 @@ libc = "*"
 [dependencies.bson]
 git = "https://github.com/zonyitoo/bson-rs.git"
 
-[dependencies.mongo_c_driver_wrapper]
+[dependencies.mongoc-sys]
-path    = "mongo_c_driver_wrapper"
+path    = "mongoc-sys"
 version = "1.1.10"

mongoc-sys/Cargo.toml

@@ -1,11 +1,13 @@
 [package]
-name    = "mongo_c_driver_wrapper"
+name    = "mongoc-sys"
 version = "1.1.10"
-build   = "build.rs"
 authors = ["Thijs Cadier <thijs@appsignal.com>"]
+build   = "build.rs"
+links   = "mongoc"
 
 [dependencies]
 libc        = "*"
+openssl-sys = "*"
 
 [build-dependencies.bindgen]
 git = "https://github.com/crabtw/rust-bindgen.git"

mongoc-sys/build.rs

@@ -107,15 +107,7 @@ fn main() {
     }
 
     // Output to Cargo
-    println!("cargo:root={}", &out_dir);
+    println!("cargo:rustc-link-search=native={}/lib", &out_dir);
-    println!("cargo:libdir={}/lib", &out_dir);
-    println!("cargo:include={}/include", &out_dir);
-    println!("cargo:rustc-link-search={}/lib", &out_dir);
     println!("cargo:rustc-link-lib=static=bson-1.0");
     println!("cargo:rustc-link-lib=static=mongoc-1.0");
-
-    // Link openssl dynamically
-    // TODO see if we can make this compatible with openssl-sys
-    println!("cargo:rustc-link-lib=dylib=ssl");
-    println!("cargo:rustc-link-lib=dylib=crypto");
 }

mongoc-sys/src/lib.rs

@@ -1,4 +1,5 @@
 extern crate libc;
+extern crate openssl_sys;
 
 #[allow(non_camel_case_types,non_snake_case)]
 pub mod bindings;

src/bsonc.rs

@@ -7,7 +7,7 @@ use libc::types::common::c95::c_void;
 
 use super::BsoncError;
 
-use mongo_c_driver_wrapper::bindings;
+use mongoc::bindings;
 use bson;
 
 use super::Result;

src/bulk_operation.rs

@@ -1,8 +1,4 @@
-extern crate libc;
+use mongoc::bindings;
-extern crate mongo_c_driver_wrapper;
-extern crate bson;
-
-use mongo_c_driver_wrapper::bindings;
 use bson::Document;
 
 use super::BsoncError;

src/client.rs

@@ -6,7 +6,7 @@ use std::ptr;
 use std::io;
 use std::fs::File;
 
-use mongo_c_driver_wrapper::bindings;
+use mongoc::bindings;
 
 use bson::Document;
 

src/collection.rs

@@ -2,7 +2,7 @@ use std::ptr;
 use std::ffi::CStr;
 use std::borrow::Cow;
 
-use mongo_c_driver_wrapper::bindings;
+use mongoc::bindings;
 
 use bson::Document;
 

src/cursor.rs

@@ -2,7 +2,7 @@ use std::iter::Iterator;
 use std::ptr;
 use std::thread;
 
-use mongo_c_driver_wrapper::bindings;
+use mongoc::bindings;
 use bson::{Bson,Document,oid};
 
 use super::BsoncError;

src/database.rs

@@ -2,7 +2,7 @@ use std::ffi::{CString,CStr};
 use std::borrow::Cow;
 use std::ptr;
 
-use mongo_c_driver_wrapper::bindings;
+use mongoc::bindings;
 use bson::Document;
 
 use super::Result;

src/error.rs

@@ -5,7 +5,7 @@ use std::ffi::CStr;
 
 use bson::{DecoderError,EncoderError,ValueAccessError};
 
-use mongo_c_driver_wrapper::bindings;
+use mongoc::bindings;
 
 pub enum MongoError {
     Bsonc(BsoncError),

src/flags.rs

@@ -1,4 +1,4 @@
-use mongo_c_driver_wrapper::bindings;
+use mongoc::bindings;
 
 use std::collections::BTreeSet;
 

src/lib.rs

@@ -1,7 +1,7 @@
 #![feature(convert)]
 
 extern crate libc;
-extern crate mongo_c_driver_wrapper;
+extern crate mongoc_sys as mongoc;
 
 #[macro_use]
 extern crate bson;
@@ -9,7 +9,7 @@ extern crate bson;
 use std::result;
 use std::sync::{Once,ONCE_INIT};
 
-use mongo_c_driver_wrapper::bindings;
+use mongoc::bindings;
 
 pub mod bulk_operation;
 pub mod client;

src/read_prefs.rs

@@ -1,4 +1,4 @@
-use mongo_c_driver_wrapper::bindings;
+use mongoc::bindings;
 
 pub enum ReadMode {
     Primary,

src/uri.rs

@@ -2,7 +2,7 @@ use std::borrow::Cow;
 use std::ffi::{CStr,CString};
 use std::fmt;
 
-use mongo_c_driver_wrapper::bindings;
+use mongoc::bindings;
 
 /// Abstraction on top of MongoDB connection URI format.
 /// See: http://api.mongodb.org/c/current/mongoc_uri_t.html

src/write_concern.rs

@@ -1,4 +1,4 @@
-use mongo_c_driver_wrapper::bindings;
+use mongoc::bindings;
 
 pub struct WriteConcern {
     inner: *mut bindings::mongoc_write_concern_t