Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

preparations for 0.2.0 crates.io publish #120

Merged
merged 4 commits into from
Jun 19, 2024
Merged

preparations for 0.2.0 crates.io publish #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d43a232
refactor: reorganize examples
sevenautumns Jun 18, 2024
a1b9455
build: make a653rs-linux-core into workspace dependency
sevenautumns Jun 19, 2024
1bef10b
chore: set version of all packages to 0.2.0
sevenautumns Jun 19, 2024
2bd9dfc
chore: prepare for publish
sevenautumns Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,35 @@ members = [
"examples/hello_part",
"examples/hello_part_no_macros",

"examples/fuel_tank_simulation",
"examples/fuel_tank_controller",
"examples/fuel_tank/simulation",
"examples/fuel_tank/controller",

"examples/ping_client",
"examples/ping_server",
"examples/ping/client",
"examples/ping/server",

"examples/dev_random",

"examples/ping_queue_client",
"examples/ping_queue_server",
"examples/ping_queue/client",
"examples/ping_queue/server",
]

[workspace.package]
edition = "2021"
authors = ["Sven Friedrich <[email protected]>"]
license = "MIT OR Apache-2.0"
keywords = [
"arinc",
"avionics",
]
categories = [
"aerospace",
]
repository = "https://github.com/DLR-FT/a653rs-linux/"

[workspace.dependencies]
a653rs = "0.6"
a653rs-linux = { version = "0.2", path = "partition" }
a653rs-linux-core = { version = "0.2", path = "core" }
log = "0"
nix = { version = "0.29", features = ["socket", "process", "fs", "uio", "signal", "user", "mount", "event", "sched"] }
memmap2 = "0.9"
Expand Down
11 changes: 8 additions & 3 deletions core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
[package]
name = "a653rs-linux-core"
version = "0.1.0"
edition = "2021"
license = "MIT OR Apache-2.0"
version = "0.2.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
keywords.workspace = true
categories.workspace = true
repository.workspace = true
description = "Core Library for a653rs-linux hypervisor and partition library"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
4 changes: 2 additions & 2 deletions examples/dev_random/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ edition = "2021"

[dependencies]
a653rs = { workspace = true, features = ["macros"] }
a653rs-linux = { path = "../../partition" }
log.workspace = true
a653rs-linux.workspace = true
log.workspace = true
0 examples/dev_random.yaml → examples/dev_random/dev_random.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/fuel_tank_controller/Cargo.toml → examples/fuel_tank/controller/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"

[dependencies]
a653rs = { workspace = true, features = ["macros"] }
a653rs-linux = { path = "../../partition" }
a653rs-linux.workspace = true
nix.workspace = true
memmap2.workspace = true
procfs.workspace = true
Expand Down
0 examples/fuel_tank_controller/src/main.rs → examples/fuel_tank/controller/src/main.rs
View file
Open in desktop
File renamed without changes.
0 examples/fuel_tank.yaml → examples/fuel_tank/fuel_tank.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/fuel_tank_simulation/Cargo.toml → examples/fuel_tank/simulation/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"

[dependencies]
a653rs = { workspace = true, features = ["macros"] }
a653rs-linux = { path = "../../partition" }
a653rs-linux.workspace = true
serde = { version = "1.0", features = ["derive"] }
procfs.workspace = true
nix.workspace = true
Expand Down
0 examples/fuel_tank_simulation/src/main.rs → examples/fuel_tank/simulation/src/main.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/hello_part/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0"
[dependencies]
a653rs = { workspace = true, features = ["macros"] }
a653rs-postcard = { version = "0.4", features = ["alloc"] }
a653rs-linux = { path = "../../partition" }
a653rs-linux.workspace = true
nix.workspace = true
memmap2.workspace = true
procfs.workspace = true
Expand Down
0 examples/hello_part.yaml → examples/hello_part/hello_part.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/hello_part_no_macros/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0"
[dependencies]
a653rs = { workspace = true }
a653rs-postcard = { version = "0.4", features = ["alloc"] }
a653rs-linux = { path = "../../partition" }
a653rs-linux.workspace = true
once_cell.workspace = true
serde = "1.0"
log = "0"
Expand Down
0 examples/hello_part_no_macros.yaml → ..._part_no_macros/hello_part_no_macros.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions examples/ping_client/Cargo.toml → examples/ping/client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ edition = "2021"

[dependencies]
a653rs = { workspace = true, features = ["macros"] }
a653rs-linux = { path = "../../partition" }
log.workspace = true
a653rs-linux.workspace = true
log.workspace = true
0 examples/ping_client/src/main.rs → examples/ping/client/src/main.rs
View file
Open in desktop
File renamed without changes.
0 examples/ping.yaml → examples/ping/ping.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions examples/ping_server/Cargo.toml → examples/ping/server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ edition = "2021"

[dependencies]
a653rs = { workspace = true, features = ["macros"] }
a653rs-linux = { path = "../../partition" }
log.workspace = true
a653rs-linux.workspace = true
log.workspace = true
0 examples/ping_server/src/main.rs → examples/ping/server/src/main.rs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions examples/ping_queue_client/Cargo.toml → examples/ping_queue/client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ edition = "2021"

[dependencies]
a653rs = { workspace = true, features = ["macros"] }
a653rs-linux = { path = "../../partition" }
log.workspace = true
a653rs-linux.workspace = true
log.workspace = true
0 examples/ping_queue_client/src/main.rs → examples/ping_queue/client/src/main.rs
View file
Open in desktop
File renamed without changes.
0 examples/ping_queue.yaml → examples/ping_queue/ping_queue.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions examples/ping_queue_server/Cargo.toml → examples/ping_queue/server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ edition = "2021"

[dependencies]
a653rs = { workspace = true, features = ["macros"] }
a653rs-linux = { path = "../../partition" }
log.workspace = true
a653rs-linux.workspace = true
log.workspace = true
0 examples/ping_queue_server/src/main.rs → examples/ping_queue/server/src/main.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
PATH="target/${rust-target}/release:$PATH"

# (build &) run hypervisor
RUST_LOG=''${RUST_LOG:=trace} cargo run --package a653rs-linux-hypervisor --release -- examples/${name}.yaml $@
RUST_LOG=''${RUST_LOG:=trace} cargo run --package a653rs-linux-hypervisor --release -- examples/${name}/${name}.yaml $@
'';
help = "Run the ${name} example, consisting of the partitions: ${concatStringsSep "," partitions}";
category = "example";
Expand Down
10 changes: 5 additions & 5 deletions hypervisor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[package]
name = "a653rs-linux-hypervisor"
version = "0.1.0"
edition = "2021"
license = "MIT OR Apache-2.0"
version = "0.2.0"
authors.workspace = true
edition.workspace = true
license.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
a653rs.workspace = true
a653rs.features = [ "bindings" ]

#apex-hal = { path = "../../a653rs", features = ["p4"] }
a653rs-linux-core = { path = "../core" }
a653rs-linux-core.workspace = true

# Required
nix.workspace = true
Expand Down
12 changes: 9 additions & 3 deletions partition/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
[package]
name = "a653rs-linux"
version = "0.2.0"
edition = "2021"
license = "MIT OR Apache-2.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
keywords.workspace = true
categories.workspace = true
repository.workspace = true
description = "a653rs partition library for a653rs-linux hypervisor"


[features]
# Enables support for TCP and UDP sockets in partitions
Expand All @@ -12,7 +18,7 @@ socket = []

[dependencies]
a653rs.workspace = true
a653rs-linux-core = { path = "../core" }
a653rs-linux-core.workspace = true
nix.workspace = true
memmap2.workspace = true
procfs.workspace = true
Expand Down
Loading