Reorganize crates based on program
This commit is contained in:
parent
90cc4d3e74
commit
26ab9bb26a
|
@ -1,10 +1,10 @@
|
||||||
[workspace]
|
[workspace]
|
||||||
members = [
|
members = [
|
||||||
"ci/client",
|
"ci/client",
|
||||||
"memo",
|
"memo/program",
|
||||||
"token",
|
"token-swap/program",
|
||||||
"token-cli",
|
"token/cli",
|
||||||
"token-swap",
|
"token/program",
|
||||||
]
|
]
|
||||||
|
|
||||||
# Workflow for developing against local Solana crates
|
# Workflow for developing against local Solana crates
|
||||||
|
|
|
@ -1,14 +1,15 @@
|
||||||
[package]
|
[package]
|
||||||
name = "test-client"
|
name = "test-client"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
authors = ["Jack May <jack@solana.com>"]
|
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||||
|
publish = false
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
# Used to ensure that SPL programs are buildable by external clients
|
# Used to ensure that SPL programs are buildable by external clients
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
solana-sdk = "1.3.1"
|
solana-sdk = "1.3.1"
|
||||||
spl-memo = { path = "../../memo" }
|
spl-memo = { path = "../../memo/program" }
|
||||||
spl-token = { path = "../../token" }
|
spl-token = { path = "../../token/program" }
|
||||||
spl-token-swap = { path = "../../token-swap" }
|
spl-token-swap = { path = "../../token-swap/program" }
|
||||||
|
|
||||||
|
|
|
@ -8,13 +8,13 @@ cd "$(dirname "$0")/.."
|
||||||
./do.sh clippy token-swap -- --deny=warnings
|
./do.sh clippy token-swap -- --deny=warnings
|
||||||
|
|
||||||
SPL_CBINDGEN=1 ./do.sh build-lib token-swap -D warnings
|
SPL_CBINDGEN=1 ./do.sh build-lib token-swap -D warnings
|
||||||
git diff --exit-code token-swap/inc/token-swap.h
|
git diff --exit-code token-swap/program/inc/token-swap.h
|
||||||
|
cc token-swap/program/inc/token-swap.h -o target/token-swap.gch
|
||||||
|
|
||||||
./do.sh build token
|
./do.sh build token
|
||||||
./do.sh build token-swap
|
./do.sh build token-swap
|
||||||
./do.sh doc token-swap
|
./do.sh doc token-swap
|
||||||
./do.sh test token-swap
|
./do.sh test token-swap
|
||||||
cc token-swap/inc/token-swap.h -o target/token-swap.gch
|
|
||||||
|
|
||||||
# Install dependency project
|
# Install dependency project
|
||||||
(
|
(
|
||||||
|
|
|
@ -8,16 +8,16 @@ cd "$(dirname "$0")/.."
|
||||||
./do.sh clippy token -- --deny=warnings
|
./do.sh clippy token -- --deny=warnings
|
||||||
|
|
||||||
SPL_CBINDGEN=1 ./do.sh build-lib token -D warnings
|
SPL_CBINDGEN=1 ./do.sh build-lib token -D warnings
|
||||||
git diff --exit-code token/inc/token.h
|
git diff --exit-code token/program/inc/token.h
|
||||||
|
cc token/program/inc/token.h -o target/token.gch
|
||||||
|
|
||||||
./do.sh build token
|
./do.sh build token
|
||||||
./do.sh doc token
|
./do.sh doc token
|
||||||
./do.sh test token
|
./do.sh test token
|
||||||
cc token/inc/token.h -o target/token.gch
|
|
||||||
|
|
||||||
# Test cli
|
# Test cli
|
||||||
./do.sh fmt token-cli --all -- --check
|
./do.sh fmt token/cli --all -- --check
|
||||||
./do.sh clippy token-cli -- --deny=warnings
|
./do.sh clippy token/cli -- --deny=warnings
|
||||||
|
|
||||||
# Test js bindings
|
# Test js bindings
|
||||||
cd "$(dirname "$0")/../token/js"
|
cd "$(dirname "$0")/../token/js"
|
||||||
|
|
|
@ -22,7 +22,7 @@ num-derive = "0.3"
|
||||||
num-traits = "0.2"
|
num-traits = "0.2"
|
||||||
remove_dir_all = "=0.5.0"
|
remove_dir_all = "=0.5.0"
|
||||||
solana-sdk = { version = "1.2.17", default-features = false, optional = true }
|
solana-sdk = { version = "1.2.17", default-features = false, optional = true }
|
||||||
spl-token = { path = "../token", default-features = false, optional = true }
|
spl-token = { path = "../../token/program", default-features = false, optional = true }
|
||||||
thiserror = "1.0"
|
thiserror = "1.0"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
|
@ -15,7 +15,7 @@ solana-cli-config = { version = "1.3.0" }
|
||||||
solana-client = { version = "1.3.0" }
|
solana-client = { version = "1.3.0" }
|
||||||
solana-logger = { version = "1.3.0" }
|
solana-logger = { version = "1.3.0" }
|
||||||
solana-sdk = { version = "1.3.0" }
|
solana-sdk = { version = "1.3.0" }
|
||||||
spl-token = { package = "spl-token", version = "1.0", path="../token" }
|
spl-token = { package = "spl-token", version = "1.0", path="../program" }
|
||||||
|
|
||||||
[[bin]]
|
[[bin]]
|
||||||
name = "spl-token"
|
name = "spl-token"
|
Loading…
Reference in New Issue