Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Use local parity-dapps-glue instead of crate published at crates.io #8983

Merged
merged 2 commits into from
Jun 26, 2018
Merged

Use local parity-dapps-glue instead of crate published at crates.io #8983

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
aa6e171
Use local parity-dapps-glue instead of crate published at crates.io
sorpaas Jun 26, 2018
8023e35
Disable panic=abort and enable lto optimization
sorpaas Jun 26, 2018
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
17 changes: 1 addition & 16 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.

3 changes: 0 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,9 @@ path = "parity/main.rs"
name = "parity"

[profile.dev]
panic = "abort"

[profile.release]
debug = false
lto = false
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm afraid with lto enabled build machines can ran out of memory.

Copy link
Collaborator

@debris debris Jun 26, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

according to the documentation lto = false is the default for [profile.release], so this changes nothing

panic = "abort"

[workspace]
members = [
Expand Down
2 changes: 1 addition & 1 deletion dapps/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ futures = "0.1"
futures-cpupool = "0.1"
linked-hash-map = "0.5"
log = "0.3"
parity-dapps-glue = "1.9"
parking_lot = "0.5"
mime_guess = "2.0.0-alpha.2"
rand = "0.4"
Expand All @@ -32,6 +31,7 @@ ethcore-bytes = { path = "../util/bytes" }
ethereum-types = "0.3"
fetch = { path = "../util/fetch" }
node-health = { path = "./node-health" }
parity-dapps-glue = { path = "./js-glue" }
parity-hash-fetch = { path = "../hash-fetch" }
parity-reactor = { path = "../util/reactor" }
keccak-hash = { path = "../util/hash" }
Expand Down