Merge pull request #2 from mbillingr/cmake-mrg

add optional cmake builds

.circleci/config.yml

@@ -4,7 +4,12 @@ jobs:
     docker:
       - image: rustlang/rust:nightly
     steps:
+      - run: apt -y update --fix-missing
+      - run: apt -y install cmake
       - checkout
       - run: git submodule update --init --recursive
       - run: cargo build
       - run: cd examples && ./test.sh
+      - run: |
+          git clean -dfx
+          cargo build --no-default-features --features cmake

Cargo.toml

@@ -8,8 +8,12 @@ edition = "2018"
 license = "MIT"
 build = "build.rs"
 
+[features]
+default = ["autotools"]
+
 [dependencies]
 libc = "0.2"
 
 [build-dependencies]
-autotools = "0.2"
+autotools = { version = "0.2", optional = true }
+cmake = { version = "0.1", optional = true }

README.md

@@ -12,6 +12,12 @@ This crate is for use cases in which developers need to integrate [`bdwgc`][bdwg
 
 See [`examples`](examples) directory.
 
+By default [`bdwgc`][bdwgc] is built with autotools. To build with cmake, enable the `cmake` feature:
+
+```sh
+cargo build --no-default-features --features cmake
+```
+
 ## License
 
 [MIT](LICENSE)

build.rs

@@ -1,6 +1,7 @@
 const LIB_ATOMIC_OPS_DIR: &str = "vendor/libatomic_ops";
 const LIB_GC_DIR: &str = "vendor/bdwgc";
 
+#[cfg(feature = "autotools")]
 fn main() {
     for dir in &[LIB_ATOMIC_OPS_DIR, LIB_GC_DIR] {
         std::process::Command::new("sh")
@@ -41,3 +42,29 @@ fn main() {
             .unwrap();
     }
 }
+
+#[cfg(feature = "cmake")]
+fn main() {
+    use cmake::Config;
+    use std::path::Path;
+
+    let libatomic_include_path = Path::new(LIB_ATOMIC_OPS_DIR)
+        .join("src")
+        .canonicalize()
+        .unwrap()
+        .display()
+        .to_string()
+        .replace(r"\\?\", "");
+
+    let dst = Config::new(LIB_GC_DIR)
+        .profile("Release")
+        .define("BUILD_SHARED_LIBS", "FALSE")
+        .cflag(format!("-I{}", libatomic_include_path))
+        .build();
+
+    println!(
+        "cargo:rustc-link-search=native={}",
+        dst.join("lib").display()
+    );
+    println!("cargo:rustc-link-lib=static=gc");
+}

examples/Cargo.toml

@@ -1,9 +1,7 @@
 [workspace]
 members = [
-  "coroutines",
   "dynamic_threads",
   "free_by_borrow",
   "free_by_gc",
   "static_threads",
-  "suspended_coroutines",
 ]

examples/coroutines/Cargo.toml

@@ -1,10 +0,0 @@
-[package]
-name = "coroutines"
-version = "0.1.0"
-authors = ["Yota Toyama <raviqqe@gmail.com>"]
-edition = "2018"
-publish = false
-
-[dependencies]
-bdwgc-alloc = { path = "../.." }
-coroutine = "0.8"

examples/coroutines/src/main.rs

@@ -1,26 +0,0 @@
-extern crate bdwgc_alloc;
-extern crate coroutine;
-
-use bdwgc_alloc::Allocator;
-use coroutine::asymmetric::Coroutine;
-use std::alloc::Layout;
-
-#[global_allocator]
-static GLOBAL_ALLOCATOR: Allocator = Allocator;
-
-fn main() {
-    unsafe { Allocator::initialize() }
-    Allocator::lock();
-
-    let handle = Coroutine::spawn(move |_, _| {
-        let bottom: u8 = 0;
-        unsafe { Allocator::set_stack_bottom(&bottom) }
-        Allocator::unlock();
-
-        loop {
-            unsafe { std::alloc::alloc(Layout::from_size_align(2 ^ 8, 8).unwrap()) };
-        }
-    });
-
-    for _ in handle {}
-}

examples/suspended_coroutines/Cargo.toml

@@ -1,10 +0,0 @@
-[package]
-name = "suspended_coroutines"
-version = "0.1.0"
-authors = ["Yota Toyama <raviqqe@gmail.com>"]
-edition = "2018"
-publish = false
-
-[dependencies]
-bdwgc-alloc = { path = "../.." }
-coroutine = "0.8"

examples/suspended_coroutines/src/main.rs

@@ -1,33 +0,0 @@
-extern crate bdwgc_alloc;
-extern crate coroutine;
-
-use bdwgc_alloc::Allocator;
-use coroutine::asymmetric::Coroutine;
-use std::alloc::Layout;
-
-#[global_allocator]
-static GLOBAL_ALLOCATOR: Allocator = Allocator;
-
-fn main() {
-    unsafe { Allocator::initialize() }
-
-    Allocator::lock();
-    let mut handle = Coroutine::spawn(move |me, _| {
-        let bottom: u8 = 0;
-        unsafe { Allocator::set_stack_bottom(&bottom) }
-        Allocator::unlock();
-
-        me.yield_with(42);
-        unsafe { Allocator::set_stack_bottom(&bottom) }
-        Allocator::unlock();
-
-        loop {
-            unsafe { std::alloc::alloc(Layout::from_size_align(2 ^ 8, 8).unwrap()) };
-        }
-    });
-
-    Allocator::lock();
-    assert_eq!(handle.resume(0).unwrap(), 42);
-
-    handle.resume(0).unwrap();
-}