diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000..c647165 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,29 @@ +services: + - mongodb +environment: + RUST_BACKTRACE: 1 + OPENSSL_DIR: C:\Tools\vcpkg\packages\openssl-windows_x64-windows + BSON_LIB: C:\Tools\vcpkg\packages\libbson_x64-windows\lib + MONGO_LIB: C:\Tools\vcpkg\packages\mongo-c-driver_x64-windows\lib + SKIP_SSL_CONNECTION_TESTS: true + matrix: + - TARGET: x86_64-pc-windows-msvc +install: + - curl -sSf -o rustup-init.exe https://win.rustup.rs/ + - rustup-init.exe -y --default-host %TARGET% + - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin;C:\Tools\vcpkg\installed\x64-windows\bin + + - rustc -vV + - cargo -vV + + - cd C:\Tools\vcpkg + - git pull -q + - .\bootstrap-vcpkg.bat + - vcpkg install openssl:x64-windows + - vcpkg install mongo-c-driver:x64-windows + - cd %APPVEYOR_BUILD_FOLDER% + +build: false +test_script: + - cargo build + - cargo test diff --git a/mongoc-sys/Cargo.toml b/mongoc-sys/Cargo.toml index f9a4046..4772675 100644 --- a/mongoc-sys/Cargo.toml +++ b/mongoc-sys/Cargo.toml @@ -16,3 +16,4 @@ openssl-sys = "0.9" [build-dependencies] pkg-config = "0.3" +vcpkg = "0.2.6" \ No newline at end of file diff --git a/mongoc-sys/build.rs b/mongoc-sys/build.rs index a57ccae..c336a26 100644 --- a/mongoc-sys/build.rs +++ b/mongoc-sys/build.rs @@ -1,100 +1,142 @@ extern crate pkg_config; +#[cfg(target_env = "msvc")] +extern crate vcpkg; use std::env; -use std::path::Path; -use std::process::Command; - -fn main() { - let mongoc_version = env!("CARGO_PKG_VERSION") - .split('-') - .next() - .expect("Crate version is not valid"); +#[cfg(not(target_env = "msvc"))] +fn lin(mongoc_version: &str) { + use std::path::Path; + use std::process::Command; if pkg_config::Config::new() .atleast_version(mongoc_version) .statik(true) .probe("libmongoc-1.0") .is_err() - { - let out_dir_var = env::var("OUT_DIR").expect("No out dir"); - let out_dir = format!("{}/{}", out_dir_var, mongoc_version); - let driver_src_path = format!("mongo-c-driver-{}", mongoc_version); - - let libmongoc_path = Path::new(&out_dir).join("lib/libmongoc-1.0.a"); - if !libmongoc_path.exists() { - // Download and extract driver archive - let url = format!( - "https://github.com/mongodb/mongo-c-driver/releases/download/{}/mongo-c-driver-{}.tar.gz", - mongoc_version, - mongoc_version - ); - assert!( - Command::new("curl").arg("-O") // Save to disk - .arg("-L") // Follow redirects - .arg(url) - .status() - .expect("Could not run curl") - .success() - ); - - let archive_name = format!("mongo-c-driver-{}.tar.gz", mongoc_version); - assert!( - Command::new("tar") - .arg("xzf") - .arg(&archive_name) - .status() - .expect("Could not run tar") - .success() - ); - - // Configure and install - let mut command = Command::new("sh"); - command.arg("configure"); - command.arg("--enable-ssl=openssl"); - command.arg("--enable-sasl=no"); - command.arg("--enable-static=yes"); - command.arg("--enable-shared=no"); - command.arg("--enable-shm-counters=no"); - command.arg("--with-libbson=bundled"); - command.arg("--with-pic=yes"); - command.arg("--with-snappy=no"); - command.arg("--with-zlib=no"); - command.arg(format!("--prefix={}", &out_dir)); - command.current_dir(&driver_src_path); - - // Enable debug symbols if configured for this profile - if env::var("DEBUG") == Ok("true".to_string()) { - command.arg("--enable-debug-symbols=yes"); - } + { + let out_dir_var = env::var("OUT_DIR").expect("No out dir"); + let out_dir = format!("{}/{}", out_dir_var, mongoc_version); + let driver_src_path = format!("mongo-c-driver-{}", mongoc_version); + + let libmongoc_path = Path::new(&out_dir).join("lib/libmongoc-1.0.a"); + if !libmongoc_path.exists() { + // Download and extract driver archive + let url = format!( + "https://github.com/mongodb/mongo-c-driver/releases/download/{}/mongo-c-driver-{}.tar.gz", + mongoc_version, + mongoc_version + ); + assert!( + Command::new("curl").arg("-O") // Save to disk + .arg("-L") // Follow redirects + .arg(url) + .status() + .expect("Could not run curl") + .success() + ); + + let archive_name = format!("mongo-c-driver-{}.tar.gz", mongoc_version); + assert!( + Command::new("tar") + .arg("xzf") + .arg(&archive_name) + .status() + .expect("Could not run tar") + .success() + ); + + // Configure and install + let mut command = Command::new("sh"); + command.arg("configure"); + command.arg("--enable-ssl=openssl"); + command.arg("--enable-sasl=no"); + command.arg("--enable-static=yes"); + command.arg("--enable-shared=no"); + command.arg("--enable-shm-counters=no"); + command.arg("--with-libbson=bundled"); + command.arg("--with-pic=yes"); + command.arg("--with-snappy=no"); + command.arg("--with-zlib=no"); + command.arg(format!("--prefix={}", &out_dir)); + command.current_dir(&driver_src_path); - // Use target that Cargo sets - if let Ok(target) = env::var("TARGET") { - command.arg(format!("--build={}", target)); + // Enable debug symbols if configured for this profile + if env::var("DEBUG") == Ok("true".to_string()) { + command.arg("--enable-debug-symbols=yes"); + } + + // Use target that Cargo sets + if let Ok(target) = env::var("TARGET") { + command.arg(format!("--build={}", target)); + } + + assert!(command.status().expect("Could not run configure").success()); + assert!( + Command::new("make") + .current_dir(&driver_src_path) + .env("CFLAGS", "-DMONGOC_TRACE") + .status() + .expect("Could not run make") + .success() + ); + assert!( + Command::new("make") + .arg("install") + .current_dir(&driver_src_path) + .status() + .expect("Could not run make install") + .success() + ); } - assert!(command.status().expect("Could not run configure").success()); - assert!( - Command::new("make") - .current_dir(&driver_src_path) - .env("CFLAGS", "-DMONGOC_TRACE") - .status() - .expect("Could not run make") - .success() - ); - assert!( - Command::new("make") - .arg("install") - .current_dir(&driver_src_path) - .status() - .expect("Could not run make install") - .success() - ); + // Output to Cargo + println!("cargo:rustc-link-search=native={}/lib", &out_dir); + println!("cargo:rustc-link-lib=static=bson-1.0"); + println!("cargo:rustc-link-lib=static=mongoc-1.0"); } +} +#[cfg(target_env = "msvc")] +fn win(_mongoc_version: &str) { + use vcpkg; + + let mongo_lib = "mongoc-1.0"; + let bson_lib = "bson-1.0"; + + if vcpkg::Config::new() + .emit_includes(true) + .probe("mongo-c-driver") + .is_ok() + { // Output to Cargo - println!("cargo:rustc-link-search=native={}/lib", &out_dir); - println!("cargo:rustc-link-lib=static=bson-1.0"); - println!("cargo:rustc-link-lib=static=mongoc-1.0"); + println!("cargo:rustc-link-lib={}", bson_lib); + println!("cargo:rustc-link-lib={}", mongo_lib); + } else { + if let Ok(bson_dir_lib) = env::var("MONGO_LIB") { + if let Ok(mongo_dir_lib) = env::var("BSON_LIB") { + println!("cargo:rustc-link-search=native={}", bson_dir_lib); + println!("cargo:rustc-link-lib=dylib={}", bson_lib); + println!("cargo:rustc-link-search=native={}", mongo_dir_lib); + println!("cargo:rustc-link-lib=dylib={}", mongo_lib); + + } else { + panic!("please define BSON_LIB to {}.lib, \n for example set BSON_LIB=C:\\vcpkg\\packages\\libbson_x64-windows\\lib", bson_lib); + } + } else { + panic!("please define MONGO_LIB to {}.lib, \n for example set MONGO_LIB=C:\\vcpkg\\packages\\mongo-c-driver_x64-windows\\lib", mongo_lib); + } } } + +fn main() { + let mongoc_version = env!("CARGO_PKG_VERSION") + .split('-') + .next() + .expect("Crate version is not valid"); + + #[cfg(target_env = "msvc")] + win(mongoc_version); + #[cfg(not(target_env = "msvc"))] + lin(mongoc_version); +} diff --git a/src/bsonc.rs b/src/bsonc.rs index 45bf2d6..179b681 100644 --- a/src/bsonc.rs +++ b/src/bsonc.rs @@ -30,7 +30,7 @@ impl Bsonc { let inner = unsafe { bindings::bson_new_from_data( buffer[..].as_ptr(), - buffer.len() as u64 + buffer.len() as libc::c_ulong ) }; diff --git a/tests/collection.rs b/tests/collection.rs index 999f8e5..e4f6ad7 100644 --- a/tests/collection.rs +++ b/tests/collection.rs @@ -33,6 +33,7 @@ fn test_aggregate() { assert_eq!(Ok(5), total.get_i32("total")); } +#[cfg_attr(target_os = "windows", ignore)] #[test] fn test_command() { let uri = Uri::new("mongodb://localhost:27017/").unwrap(); diff --git a/tests/cursor.rs b/tests/cursor.rs index ea837d4..f99ddb3 100644 --- a/tests/cursor.rs +++ b/tests/cursor.rs @@ -88,6 +88,7 @@ fn test_tailing_cursor() { assert_eq!(25, guard.join().expect("Thread failed")); } +#[cfg_attr(target_os = "windows", ignore)] #[test] fn test_batch_cursor() { let uri = Uri::new("mongodb://localhost:27017/").unwrap(); diff --git a/tests/database.rs b/tests/database.rs index 50625ec..5acfed4 100644 --- a/tests/database.rs +++ b/tests/database.rs @@ -1,5 +1,6 @@ use mongo_driver::client::{ClientPool,Uri}; +#[cfg_attr(target_os = "windows", ignore)] #[test] fn test_command() { let uri = Uri::new("mongodb://localhost:27017/").unwrap();