Split package to pcsc, pcsc-sys

Author: bluetech

.travis.yml

@@ -14,6 +14,11 @@ matrix:
   allow_failures:
     - rust: nightly
 
+script:
+  - cd pcsc-sys && cargo build --verbose
+  - cd ../pcsc && cargo build --verbose
+  - cd ../pcsc && cargo test --verbose
+
 cache: cargo
 
 addons:

Cargo.toml

@@ -1,15 +1,2 @@
-[package]
-name = "pcsc"
-description = "Bindings to PC/SC for smart card communication"
-version = "0.1.0-alpha3"
-license = "MIT"
-keywords = ["pcsc", "smartcard"]
-categories = ["hardware-support", "external-ffi-bindings", "api-bindings"]
-documentation = "https://docs.rs/pcsc"
-repository = "https://github.com/bluetech/pcsc-rust"
-homepage = "https://github.com/bluetech/pcsc-rust"
-readme = "README.md"
-authors = ["Ran Benita <[email protected]>"]
-
-[dependencies]
-bitflags = "0.7"
+[workspace]
+members = ["pcsc", "pcsc-sys"]

appveyor.yml

@@ -16,5 +16,6 @@ install:
 build: false
 
 test_script:
-  - cargo build --verbose
-  - cargo test --verbose
+  - cd pcsc-sys && cargo build --verbose
+  - cd ../pcsc && cargo build --verbose
+  - cd ../pcsc && cargo test --verbose

pcsc-sys/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "pcsc-sys"
+description = "Low-level bindings to PC/SC for smart card communication"
+version = "0.1.0-alpha3"
+license = "MIT"
+keywords = ["pcsc", "smartcard"]
+categories = ["hardware-support", "external-ffi-bindings"]
+documentation = "https://docs.rs/pcsc-sys"
+repository = "https://github.com/bluetech/pcsc-rust"
+homepage = "https://github.com/bluetech/pcsc-rust"
+authors = ["Ran Benita <[email protected]>"]

src/ffi.rs pcsc-sys/src/lib.rs

@@ -1,6 +1,4 @@
 // TODO: Should probably use a build-script to detect the libraries.
-// TODO: Should probably move to a separate pcsc-sys crate, as per
-//       http://doc.crates.io/build-script.html#-sys-packages
 
 #![allow(dead_code)]
 #![allow(bad_style)]

pcsc/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "pcsc"
+description = "Bindings to PC/SC for smart card communication"
+version = "0.1.0-alpha3"
+license = "MIT"
+keywords = ["pcsc", "smartcard"]
+categories = ["hardware-support", "api-bindings"]
+documentation = "https://docs.rs/pcsc"
+repository = "https://github.com/bluetech/pcsc-rust"
+homepage = "https://github.com/bluetech/pcsc-rust"
+readme = "../README.md"
+authors = ["Ran Benita <[email protected]>"]
+
+[dependencies]
+bitflags = "0.7"
+pcsc-sys = { version = "0.1.0-alpha3", path = "../pcsc-sys" }

examples/cancel.rs pcsc/examples/cancel.rs

@@ -93,6 +93,7 @@
 
 #[macro_use]
 extern crate bitflags;
+extern crate pcsc_sys as ffi;
 
 use std::os::raw::c_char;
 use std::ffi::{CStr, CString};
@@ -101,7 +102,6 @@ use std::ptr::{null, null_mut};
 use std::marker::PhantomData;
 use std::ops::Deref;
 
-mod ffi;
 use ffi::{DWORD, LONG};
 
 // Note on potentially problematic casts (clippy lints `cast-sign-loss`,