Skip to content

Commit

Permalink
Merge pull request #25 from elfenpiff/iox2-2-correct-versioning-and-r…
Browse files Browse the repository at this point in the history
…ename-crate-names

[#2] Use - instead of _ in crate names
  • Loading branch information
elfenpiff committed Dec 13, 2023
2 parents 2003a2d + feb2a7a commit 86376c3
Show file tree
Hide file tree
Showing 344 changed files with 142 additions and 141 deletions.
18 changes: 9 additions & 9 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -271,13 +271,13 @@ macos_aarch64_stable_debug_task:
<<: *IOX2_CARGO_FMT_AND_CLIPPY
<<: *IOX2_COMMON_BUILD_DEBUG
test_script:
- cargo test -p iceoryx2_pal_concurrency_primitives
-p iceoryx2_pal_posix
-p iceoryx2_bb_container
-p iceoryx2_bb_elementary
-p iceoryx2_bb_lock_free
-p iceoryx2_bb_log
-p iceoryx2_bb_memory
-p iceoryx2_bb_system_types
-p iceoryx2_bb_testing
- cargo test -p iceoryx2-pal-concurrency-primitives
-p iceoryx2-pal-posix
-p iceoryx2-bb-container
-p iceoryx2-bb-elementary
-p iceoryx2-bb-lock-free
-p iceoryx2-bb-log
-p iceoryx2-bb-memory
-p iceoryx2-bb-system-types
-p iceoryx2-bb-testing
--lib --bins --tests --no-fail-fast
56 changes: 28 additions & 28 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
[workspace]
resolver = "2"
members = [
"iceoryx2_bb/lock_free/",
"iceoryx2_bb/threadsafe/",
"iceoryx2_bb/container",
"iceoryx2_bb/elementary",
"iceoryx2_bb/log",
"iceoryx2_bb/memory",
"iceoryx2_bb/posix",
"iceoryx2_bb/system_types",
"iceoryx2_bb/testing",
"iceoryx2-bb/lock-free/",
"iceoryx2-bb/threadsafe/",
"iceoryx2-bb/container",
"iceoryx2-bb/elementary",
"iceoryx2-bb/log",
"iceoryx2-bb/memory",
"iceoryx2-bb/posix",
"iceoryx2-bb/system-types",
"iceoryx2-bb/testing",

"iceoryx2_cal",
"iceoryx2-cal",
"iceoryx2",
"iceoryx2_pal/concurrency_primitives",
"iceoryx2_pal/posix/",
"iceoryx2_pal/settings/",
"iceoryx2-pal/concurrency-primitives",
"iceoryx2-pal/posix/",
"iceoryx2-pal/settings/",

"examples",

"benchmarks/publish_subscribe"
"benchmarks/publish-subscribe"
]

[workspace.package]
Expand All @@ -35,23 +35,23 @@ rust-version = "1.72.1"
version = "0.0.1"

[workspace.dependencies]
iceoryx2_bb_threadsafe = { path = "iceoryx2_bb/threadsafe/" }
iceoryx2_bb_lock_free = { path = "iceoryx2_bb/lock_free/" }
iceoryx2_bb_container = { path = "iceoryx2_bb/container/" }
iceoryx2_bb_elementary = { path = "iceoryx2_bb/elementary/" }
iceoryx2_bb_log = { path = "iceoryx2_bb/log/" }
iceoryx2_bb_memory = { path = "iceoryx2_bb/memory/" }
iceoryx2_bb_posix = { path = "iceoryx2_bb/posix/" }
iceoryx2_bb_system_types = { path = "iceoryx2_bb/system_types/" }
iceoryx2_bb_testing = { path = "iceoryx2_bb/testing/" }
iceoryx2-bb-threadsafe = { version = "0.0.1", path = "iceoryx2-bb/threadsafe/" }
iceoryx2-bb-lock-free = { version = "0.0.1", path = "iceoryx2-bb/lock-free/" }
iceoryx2-bb-container = { version = "0.0.1", path = "iceoryx2-bb/container/" }
iceoryx2-bb-elementary = { version = "0.0.1", path = "iceoryx2-bb/elementary/" }
iceoryx2-bb-log = { version = "0.0.1", path = "iceoryx2-bb/log/" }
iceoryx2-bb-memory = { version = "0.0.1", path = "iceoryx2-bb/memory/" }
iceoryx2-bb-posix = { version = "0.0.1", path = "iceoryx2-bb/posix/" }
iceoryx2-bb-system-types = { version = "0.0.1", path = "iceoryx2-bb/system-types/" }
iceoryx2-bb-testing = { version = "0.0.1", path = "iceoryx2-bb/testing/" }

iceoryx2_pal_concurrency_primitives = { path = "iceoryx2_pal/concurrency_primitives/" }
iceoryx2_pal_posix = { path = "iceoryx2_pal/posix/" }
iceoryx2_pal_settings = { path = "iceoryx2_pal/settings/" }
iceoryx2-pal-concurrency-primitives = { version = "0.0.1", path = "iceoryx2-pal/concurrency-primitives/" }
iceoryx2-pal-posix = { version = "0.0.1", path = "iceoryx2-pal/posix/" }
iceoryx2-pal-settings = { version = "0.0.1", path = "iceoryx2-pal/settings/" }

iceoryx2_cal = { path = "iceoryx2_cal" }
iceoryx2-cal = { version = "0.0.1", path = "iceoryx2-cal" }

iceoryx2 = { path = "iceoryx2/" }
iceoryx2 = { version = "0.0.1", path = "iceoryx2/" }

bindgen = { version = "0.65.1" }
bitflags = { version = "1.3.2" }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "benchmark_publish_subscribe"
description = "Iceoryx2: benchmark for publish-subscribe messaging pattern"
name = "benchmark-publish-subscribe"
description = "Iceoryx2: [internal] benchmark for publish-subscribe messaging pattern"
categories = { workspace = true }
edition = { workspace = true }
homepage = { workspace = true }
Expand All @@ -11,7 +11,7 @@ rust-version = { workspace = true }
version = { workspace = true }

[dependencies]
iceoryx2_bb_log = { workspace = true }
iceoryx2-bb-log = { workspace = true }
iceoryx2 = { workspace = true }
iceoryx2_bb_posix = { workspace = true }
iceoryx2_bb_container = { workspace = true }
iceoryx2-bb-posix = { workspace = true }
iceoryx2-bb-container = { workspace = true }
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "iceoryx2_bb_container"
description = "Iceoryx2: IPC shared memory compatible containers"
name = "iceoryx2-bb-container"
description = "Iceoryx2: [internal] IPC shared memory compatible containers"
categories = { workspace = true }
edition = { workspace = true }
homepage = { workspace = true }
Expand All @@ -13,12 +13,12 @@ version = { workspace = true }
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
iceoryx2_bb_elementary = { workspace = true }
iceoryx2_bb_log = { workspace = true }
iceoryx2-bb-elementary = { workspace = true }
iceoryx2-bb-log = { workspace = true }

[dev-dependencies]
pin-init = { workspace = true }
generic-tests = { workspace = true }
iceoryx2_bb_memory = { workspace = true }
iceoryx2_bb_system_types = { workspace = true }
iceoryx2_bb_testing = { workspace = true }
iceoryx2-bb-memory = { workspace = true }
iceoryx2-bb-system-types = { workspace = true }
iceoryx2-bb-testing = { workspace = true }
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "iceoryx2_bb_elementary"
description = "Iceoryx2: elementary constructs that have no dependencies at all"
name = "iceoryx2-bb-elementary"
description = "Iceoryx2: [internal] elementary constructs that have no dependencies at all"
categories = { workspace = true }
edition = { workspace = true }
homepage = { workspace = true }
Expand All @@ -11,10 +11,10 @@ rust-version = { workspace = true }
version = { workspace = true }

[dev-dependencies]
iceoryx2_bb_container = { workspace = true }
iceoryx2_bb_memory = { workspace = true }
iceoryx2_bb_lock_free = { workspace = true }
iceoryx2_bb_testing = { workspace = true }
iceoryx2-bb-container = { workspace = true }
iceoryx2-bb-memory = { workspace = true }
iceoryx2-bb-lock-free = { workspace = true }
iceoryx2-bb-testing = { workspace = true }

generic-tests = { workspace = true }
pin-init = { workspace = true }
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "iceoryx2_bb_lock_free"
description = "Iceoryx2: lock-free containers and constructs"
name = "iceoryx2-bb-lock-free"
description = "Iceoryx2: [internal] lock-free containers and constructs"
categories = { workspace = true }
edition = { workspace = true }
homepage = { workspace = true }
Expand All @@ -11,14 +11,14 @@ rust-version = { workspace = true }
version = { workspace = true }

[dependencies]
iceoryx2_bb_log = { workspace = true }
iceoryx2_bb_elementary = { workspace = true }
iceoryx2-bb-log = { workspace = true }
iceoryx2-bb-elementary = { workspace = true }

tiny-fn = { workspace = true }

[dev-dependencies]
iceoryx2_bb_posix = { workspace = true }
iceoryx2_bb_memory = { workspace = true }
iceoryx2_bb_testing = { workspace = true }
iceoryx2-bb-posix = { workspace = true }
iceoryx2-bb-memory = { workspace = true }
iceoryx2-bb-testing = { workspace = true }
pin-init = { workspace = true }
generic-tests = { workspace = true }
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion iceoryx2_bb/log/Cargo.toml → iceoryx2-bb/log/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "iceoryx2_bb_log"
name = "iceoryx2-bb-log"
description = "Iceoryx2: the internal logger"
categories = { workspace = true }
edition = { workspace = true }
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions iceoryx2_bb/memory/Cargo.toml → iceoryx2-bb/memory/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "iceoryx2_bb_memory"
description = "Iceoryx2: allocators and tools for memory management"
name = "iceoryx2-bb-memory"
description = "Iceoryx2: [internal] allocators and tools for memory management"
categories = { workspace = true }
edition = { workspace = true }
homepage = { workspace = true }
Expand All @@ -11,14 +11,14 @@ rust-version = { workspace = true }
version = { workspace = true }

[dependencies]
iceoryx2_bb_lock_free = { workspace = true }
iceoryx2_bb_elementary = { workspace = true }
iceoryx2_bb_log = { workspace = true }
iceoryx2_bb_posix = { workspace = true }
iceoryx2-bb-lock-free = { workspace = true }
iceoryx2-bb-elementary = { workspace = true }
iceoryx2-bb-log = { workspace = true }
iceoryx2-bb-posix = { workspace = true }

tiny-fn = { workspace = true }
lazy_static = { workspace = true }
pin-init = { workspace = true }

[dev-dependencies]
iceoryx2_bb_testing = { workspace = true }
iceoryx2-bb-testing = { workspace = true }
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
18 changes: 9 additions & 9 deletions iceoryx2_bb/posix/Cargo.toml → iceoryx2-bb/posix/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "iceoryx2_bb_posix"
description = "Iceoryx2: high level safe abstractions for low level unsafe posix constructs"
name = "iceoryx2-bb-posix"
description = "Iceoryx2: [internal] high level safe abstractions for low level unsafe posix constructs"
categories = { workspace = true }
edition = { workspace = true }
homepage = { workspace = true }
Expand All @@ -11,18 +11,18 @@ rust-version = { workspace = true }
version = { workspace = true }

[dependencies]
iceoryx2_bb_container = { workspace = true }
iceoryx2_bb_system_types = { workspace = true }
iceoryx2_bb_elementary = { workspace = true }
iceoryx2_bb_log = { workspace = true }
iceoryx2_pal_posix = { workspace = true }
iceoryx2_pal_settings = { workspace = true }
iceoryx2-bb-container = { workspace = true }
iceoryx2-bb-system-types = { workspace = true }
iceoryx2-bb-elementary = { workspace = true }
iceoryx2-bb-log = { workspace = true }
iceoryx2-pal-posix = { workspace = true }
iceoryx2-pal-settings = { workspace = true }

lazy_static = { workspace = true }
bitflags = { workspace = true }
enum-iterator = { workspace = true }
tiny-fn = { workspace = true }

[dev-dependencies]
iceoryx2_bb_testing = { workspace = true }
iceoryx2-bb-testing = { workspace = true }
generic-tests = { workspace = true }
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "iceoryx2_bb_system_types"
description = "Iceoryx2: strong types that represents low level constructs like file, path, ip address, etc..."
name = "iceoryx2-bb-system-types"
description = "Iceoryx2: [internal] strong types that represents low level constructs like file, path, ip address, etc..."
categories = { workspace = true }
edition = { workspace = true }
homepage = { workspace = true }
Expand All @@ -11,10 +11,10 @@ rust-version = { workspace = true }
version = { workspace = true }

[dependencies]
iceoryx2_bb_container = { workspace = true }
iceoryx2_bb_log = { workspace = true }
iceoryx2_pal_settings = { workspace = true }
iceoryx2-bb-container = { workspace = true }
iceoryx2-bb-log = { workspace = true }
iceoryx2-pal-settings = { workspace = true }
serde = { workspace = true }

[dev-dependencies]
iceoryx2_bb_testing = { workspace = true }
iceoryx2-bb-testing = { workspace = true }
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "iceoryx2_bb_testing"
description = "Iceoryx2: simple testing primitives"
name = "iceoryx2-bb-testing"
description = "Iceoryx2: [internal] simple testing primitives"
categories = { workspace = true }
edition = { workspace = true }
homepage = { workspace = true }
Expand All @@ -11,4 +11,4 @@ rust-version = { workspace = true }
version = { workspace = true }

[dependencies]
iceoryx2_pal_settings = { workspace = true }
iceoryx2-pal-settings = { workspace = true }
File renamed without changes.
File renamed without changes.
File renamed without changes.
20 changes: 20 additions & 0 deletions iceoryx2-bb/threadsafe/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[package]
name = "iceoryx2-bb-threadsafe"
description = "Iceoryx2: [internal] threadsafe non-lock-free containers and constructs"
categories = { workspace = true }
edition = { workspace = true }
homepage = { workspace = true }
keywords = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
rust-version = { workspace = true }
version = { workspace = true }

[dependencies]
iceoryx2-bb-container = { workspace = true }
iceoryx2-bb-posix = { workspace = true }
iceoryx2-bb-log = { workspace = true }

[dev-dependencies]
iceoryx2-bb-testing = { workspace = true }
iceoryx2-pal-posix = { workspace = true }
File renamed without changes.
File renamed without changes.
24 changes: 12 additions & 12 deletions iceoryx2_cal/Cargo.toml → iceoryx2-cal/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "iceoryx2_cal"
description = "Iceoryx2: high-level traits and implementations that represents OS primitives in an exchangeable fashion"
name = "iceoryx2-cal"
description = "Iceoryx2: [internal] high-level traits and implementations that represents OS primitives in an exchangeable fashion"
categories = { workspace = true }
edition = { workspace = true }
homepage = { workspace = true }
Expand All @@ -11,15 +11,15 @@ rust-version = { workspace = true }
version = { workspace = true }

[dependencies]
iceoryx2_bb_posix = { workspace = true }
iceoryx2_bb_container = { workspace = true }
iceoryx2_bb_system_types = { workspace = true }
iceoryx2_bb_log = { workspace = true }
iceoryx2_bb_elementary = { workspace = true }
iceoryx2_bb_memory = { workspace = true }
iceoryx2_bb_lock_free = { workspace = true }
iceoryx2_bb_threadsafe = { workspace = true }
iceoryx2_bb_testing = { workspace = true }
iceoryx2-bb-posix = { workspace = true }
iceoryx2-bb-container = { workspace = true }
iceoryx2-bb-system-types = { workspace = true }
iceoryx2-bb-log = { workspace = true }
iceoryx2-bb-elementary = { workspace = true }
iceoryx2-bb-memory = { workspace = true }
iceoryx2-bb-lock-free = { workspace = true }
iceoryx2-bb-threadsafe = { workspace = true }
iceoryx2-bb-testing = { workspace = true }

once_cell = { workspace = true }
lazy_static = { workspace = true }
Expand All @@ -31,5 +31,5 @@ tiny-fn = { workspace = true }
ouroboros = { workspace = true }

[dev-dependencies]
iceoryx2_pal_posix = { workspace = true }
iceoryx2-pal-posix = { workspace = true }
generic-tests = { workspace = true }
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "iceoryx2_pal_concurrency_primitives"
description = "Iceoryx2: low-level basic building blocks to implement posix mutex, condition variables etc."
name = "iceoryx2-pal-concurrency-primitives"
description = "Iceoryx2: [internal] low-level basic building blocks to implement posix mutex, condition variables etc."
categories = { workspace = true }
edition = { workspace = true }
homepage = { workspace = true }
Expand All @@ -13,4 +13,4 @@ version = { workspace = true }
[dependencies]

[dev-dependencies]
iceoryx2_bb_testing = { workspace = true }
iceoryx2-bb-testing = { workspace = true }
Loading

0 comments on commit 86376c3

Please sign in to comment.