From b9b5b74b7c3e8c2212d708f8d7419d10d6e43b4e Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Sun, 12 Jan 2020 16:47:29 -0500 Subject: [PATCH] Rename to aeron-driver-sys, update to 1.25.0 release --- .gitmodules | 6 +++--- .travis.yml | 2 +- Cargo.toml | 2 +- {aeron_driver-sys => aeron-driver-sys}/.gitignore | 0 {aeron_driver-sys => aeron-driver-sys}/Cargo.toml | 4 ++-- aeron-driver-sys/aeron | 1 + {aeron_driver-sys => aeron-driver-sys}/bindings.h | 0 {aeron_driver-sys => aeron-driver-sys}/build.rs | 0 {aeron_driver-sys => aeron-driver-sys}/src/lib.rs | 4 ++-- aeron-rs/Cargo.toml | 2 +- aeron_driver-sys/aeron | 1 - 11 files changed, 11 insertions(+), 11 deletions(-) rename {aeron_driver-sys => aeron-driver-sys}/.gitignore (100%) rename {aeron_driver-sys => aeron-driver-sys}/Cargo.toml (81%) create mode 160000 aeron-driver-sys/aeron rename {aeron_driver-sys => aeron-driver-sys}/bindings.h (100%) rename {aeron_driver-sys => aeron-driver-sys}/build.rs (100%) rename {aeron_driver-sys => aeron-driver-sys}/src/lib.rs (88%) delete mode 160000 aeron_driver-sys/aeron diff --git a/.gitmodules b/.gitmodules index ec150a4..ba87f5a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "aeron_driver-sys/aeron"] - path = aeron_driver-sys/aeron - url = https://github.com/real-logic/aeron +[submodule "aeron-driver-sys/aeron"] + path = aeron-driver-sys/aeron + url = https://github.com/real-logic/aeron.git diff --git a/.travis.yml b/.travis.yml index 9387eea..3f7ca30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ script: - cargo test --release --no-run - cargo test --release - - cd aeron_driver-sys/ + - cd aeron-driver-sys/ - cargo test --features "static" - cd .. diff --git a/Cargo.toml b/Cargo.toml index 31811c5..23cbb54 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] members = [ - "aeron_driver-sys", + "aeron-driver-sys", "aeron-rs" ] diff --git a/aeron_driver-sys/.gitignore b/aeron-driver-sys/.gitignore similarity index 100% rename from aeron_driver-sys/.gitignore rename to aeron-driver-sys/.gitignore diff --git a/aeron_driver-sys/Cargo.toml b/aeron-driver-sys/Cargo.toml similarity index 81% rename from aeron_driver-sys/Cargo.toml rename to aeron-driver-sys/Cargo.toml index a3c2f78..eee96aa 100644 --- a/aeron_driver-sys/Cargo.toml +++ b/aeron-driver-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "aeron_driver-sys" -version = "0.1.0+1.22.0" +name = "aeron-driver-sys" +version = "1.0.0+1.25.0" authors = ["Bradlee Speice "] edition = "2018" links = "aeron_driver" diff --git a/aeron-driver-sys/aeron b/aeron-driver-sys/aeron new file mode 160000 index 0000000..977bda6 --- /dev/null +++ b/aeron-driver-sys/aeron @@ -0,0 +1 @@ +Subproject commit 977bda6f9e9ef3c5b502c8a8c741262147d7f464 diff --git a/aeron_driver-sys/bindings.h b/aeron-driver-sys/bindings.h similarity index 100% rename from aeron_driver-sys/bindings.h rename to aeron-driver-sys/bindings.h diff --git a/aeron_driver-sys/build.rs b/aeron-driver-sys/build.rs similarity index 100% rename from aeron_driver-sys/build.rs rename to aeron-driver-sys/build.rs diff --git a/aeron_driver-sys/src/lib.rs b/aeron-driver-sys/src/lib.rs similarity index 88% rename from aeron_driver-sys/src/lib.rs rename to aeron-driver-sys/src/lib.rs index 2d82dff..7b4c8ae 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, 23); - assert_eq!(patch, 1); + assert_eq!(minor, 25); + assert_eq!(patch, 0); } } diff --git a/aeron-rs/Cargo.toml b/aeron-rs/Cargo.toml index 63ae711..3932017 100644 --- a/aeron-rs/Cargo.toml +++ b/aeron-rs/Cargo.toml @@ -12,7 +12,7 @@ travis-ci = { repository = "bspeice/aeron-rs", branch = "master" } maintenance = { status = "actively-developed" } [dependencies] -aeron_driver-sys = { path = "../aeron_driver-sys" } +aeron-driver-sys = { path = "../aeron-driver-sys" } memmap = "0.7" [dev-dependencies] diff --git a/aeron_driver-sys/aeron b/aeron_driver-sys/aeron deleted file mode 160000 index 02c5015..0000000 --- a/aeron_driver-sys/aeron +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 02c5015f2c72c232b9cd840ca4726dca7bfe0d0e