aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@robocracy.org>2022-10-28 00:28:40 -0700
committerBryan Newbold <bnewbold@robocracy.org>2022-10-28 00:28:42 -0700
commit7c4671f24e7e380aad57916818148a8b441db88d (patch)
tree23d052fbbc1f906b85a819b8b6ef842309915398
parent19379222b7b0003bd0538fdd906ee87a9220ddca (diff)
downloadadenosine-7c4671f24e7e380aad57916818148a8b441db88d.tar.gz
adenosine-7c4671f24e7e380aad57916818148a8b441db88d.zip
cargo: stop trying to use workspace.package
It isn't working with external tools, like cargo-deb or tauri-cli.
-rw-r--r--Cargo.toml9
-rw-r--r--adenosine-cli/Cargo.toml19
-rw-r--r--adenosine-pds/Cargo.toml14
-rw-r--r--adenosine-tauri-gui/Cargo.toml9
4 files changed, 19 insertions, 32 deletions
diff --git a/Cargo.toml b/Cargo.toml
index b3a62e5..5c52e2d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,14 +1,7 @@
[workspace]
members = ["adenosine-cli", "adenosine-tauri-gui"]
-[workspace.package]
-version = "0.1.0-dev.0"
-edition = "2021"
-rust-version = "1.57"
-authors = ["Bryan Newbold <bnewbold@robocracy.org>"]
-license = "AGPLv3"
-readme = "../README.md"
-repository = "https://gitlab.com/bnewbold/adenosine"
+# NOTE: [workspace.package] did not work with some plugins and build tools
[profile.release]
lto = true
diff --git a/adenosine-cli/Cargo.toml b/adenosine-cli/Cargo.toml
index bce0ae0..019b225 100644
--- a/adenosine-cli/Cargo.toml
+++ b/adenosine-cli/Cargo.toml
@@ -5,13 +5,14 @@ keywords = ["atproto"]
categories = []
default-run = "adenosine"
-version.workspace = true
-edition.workspace = true
-rust-version.workspace = true
-authors.workspace = true
-license.workspace = true
-readme.workspace = true
-repository.workspace = true
+# common across workspace
+version = "0.1.0-dev.0"
+edition = "2021"
+rust-version = "1.57"
+authors = ["Bryan Newbold <bnewbold@robocracy.org>"]
+license = "AGPLv3"
+readme = "../README.md"
+repository = "https://gitlab.com/bnewbold/adenosine"
[dependencies]
structopt = "*"
@@ -38,5 +39,7 @@ priority = "optional"
extended-description = """"TODO"""
assets = [
["target/release/adenosine", "usr/bin/", "755"],
- #["../extra/adenosine.1", "usr/share/man/man1/", "644"],
+ ["../extra/adenosine.1", "usr/share/man/man1/", "644"],
+ ["../extra/adenosine.bash_completions", "usr/share/bash-completion/completions/adenosine", "644"],
+ ["../extra/adenosine.zsh_completions", "usr/share/zsh/vendor-completions/_adenosine", "644"],
]
diff --git a/adenosine-pds/Cargo.toml b/adenosine-pds/Cargo.toml
index bccacc4..18a3f84 100644
--- a/adenosine-pds/Cargo.toml
+++ b/adenosine-pds/Cargo.toml
@@ -4,13 +4,13 @@ description = "Simple informal personal data server (PDS) for AT protocol and bs
keywords = ["atproto"]
categories = []
-version.workspace = true
-edition.workspace = true
-rust-version.workspace = true
-authors.workspace = true
-license.workspace = true
-readme.workspace = true
-repository.workspace = true
+version = "0.1.0-dev.0"
+edition = "2021"
+rust-version = "1.57"
+authors = ["Bryan Newbold <bnewbold@robocracy.org>"]
+license = "AGPLv3"
+readme = "../README.md"
+repository = "https://gitlab.com/bnewbold/adenosine"
[dependencies]
structopt = "*"
diff --git a/adenosine-tauri-gui/Cargo.toml b/adenosine-tauri-gui/Cargo.toml
index eb606da..9ecc244 100644
--- a/adenosine-tauri-gui/Cargo.toml
+++ b/adenosine-tauri-gui/Cargo.toml
@@ -5,15 +5,6 @@ description = "Simple informal GUI client for AT protocol and bsky.app"
keywords = ["atproto"]
categories = []
-# NOTE: these workspace vars are not working with tauri for some reason?
-#version.workspace = true
-#edition.workspace = true
-#rust-version.workspace = true
-#authors.workspace = true
-#license.workspace = true
-#readme.workspace = true
-#repository.workspace = true
-
version = "0.1.0-dev.0"
edition = "2021"
rust-version = "1.57"