From 71737b4ef7b7957d04bf73e87d4591c585257702 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Tue, 7 Apr 2020 18:31:00 -0400 Subject: [PATCH 1/4] Update Aeron to 1.27.0 --- aeron-driver-sys/aeron | 2 +- aeron-driver-sys/src/lib.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aeron-driver-sys/aeron b/aeron-driver-sys/aeron index 6d959c2..1653358 160000 --- a/aeron-driver-sys/aeron +++ b/aeron-driver-sys/aeron @@ -1 +1 @@ -Subproject commit 6d959c2369c345ac177bd3ecc177dc672944af11 +Subproject commit 165335804f2695ff264c4b2d83457779d3962286 diff --git a/aeron-driver-sys/src/lib.rs b/aeron-driver-sys/src/lib.rs index 371981f..14d28c0 100644 --- a/aeron-driver-sys/src/lib.rs +++ b/aeron-driver-sys/src/lib.rs @@ -13,7 +13,7 @@ mod tests { let minor = unsafe { crate::aeron_version_minor() }; let patch = unsafe { crate::aeron_version_patch() }; assert_eq!(major, 1); - assert_eq!(minor, 25); - assert_eq!(patch, 1); + assert_eq!(minor, 27); + assert_eq!(patch, 0); } } From beb781962c1a961a8e3d847ed316ef868bfcfa55 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Tue, 7 Apr 2020 18:32:36 -0400 Subject: [PATCH 2/4] Also update the manifest --- aeron-driver-sys/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aeron-driver-sys/Cargo.toml b/aeron-driver-sys/Cargo.toml index 4911d7e..117d1b9 100644 --- a/aeron-driver-sys/Cargo.toml +++ b/aeron-driver-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aeron-driver-sys" -version = "1.0.0+1.25.1" +version = "1.0.0+1.27.0" authors = ["Bradlee Speice "] edition = "2018" links = "aeron_driver" From 9fd82b00b02a0be4a2b8eaae584f5a69f8571c36 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Tue, 7 Apr 2020 19:39:37 -0400 Subject: [PATCH 3/4] Add the C client include directory Will eventually need to move the `aeron/` folder and add an aeron-client-sys crate. --- aeron-driver-sys/build.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/aeron-driver-sys/build.rs b/aeron-driver-sys/build.rs index c8faa72..f974b1b 100644 --- a/aeron-driver-sys/build.rs +++ b/aeron-driver-sys/build.rs @@ -91,6 +91,7 @@ pub fn main() { println!("cargo:include={}", header_path.display()); let bindings = bindgen::Builder::default() .clang_arg(format!("-I{}", header_path.display())) + .clang_arg(format!("-I{}", aeron_path.join("aeron-client/src/main/c").display())) .header("bindings.h") .whitelist_function("aeron_.*") .whitelist_type("aeron_.*") From 685c360d2d66c3ef686da3b3720ab46039bdf939 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Tue, 7 Apr 2020 23:15:39 -0400 Subject: [PATCH 4/4] Formatting --- aeron-driver-sys/build.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aeron-driver-sys/build.rs b/aeron-driver-sys/build.rs index f974b1b..0248941 100644 --- a/aeron-driver-sys/build.rs +++ b/aeron-driver-sys/build.rs @@ -91,7 +91,10 @@ pub fn main() { println!("cargo:include={}", header_path.display()); let bindings = bindgen::Builder::default() .clang_arg(format!("-I{}", header_path.display())) - .clang_arg(format!("-I{}", aeron_path.join("aeron-client/src/main/c").display())) + .clang_arg(format!( + "-I{}", + aeron_path.join("aeron-client/src/main/c").display() + )) .header("bindings.h") .whitelist_function("aeron_.*") .whitelist_type("aeron_.*")