Skip to content

Commit

Permalink
Most package attributes use the workspace.package feature
Browse files Browse the repository at this point in the history
  • Loading branch information
dan-fritchman committed Dec 20, 2022
1 parent 57a5f72 commit 12466e7
Show file tree
Hide file tree
Showing 11 changed files with 142 additions and 62 deletions.
21 changes: 20 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
[workspace]
#
# Layout21 Workspace
#

[workspace]
members = [
"gds21",
"layout21",
Expand All @@ -10,3 +13,19 @@ members = [
"layout21utils",
"lef21",
]

# Inherited Package Attributes
# Thanks https://doc.rust-lang.org/cargo/reference/workspaces.html#the-package-table!
[workspace.package]
authors = ["Dan Fritchman <dan@fritch.mn>", "Arya Reais-Parsi <aryap@berkeley.edu>"]
categories = [] # FIXME!
documentation = "https://github.com/dan-fritchman/Layout21"
edition = "2021"
exclude = ["resources", "scratch"]
homepage = "https://github.com/dan-fritchman/Layout21"
include = []
keywords = [] # FIXME!
license = "BSD-3-Clause"
readme = "readme.md"
repository = "https://github.com/dan-fritchman/Layout21"
version = "3.0.0-pre.2"
24 changes: 16 additions & 8 deletions gds21/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,30 +1,38 @@
[package]
description = "Gds21 Integrated Circuit Layout Parser & Writer"
name = "gds21"

# Shared layout21 attributes
authors = ["Dan Fritchman <dan@fritch.mn>"]
edition = "2021"
license = "BSD-3-Clause"
repository = "https://github.com/dan-fritchman/Layout21"
version = "3.0.0-pre.2"
authors.workspace = true
categories.workspace = true
documentation.workspace = true
edition.workspace = true
exclude.workspace = true
homepage.workspace = true
include.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
version.workspace = true
workspace = "../"
exclude = ["resources",]

[dependencies]
# Local workspace dependencies
layout21utils = {path = "../layout21utils", version="3.0.0-pre.2"}
layout21utils = {path = "../layout21utils", version = "3.0.0-pre.2"}

# External dependencies
byteorder = "1.3.4"
chrono = {version = "0.4.20", features = ["serde"]}
derive_builder = "0.9.0"
derive_more = "0.99.16"
num-derive = "0.3"
num-traits = "0.2"
schemars = {version = "0.8.10"}
serde = {version = "1.0", features = ["derive"]}
serde_derive = "1.0.88"
serde_json = "1.0"
tempfile = {version = "3", optional = true}
schemars = {version = "0.8.10" }

[dev-dependencies]
tempfile = {version = "3"}
Expand Down
20 changes: 14 additions & 6 deletions layout21/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
[package]
description = "Layout21 Integrated Circuit Layout. Meta-crate, re-exporting several internally defined crates"
description = "Layout21 Integrated Circuit Layout"
name = "layout21"

# Shared layout21 attributes
authors = ["Dan Fritchman <dan@fritch.mn>"]
edition = "2021"
license = "BSD-3-Clause"
repository = "https://github.com/dan-fritchman/Layout21"
version = "3.0.0-pre.2"
authors.workspace = true
categories.workspace = true
documentation.workspace = true
edition.workspace = true
exclude.workspace = true
homepage.workspace = true
include.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
version.workspace = true
workspace = "../"

[dependencies]
Expand Down
1 change: 1 addition & 0 deletions layout21/readme.md
25 changes: 16 additions & 9 deletions layout21converters/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
[package]
description = "Converters to/from Layout21 formats from/to various legacy formats."
name = "layout21converters"

# Shared layout21 attributes
authors = ["Dan Fritchman <dan@fritch.mn>", "Arya Reais-Parsi <aryap@berkeley.edu>"]
edition = "2021"
license = "BSD-3-Clause"
repository = "https://github.com/dan-fritchman/Layout21"
version = "3.0.0-pre.2"
authors.workspace = true
categories.workspace = true
documentation.workspace = true
edition.workspace = true
exclude.workspace = true
homepage.workspace = true
include.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
version.workspace = true
workspace = "../"
exclude = ["resources",]

[dependencies]
chrono = {version = "0.4.20"}
clap = {version = "3.0.0-beta.5", features = ["derive"]}
gds21 = {path = "../gds21"}
lef21 = {path = "../lef21"}
layout21protos = {path = "../layout21protos"}
layout21raw = {path = "../layout21raw"}
layout21utils = {path = "../layout21utils"}
clap = { version = "3.0.0-beta.5", features = ["derive"] }
chrono = {version = "0.4.20" }
lef21 = {path = "../lef21"}
22 changes: 15 additions & 7 deletions layout21protos/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
[package]
name = "layout21protos"
description = "Layout21 ProtoBuf Definitions"
name = "layout21protos"

# Shared layout21 attributes
authors = ["Dan Fritchman <dan@fritch.mn>"]
edition = "2021"
license = "BSD-3-Clause"
repository = "https://github.com/dan-fritchman/Layout21"
version = "3.0.0-pre.2"
authors.workspace = true
categories.workspace = true
documentation.workspace = true
edition.workspace = true
exclude.workspace = true
homepage.workspace = true
include.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
version.workspace = true
workspace = "../"

[dependencies]
# https://crates.io/crates/vlsir distributed versions here:
vlsir = { version = "3.0.0-pre.2" }
vlsir = {version = "3.0.0-pre.2"}
# For local path-based development, use this instead:
# vlsir = { version = "3.0.0-pre.2", path = "vlsir/bindings/rust" }
File renamed without changes.
21 changes: 14 additions & 7 deletions layout21raw/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
[package]
name = "layout21raw"
description = "Layout21 Raw-Format Integrated Circuit Layout"
name = "layout21raw"

# Shared layout21 attributes
authors = ["Dan Fritchman <dan@fritch.mn>"]
edition = "2021"
license = "BSD-3-Clause"
repository = "https://github.com/dan-fritchman/Layout21"
version = "3.0.0-pre.2"
authors.workspace = true
categories.workspace = true
documentation.workspace = true
edition.workspace = true
exclude.workspace = true
homepage.workspace = true
include.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
version.workspace = true
workspace = "../"
exclude = ["resources",]

[dependencies]
# Local workspace dependencies
Expand Down
21 changes: 14 additions & 7 deletions layout21tetris/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
[package]
description = "Layout21 Gridded 'Tetris' Integrated Circuit Layout"
name = "layout21tetris"

# Shared layout21 attributes
authors = ["Dan Fritchman <dan@fritch.mn>"]
edition = "2021"
license = "BSD-3-Clause"
repository = "https://github.com/dan-fritchman/Layout21"
version = "3.0.0-pre.2"
authors.workspace = true
categories.workspace = true
documentation.workspace = true
edition.workspace = true
exclude.workspace = true
homepage.workspace = true
include.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
version.workspace = true
workspace = "../"
exclude = ["resources",]

[dependencies]
# Local workspace dependencies
layout21protos = {path = "../layout21protos", version = "3.0.0-pre.2"}
layout21raw = {path = "../layout21raw", version = "3.0.0-pre.2"}
layout21utils = {path = "../layout21utils", version = "3.0.0-pre.2"}
layout21protos = {path = "../layout21protos", version = "3.0.0-pre.2"}

# Crates.io
derive_builder = "0.9"
Expand Down
20 changes: 14 additions & 6 deletions layout21utils/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,28 @@
[package]
description = "Layout21 Internal Utility Crate"
name = "layout21utils"

# Shared layout21 attributes
authors = ["Dan Fritchman <dan@fritch.mn>"]
edition = "2021"
license = "BSD-3-Clause"
repository = "https://github.com/dan-fritchman/Layout21"
version = "3.0.0-pre.2"
authors.workspace = true
categories.workspace = true
documentation.workspace = true
edition.workspace = true
exclude.workspace = true
homepage.workspace = true
include.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
version.workspace = true
workspace = "../"

[dependencies]
by_address = "1.0.4"
schemars = {version = "0.8.10", features = ["rust_decimal"]}
serde = {version = "1.0", features = ["derive"]}
serde_derive = "1.0.88"
serde_json = "1.0"
serde_yaml = "0.8"
textwrap = "0.14.2"
toml = "0.5.10"
schemars = {version = "0.8.10", features = ["rust_decimal"] }
29 changes: 18 additions & 11 deletions lef21/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,29 +1,36 @@
[package]
description = "Library Exchange Format (LEF) Integrated Circuit Layout Parser & Writer"
name = "lef21"

# Shared layout21 attributes
authors = ["Dan Fritchman <dan@fritch.mn>"]
edition = "2021"
license = "BSD-3-Clause"
repository = "https://github.com/dan-fritchman/Layout21"
version = "3.0.0-pre.2"
authors.workspace = true
categories.workspace = true
documentation.workspace = true
edition.workspace = true
exclude.workspace = true
homepage.workspace = true
include.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
version.workspace = true
workspace = "../"
exclude = ["resources",]

[dependencies]
# Local workspace dependencies
layout21utils = {path = "../layout21utils", version="3.0.0-pre.2"}
layout21utils = {path = "../layout21utils", version = "3.0.0-pre.2"}

# External dependencies
derive_builder = "0.9.0"
derive_more = "0.99.16"
enum_dispatch = "0.3.1"
fstrings = "0.2.3"
num-derive = "0.3"
num-traits = "0.2"
once_cell = "1.8.0"
rust_decimal = {version = "1.24.0", features = ["serde-str"]}
schemars = {version = "0.8.10", features = ["rust_decimal"]}
serde = {version = "1.0", features = ["derive"]}
serde_derive = "1.0.88"
serde_json = "1.0"
derive_more = "0.99.16"
once_cell = "1.8.0"
fstrings = "0.2.3"
schemars = {version = "0.8.10", features = ["rust_decimal"] }

0 comments on commit 12466e7

Please # to comment.