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

Jump to bottom

Clean node/wallet dependencies & fix linux build #2

Merged
merged 2 commits into from
Sep 10, 2022
Merged

Clean node/wallet dependencies & fix linux build #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d689eed
release/local cargo toml
deevope Sep 10, 2022
5b3d846
fix linux build - multiple rlib candidates
deevope Sep 10, 2022
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
7 changes: 7 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ strfmt = "0.1.6"
once_cell = "1.6.0"
lazy_static = "1"
serde = { version = "1.0", features=['derive'] }
native-dialog = "0.6.3"

[target.'cfg(target_os = "linux")'.dependencies]
native-dialog = "0.5.5"

[target.'cfg(not(target_os = "linux"))'.dependencies]
native-dialog = "0.6.3"
rfd = "0.4.0"

[target.'cfg(windows)'.dependencies]
Expand Down
38 changes: 24 additions & 14 deletions crates/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,44 @@ no-self-update = []
built = { version = "0.4", features = ["git2"]}

[dependencies]
#grin_wallet = { version = "5.1.0" }
#grin_wallet_config = { version = "5.1.0"}
#grin_wallet_util = { version = "5.1.0"}
#grin_wallet_controller = { version = "5.1.0"}
#grin_wallet_api = { version = "5.1.0"}
#grin_wallet_impls = { version = "5.1.0"}

############ Release ################
### Node
grin_config = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_servers = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }

# For local testing
grin_wallet = { path = "../../../grin-wallet-yeastplume"}
grin_wallet_config = { path = "../../../grin-wallet-yeastplume/config"}
grin_wallet_util = { path = "../../../grin-wallet-yeastplume/util"}
grin_wallet_controller = { path = "../../../grin-wallet-yeastplume/controller"}
grin_wallet_api = { path = "../../../grin-wallet-yeastplume/api"}
grin_wallet_impls = { path = "../../../grin-wallet-yeastplume/impls"}
grin_wallet_libwallet = { path = "../../../grin-wallet-yeastplume/libwallet"}
### Wallet
grin_wallet = { git = "https://github.com/mimblewimble/grin-wallet", branch = "master" }
grin_wallet_config = { git = "https://github.com/mimblewimble/grin-wallet", branch = "master" }
grin_wallet_util = { git = "https://github.com/mimblewimble/grin-wallet", branch = "master" }
grin_wallet_controller = { git = "https://github.com/mimblewimble/grin-wallet", branch = "master" }
grin_wallet_api = { git = "https://github.com/mimblewimble/grin-wallet", branch = "master" }
grin_wallet_impls = { git = "https://github.com/mimblewimble/grin-wallet", branch = "master" }
grin_wallet_libwallet = { git = "https://github.com/mimblewimble/grin-wallet", branch = "master" }



############ Local testing ################
### Node
# grin_config = { path = "../../../grin/config" }
# grin_core = { path = "../../../grin/core" }
# grin_util = { path = "../../../grin/util" }
# grin_servers = { path = "../../../grin/servers" }
# grin_keychain = { path = "../../../grin/keychain" }
# grin_chain = { path = "../../../grin/chain" }

### Wallet
#grin_wallet = { path = "../../../grin-wallet"}
#grin_wallet_config = { path = "../../../grin-wallet/config"}
#grin_wallet_util = { path = "../../../grin-wallet/util"}
#grin_wallet_controller = { path = "../../../grin-wallet/controller"}
#grin_wallet_api = { path = "../../../grin-wallet/api"}
#grin_wallet_impls = { path = "../../../grin-wallet/impls"}
#grin_wallet_libwallet = { path = "../../../grin-wallet/libwallet"}

regex = "1.4.3"
fancy-regex = "0.5.0" # Regex with backtracking
Expand Down